Merge remote-tracking branch 'origin/relay'

viniychuk · viniychuk · commit c8332f6ec06f · 2016-06-01T20:43:07.000-04:00
diff --git a/Tests/Library/Field/FieldTest.php b/Tests/Library/Field/FieldTest.php
@@ -41,8 +41,7 @@ public function testInlineFieldCreation()
             }
         ]);
 
-        $this->assertEquals('true', $fieldWithResolve->resolve(true, [], $resolveInfo), 'Resolve bool to string');
-        $this->assertEquals('CTO', $fieldWithResolve->resolve('CTO', [], $resolveInfo));
+        $this->assertEquals(null, $fieldWithResolve->resolve(true, [], $resolveInfo), 'Resolve bool to string');
 
         $fieldWithResolve->setType(new IntType());
         $this->assertEquals(new IntType(), $fieldWithResolve->getType());
diff --git a/Tests/Library/Validator/TypeValidationRuleTest.php b/Tests/Library/Validator/TypeValidationRuleTest.php
@@ -29,7 +29,7 @@ class TypeValidationRuleTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->rule = new TypeValidationRule(new ConfigValidator());
+        $this->rule = new TypeValidationRule(ConfigValidator::getInstance());
     }
 
 
diff --git a/src/Config/AbstractConfig.php b/src/Config/AbstractConfig.php
@@ -10,7 +10,6 @@
 
 
 use Youshido\GraphQL\Validator\ConfigValidator\ConfigValidator;
-use Youshido\GraphQL\Validator\ConfigValidator\ConfigValidatorInterface;
 use Youshido\GraphQL\Validator\Exception\ConfigurationException;
 use Youshido\GraphQL\Validator\Exception\ValidationException;
 
@@ -32,9 +31,6 @@ abstract class AbstractConfig
 
     protected $extraFieldsAllowed = null;
 
-    /** @var ConfigValidatorInterface */
-    protected $validator;
-
     /**
      * TypeConfig constructor.
      * @param array $configData
@@ -53,10 +49,11 @@ public function __construct(array $configData, $contextObject = null, $finalClas
         $this->contextObject = $contextObject;
         $this->data          = $configData;
         $this->finalClass    = $finalClass;
-        $this->validator     = new ConfigValidator($contextObject);
 
-        if (!$this->validator->validate($this->data, $this->getContextRules(), $this->extraFieldsAllowed)) {
-            throw new ConfigurationException('Config is not valid for ' . ($contextObject ? get_class($contextObject) : null) . "\n" . implode("\n", $this->validator->getErrorsArray(false)));
+        $validator = ConfigValidator::getInstance();
+
+        if (!$validator->validate($this->data, $this->getContextRules(), $this->extraFieldsAllowed)) {
+            throw new ConfigurationException('Config is not valid for ' . ($contextObject ? get_class($contextObject) : null) . "\n" . implode("\n", $validator->getErrorsArray(false)));
         }
 
         $this->build();
diff --git a/src/Execution/Processor.php b/src/Execution/Processor.php
@@ -222,7 +222,13 @@ protected function resolveFieldValue(AbstractField $field, $contextValue, Query
     {
         $resolveInfo = new ResolveInfo($field, $query->getFields(), $field->getType(), $this->executionContext);
 
-        return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        if ($resolveFunc = $field->getConfig()->getResolveFunction()) {
+            return $resolveFunc($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        } elseif ($propertyValue = TypeService::getPropertyValue($contextValue, $field->getName())) {
+            return $propertyValue;
+        } else {
+            return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);
+        }
     }
 
     /**
@@ -251,9 +257,10 @@ protected function getPreResolvedValue($contextValue, FieldAst $fieldAst, Abstra
             $resolved = true;
         }
 
-        if ($field->getConfig()->getResolveFunction()) {
+        if ($resolveFunction = $field->getConfig()->getResolveFunction()) {
             $resolveInfo   = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);
-            $resolverValue = $field->resolve($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
+
+            $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);
         }
 
         if (!$resolverValue && !$resolved) {
diff --git a/src/Field/AbstractField.php b/src/Field/AbstractField.php
@@ -59,14 +59,6 @@ public function setType($type)
      */
     public function resolve($value, array $args, ResolveInfo $info)
     {
-        if ($resolveFunc = $this->getConfig()->getResolveFunction()) {
-            $info->setReturnType($this->getType());
-
-            return $resolveFunc($value, $args, $info);
-        } elseif ($propertyValue = TypeService::getPropertyValue($value, $this->getName())) {
-            return $propertyValue;
-        }
-
         return null;
     }
 
