Fix uncovered code errors from Travis

Author: murtukov

src/ExpressionLanguage/ExpressionLanguage.php

@@ -90,6 +90,6 @@ public static function unprefixExpression(string $expression)
     {
         $string = \substr($expression, \strlen(self::EXPRESSION_TRIGGER));
 
-        return $string ?: $expression;
+        return '' !== $string ? $string : $expression;
     }
 }

src/Generator/TypeBuilder.php

@@ -136,7 +136,7 @@ protected function wrapTypeRecursive($typeNode)
                 $type = Literal::new("Type::listOf($innerType)");
                 $this->file->addUse(Type::class);
                 break;
-            case NodeKind::NAMED_TYPE:
+            default:
                 if (\in_array($typeNode->name->value, self::BUILT_IN_TYPES)) {
                     $name = \strtolower($typeNode->name->value);
                     $type = Literal::new("Type::$name()");
@@ -146,7 +146,6 @@ protected function wrapTypeRecursive($typeNode)
                     $type = "$this->globalVars->get('typeResolver')->resolve('$name')";
                 }
                 break;
-            default: throw new RuntimeException('Unrecognized node kind.');
         }
 
         return $type;
@@ -325,8 +324,6 @@ protected function buildValidator(Closure $closure, array $mapping, bool $inject
 
         if (!empty($mapping['properties'])) {
             $validator->addArgument($this->buildProperties($mapping['properties']));
-        } else {
-            $validator->addArgument([]);
         }
 
         if (!empty($mapping['class'])) {
@@ -450,10 +447,6 @@ protected function buildConstraints(array $constraints = [])
      */
     protected function buildCascade(array $cascade)
     {
-        if (empty($cascade)) {
-            return null;
-        }
-
         /**
          * @var string $referenceType
          * @var array  $groups
@@ -605,24 +598,34 @@ protected function buildComplexity($complexity)
                 ;
             }
 
-            return ArrowFunction::new()
-                ->addArgument('childrenComplexity')
-                ->setExpression(Literal::new($expression));
+            $arrow = ArrowFunction::new(\is_string($expression) ? new Literal($expression) : $expression);
+
+            if (ExpressionLanguage::expressionContainsVar('childrenComplexity', $complexity)) {
+                $arrow->addArgument('childrenComplexity');
+            }
+
+            return $arrow;
         }
 
-        return $complexity;
+        return new ArrowFunction(0);
     }
 
     protected function buildPublic($public)
     {
         if ($this->expressionConverter->check($public)) {
             $expression = $this->expressionConverter->convert($public);
+            $arrow = ArrowFunction::new(Literal::new($expression));
 
-            return ArrowFunction::new()
-                ->addArgument('fieldName')
-                ->addArgument('typeName', '', new Literal('self::NAME'))
-                ->setExpression(Literal::new($expression))
-            ;
+            if (ExpressionLanguage::expressionContainsVar('fieldName', $public)) {
+                $arrow->addArgument('fieldName');
+            }
+
+            if (ExpressionLanguage::expressionContainsVar('typeName', $public)) {
+                $arrow->addArgument('fieldName');
+                $arrow->addArgument('typeName', '', new Literal('self::NAME'));
+            }
+
+            return $arrow;
         }
 
         return $public;

src/Validator/InputValidator.php

@@ -149,10 +149,6 @@ protected function buildValidationTree(ValidationNode $rootObject, array $proper
             $this->restructureShortForm($params);
 
             foreach ($params ?? [] as $key => $value) {
-                if (null === $value) {
-                    continue;
-                }
-
                 switch ($key) {
                     case 'link':
                         [$fqcn, $property, $type] = $value;
@@ -233,10 +229,6 @@ private function applyClassConstraints(ObjectMetadata $metadata, array $rules):
         $this->restructureShortForm($rules);
 
         foreach ($rules as $key => $value) {
-            if (null === $value) {
-                continue;
-            }
-
             switch ($key) {
                 case 'link':
                     $linkedMetadata = $this->validator->getMetadataFor($value);

tests/Functional/App/Mutation/InputValidatorMutation.php

@@ -23,7 +23,7 @@ class InputValidatorMutation implements MutationInterface
     public function mutationMock(Argument $args, ?InputValidator $validator = null): bool
     {
         if (null !== $validator) {
-            $validator->validate($args['groups']);
+            $validator($args['groups']);
         }
 
         return true;

tests/Functional/App/config/customScalar/mapping/Query.types.yml

@@ -4,7 +4,7 @@ DateTime:
         description: "The DateTime type"
         serialize: ['Overblog\GraphQLBundle\Tests\Functional\Type\DateTimeType', "serialize"]
         parseValue: ['Overblog\GraphQLBundle\Tests\Functional\Type\DateTimeType', "parseValue"]
-        parseLiteral: ['Overblog\GraphQLBundle\Tests\Functional\Type\DateTimeType', "parseLiteral"]
+        parseLiteral: 'Overblog\GraphQLBundle\Tests\Functional\Type\DateTimeType::parseLiteral'
 
 Query:
     type: object

tests/Functional/App/config/validator/mapping/Mutation.types.yml

@@ -3,11 +3,14 @@ Mutation:
     config:
         fields:
             noValidation:
+                complexity: 1
+                public: true
                 type: Boolean
                 resolve: "@=mut('no_validation')"
                 args:
                     username:
                         type: String!
+                        defaultValue: 'Frank'
                         validation: ~
 
             simpleValidation: