Merge branch 'master' of https://github.com/shmax/graphql-php-validation-toolkit

Author: shmax

.travis.yml

@@ -6,13 +6,6 @@ php:
 - 7.2
 - 7.3
 
-env:
-  matrix:
-  - EXECUTOR= DEPENDENCIES=--prefer-lowest
-  - EXECUTOR=coroutine DEPENDENCIES=--prefer-lowest
-  - EXECUTOR=
-  - EXECUTOR=coroutine
-
 cache:
   directories:
   - $HOME/.composer/cache
@@ -21,7 +14,7 @@ before_install:
 - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available"
 - travis_retry composer self-update
 
-install: travis_retry composer update --prefer-dist
+install: composer update
 
 script: ./vendor/bin/phpunit --group default
 
@@ -32,7 +25,7 @@ jobs:
   include:
   - stage: Test
     install:
-    - travis_retry composer update --prefer-dist {$DEPENDENCIES}
+    - composer update
 
   - stage: Test
     env: COVERAGE
@@ -41,7 +34,6 @@ jobs:
     - if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for coverage"; exit 1; fi
     script:
     - ./vendor/bin/phpunit --coverage-php /tmp/coverage/clover_executor.cov
-    - EXECUTOR=coroutine ./vendor/bin/phpunit --coverage-php /tmp/coverage/clover_executor-coroutine.cov
     after_script:
     - ./vendor/bin/phpcov merge /tmp/coverage --clover /tmp/clover.xml
     - wget https://github.com/scrutinizer-ci/ocular/releases/download/1.5.2/ocular.phar
@@ -50,12 +42,12 @@ jobs:
   - stage: Code Quality
     php: 7.1
     env: CODING_STANDARD
-    install: travis_retry composer install --prefer-dist
+    install: composer install
     script:
     - ./vendor/bin/phpcs
 
   - stage: Code Quality
     php: 7.1
     env: STATIC_ANALYSIS
-    install: travis_retry composer install --prefer-dist
+    install: composer install
     script: composer stan

composer.json

@@ -16,7 +16,7 @@
     "ext-mbstring": "*"
   },
   "require-dev": {
-    "doctrine/coding-standard": "^5.0",
+    "doctrine/coding-standard": "^6.0",
     "phpbench/phpbench": "^0.14.0",
     "phpstan/phpstan": "0.11.16",
     "phpstan/phpstan-phpunit": "0.11.2",

src/Type/Definition/ValidatedFieldDefinition.php

@@ -146,6 +146,10 @@ protected function _validateItems($config, array $value, array $path, callable $
     protected function _validate(array $arg, $value, bool $isParentList = false) : array
     {
         $res = [];
+	    
+        if (is_callable($arg['type'])) {
+            $arg['type'] =  $arg['type']();
+        }
 
         $type = $arg['type'];
         switch ($type) {

tests/Type/ValidatedFieldDefinition/InputObjectValidationTest.php

@@ -35,31 +35,33 @@ public function testInputObjectValidationOnFieldFail(): void
                 'type' => Type::boolean(),
                 'args' => [
                     'bookAttributes' => [
-                        'type' => new InputObjectType([
-                            'name' => 'BookAttributes',
-                            'fields' => [
-                                'title' => [
-                                    'type' => Type::string(),
-                                    'description' => 'Enter a book title, no more than 10 characters in length',
-                                    'validate' => static function (string $title) {
-                                        if (strlen($title) > 10) {
-                                            return [1, 'book title must be less than 10 chaacters'];
-                                        }
-                                        return 0;
-                                    },
-                                ],
-                                'author' => [
-                                    'type' => Type::id(),
-                                    'description' => 'Provide a valid author id',
-                                    'validate' => function (string $authorId) {
-                                        if (!isset($this->data['people'][$authorId])) {
-                                            return [1, 'We have no record of that author'];
-                                        }
-                                        return 0;
-                                    },
-                                ],
-                            ],
-                        ]),
+                        'type' => function() { // lazy load
+            				return new InputObjectType([
+								'name' => 'BookAttributes',
+								'fields' => [
+									'title' => [
+										'type' => Type::string(),
+										'description' => 'Enter a book title, no more than 10 characters in length',
+										'validate' => static function (string $title) {
+											if (strlen($title) > 10) {
+												return [1, 'book title must be less than 10 chaacters'];
+											}
+											return 0;
+										},
+									],
+									'author' => [
+										'type' => Type::id(),
+										'description' => 'Provide a valid author id',
+										'validate' => function (string $authorId) {
+											if (!isset($this->data['people'][$authorId])) {
+												return [1, 'We have no record of that author'];
+											}
+											return 0;
+										},
+									],
+								],
+							]);
+            			},
                     ],
                 ],
                 'resolve' => static function ($value): bool {

tests/Utils.php

@@ -64,7 +64,6 @@ static function toNowDoc($str, $numSpaces=0) {
         }
         array_unshift($lines, "");
         $lines[] = "  ";
-        $res = implode($lines,  "\n");
-        return $res;
+        return implode("\n", $lines);
     }
 }