diff --git a/src/Validator/ConfigValidator/ConfigValidator.php b/src/Validator/ConfigValidator/ConfigValidator.php
@@ -21,19 +21,33 @@ class ConfigValidator implements ConfigValidatorInterface
 
     protected $rules = [];
 
-    protected $contextObject;
-
     protected $extraFieldsAllowed = false;
 
     /** @var ValidationRuleInterface[] */
     protected $validationRules = [];
 
-    public function __construct($contextObject = null)
+    /** @var  ConfigValidator */
+    protected static $instance;
+
+    private function __construct()
     {
-        $this->contextObject = $contextObject;
         $this->initializeRules();
     }
 
+    /**
+     * @return ConfigValidator
+     */
+    public static function getInstance()
+    {
+        if (empty(self::$instance)) {
+            self::$instance = new self();
+        }
+
+        self::$instance->clearErrors();
+
+        return self::$instance;
+    }
+
     public function validate($data, $rules = [], $extraFieldsAllowed = null)
     {
         if ($extraFieldsAllowed !== null) $this->setExtraFieldsAllowed($extraFieldsAllowed);
@@ -47,7 +61,7 @@ public function validate($data, $rules = [], $extraFieldsAllowed = null)
                 unset($fieldRules['required']);
 
                 if (!array_key_exists($fieldName, $data)) {
-                    $this->addError(new ValidationException('Field \'' . $fieldName . '\' of ' . $this->getContextName() . ' is required'));
+                    $this->addError(new ValidationException(sprintf('Field "%s" is required', $fieldName)));
 
                     continue;
                 }
@@ -59,25 +73,21 @@ public function validate($data, $rules = [], $extraFieldsAllowed = null)
             /** Validation of all other rules*/
             foreach ($fieldRules as $ruleName => $ruleInfo) {
                 if (!array_key_exists($ruleName, $this->validationRules)) {
-                    $this->addError(new ValidationException('Field \'' . $fieldName . '\' has invalid rule \'' . $ruleInfo . '\''));
+                    $this->addError(new ValidationException(sprintf('Field "%s" has invalid rule "%s"', $fieldName, $ruleInfo)));
 
                     continue;
                 }
 
                 if (!$this->validationRules[$ruleName]->validate($data[$fieldName], $ruleInfo)) {
-                    $this->addError(
-                        new ValidationException('Field \'' . $fieldName . '\' of ' . $this->getContextName()
-                                                . ' expected to be ' . $ruleName . ': \'' . (string)$ruleInfo . '\', but got: ' . gettype($data[$fieldName])));
+                    $this->addError(new ValidationException(sprintf('Field "%s" expected to be "%s" but got "%s"', $fieldName, $ruleName, gettype($data[$fieldName]))));
                 }
             }
         }
 
         if (!$this->isExtraFieldsAllowed()) {
             foreach (array_keys($data) as $fieldName) {
                 if (!in_array($fieldName, $processedFields)) {
-                    $this->addError(
-                        new ValidationException('Field \'' . $fieldName . '\' is not expected in ' . $this->getContextName()));
-
+                    $this->addError(new ValidationException(sprintf('Field "%s" is not expected', $fieldName)));
                 }
             }
         }
@@ -90,19 +100,9 @@ protected function initializeRules()
         $this->validationRules['type'] = new TypeValidationRule($this);
     }
 
