Increase coverage

Author: murtukov

src/Validator/InputValidator.php

@@ -152,15 +152,12 @@ protected function buildValidationTree(ValidationNode $rootObject, array $fields
 
             if (isset($validation['cascade']) && isset($inputData[$property])) {
                 $groups = $validation['cascade'];
-
-                if ($arg['type'] instanceof Closure) {
-                    $arg['type'] = $arg['type']();
-                }
+                $argType = $this->unclosure($arg['type']);
 
                 /** @var ObjectType|InputObjectType $type */
-                $type = Type::getNamedType($arg['type']);
+                $type = Type::getNamedType($argType);
 
-                if (static::isListOfType($arg['type'])) {
+                if (static::isListOfType($argType)) {
                     $rootObject->$property = $this->createCollectionNode($inputData[$property], $type, $rootObject);
                 } else {
                     $rootObject->$property = $this->createObjectNode($inputData[$property], $type, $rootObject);
@@ -273,10 +270,7 @@ private function applyClassValidation(ObjectMetadata $metadata, array $rules): v
                     $metadata->addConstraints($linkedMetadata->getConstraints());
                     break;
                 case 'constraints':
-                    if ($value instanceof Closure) {
-                        $value = $value();
-                    }
-                    foreach ($value as $constraint) {
+                    foreach ($this->unclosure($value) as $constraint) {
                         if ($constraint instanceof Constraint) {
                             $metadata->addConstraint($constraint);
                         } elseif ($constraint instanceof GroupSequence) {
@@ -311,6 +305,20 @@ public static function normalizeConfig($config): array
         return $config;
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    private function unclosure($value)
+    {
+        if ($value instanceof Closure) {
+            return $value();
+        }
+
+        return $value;
+    }
+
     /**
      * @param string|array|null $groups
      *