-    /**
-     * @return string
-     */
-    protected function getContextName()
+    public function addRule($name, ValidationRuleInterface $rule)
     {
-        if (is_object($this->contextObject)) {
-            $class = get_class($this->contextObject);
-            $class = substr($class, strrpos($class, '\\') + 1);
-
-            return $class;
-        } else {
-            return $this->contextObject ? $this->contextObject : '(context)';
-        }
+        $this->validationRules[$name] = $rule;
     }
 
     public function isValid()

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ public function testInlineFieldCreation()`
`41`	`41`	`}`
`42`	`42`	`]);`
`43`	`43`
`44`		`- $this->assertEquals('true', $fieldWithResolve->resolve(true, [], $resolveInfo), 'Resolve bool to string');`
`45`		`- $this->assertEquals('CTO', $fieldWithResolve->resolve('CTO', [], $resolveInfo));`
	`44`	`+ $this->assertEquals(null, $fieldWithResolve->resolve(true, [], $resolveInfo), 'Resolve bool to string');`
`46`	`45`
`47`	`46`	`$fieldWithResolve->setType(new IntType());`
`48`	`47`	`$this->assertEquals(new IntType(), $fieldWithResolve->getType());`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class TypeValidationRuleTest extends \PHPUnit_Framework_TestCase`
`29`	`29`
`30`	`30`	`protected function setUp()`
`31`	`31`	`{`
`32`		`- $this->rule = new TypeValidationRule(new ConfigValidator());`
	`32`	`+ $this->rule = new TypeValidationRule(ConfigValidator::getInstance());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,13 @@ protected function resolveFieldValue(AbstractField $field, $contextValue, Query`
`222`	`222`	`{`
`223`	`223`	`$resolveInfo = new ResolveInfo($field, $query->getFields(), $field->getType(), $this->executionContext);`
`224`	`224`
`225`		`- return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);`
	`225`	`+ if ($resolveFunc = $field->getConfig()->getResolveFunction()) {`
	`226`	`+ return $resolveFunc($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);`
	`227`	`+ } elseif ($propertyValue = TypeService::getPropertyValue($contextValue, $field->getName())) {`
	`228`	`+ return $propertyValue;`
	`229`	`+ } else {`
	`230`	`+ return $field->resolve($contextValue, $this->parseArgumentsValues($field, $query), $resolveInfo);`
	`231`	`+ }`
`226`	`232`	`}`
`227`	`233`
`228`	`234`	`/**`
`@@ -251,9 +257,10 @@ protected function getPreResolvedValue($contextValue, FieldAst $fieldAst, Abstra`
`251`	`257`	`$resolved = true;`
`252`	`258`	`}`
`253`	`259`
`254`		`- if ($field->getConfig()->getResolveFunction()) {`
	`260`	`+ if ($resolveFunction = $field->getConfig()->getResolveFunction()) {`
`255`	`261`	`$resolveInfo = new ResolveInfo($field, [$fieldAst], $field->getType(), $this->executionContext);`
`256`		`- $resolverValue = $field->resolve($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);`
	`262`	`+`
	`263`	`+ $resolverValue = $resolveFunction($resolved ? $resolverValue : $contextValue, $fieldAst->getKeyValueArguments(), $resolveInfo);`
`257`	`264`	`}`
`258`	`265`
`259`	`266`	`if (!$resolverValue && !$resolved) {`
Original file line number	Diff line number	Diff line change
`@@ -59,14 +59,6 @@ public function setType($type)`
`59`	`59`	`*/`
`60`	`60`	`public function resolve($value, array $args, ResolveInfo $info)`
`61`	`61`	`{`
`62`		`- if ($resolveFunc = $this->getConfig()->getResolveFunction()) {`
`63`		`- $info->setReturnType($this->getType());`
`64`		`-`
`65`		`- return $resolveFunc($value, $args, $info);`
`66`		`- } elseif ($propertyValue = TypeService::getPropertyValue($value, $this->getName())) {`
`67`		`- return $propertyValue;`
`68`		`- }`
`69`		`-`
`70`	`62`	`return null;`
`71`	`63`	`}`
`72`	`64`