Inspection of "Refactor listOf processing" - shmax/graphql-php-validation-toolkit - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#1)

by Max

created 2019-10-05 14:52 UTC

Status

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -26,33 +26,33 @@
 block discarded – undo
         GraphQL\Utils\Utils::invariant($config['type'] instanceof Type, 'Must provide type.');
 
         if (isset($config['errorCodes'])) {
-        	if(isset($config['validate'])) {
-		        /** code property */
-		        $finalFields['code'] = [
-			        'type' => $this->_set(new EnumType([
-				        'name' => $this->_nameFromPath(array_merge($path)) . 'ErrorCode',
-				        'description' => 'Error code',
-				        'values' => $config['errorCodes'],
-			        ]), $config),
-			        'description' => 'An error code',
-			        'resolve' => static function ($value) {
-				        return $value['error'][0] ?? null;
-			        },
-		        ];
-
-		        /**
-		         * msg property
-		         */
-		        $finalFields['msg'] = [
-			        'type' => Type::string(),
-			        'description' => 'A natural language description of the issue',
-			        'resolve' => static function ($value) {
-				        return $value['error'][1] ?? null;
-			        },
-		        ];
-	        } else {
-        		throw new \Exception("If you specify errorCodes, you must also provide a validate callback");
-	        }
+            if(isset($config['validate'])) {
+                /** code property */
+                $finalFields['code'] = [
+                    'type' => $this->_set(new EnumType([
+                        'name' => $this->_nameFromPath(array_merge($path)) . 'ErrorCode',
+                        'description' => 'Error code',
+                        'values' => $config['errorCodes'],
+                    ]), $config),
+                    'description' => 'An error code',
+                    'resolve' => static function ($value) {
+                        return $value['error'][0] ?? null;
+                    },
+                ];
+
+                /**
+                 * msg property
+                 */
+                $finalFields['msg'] = [
+                    'type' => Type::string(),
+                    'description' => 'A natural language description of the issue',
+                    'resolve' => static function ($value) {
+                        return $value['error'][1] ?? null;
+                    },
+                ];
+            } else {
+                throw new \Exception("If you specify errorCodes, you must also provide a validate callback");
+            }
         }
 
         $type = $config['type'];

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
         GraphQL\Utils\Utils::invariant($config['type'] instanceof Type, 'Must provide type.');
 
         if (isset($config['errorCodes'])) {
-        	if(isset($config['validate'])) {
+        	if (isset($config['validate'])) {
 		        /** code property */
 		        $finalFields['code'] = [
 			        'type' => $this->_set(new EnumType([
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 				        'values' => $config['errorCodes'],
 			        ]), $config),
 			        'description' => 'An error code',
-			        'resolve' => static function ($value) {
+			        'resolve' => static function($value) {
 				        return $value['error'][0] ?? null;
 			        },
 		        ];
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 		        $finalFields['msg'] = [
 			        'type' => Type::string(),
 			        'description' => 'A natural language description of the issue',
-			        'resolve' => static function ($value) {
+			        'resolve' => static function($value) {
 				        return $value['error'][1] ?? null;
 			        },
 		        ];
@@ -60,18 +60,18 @@  discard block
 block discarded – undo
             $fields = [];
             foreach ($type->getFields() as $key => $field) {
                 $newType = static::create(
-                    $field->config + ['typeSetter' => $config['typeSetter'] ?? null],
+                    $field->config+['typeSetter' => $config['typeSetter'] ?? null],
                     array_merge($path, [$key])
                 );
 
-                if (! $newType) {
+                if (!$newType) {
                     continue;
                 }
 
                 $fields[$key] = [
                     'description' => 'Error for ' . $key,
                     'type' => $newType,
-                    'resolve' => static function ($value) use ($key) {
+                    'resolve' => static function($value) use ($key) {
                         return $value[$key] ?? null;
                     },
                 ];
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
                         'fields' => $fields,
                     ]), $config),
                     'description' => 'Suberrors for ' . ucfirst($path[count($path)-1]),
-                    'resolve' => static function (array $value) {
+                    'resolve' => static function(array $value) {
                         return $value['suberrors'] ?? null;
                     },
                 ];
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
                 $finalFields['suberrors'] = [
                     'description' => 'Suberrors for the list of ' . $type->ofType . ' items',
                     'type' => $newType,
-                    'resolve' => static function ($value) {
+                    'resolve' => static function($value) {
                         return $value['suberrors'] ?? null;
                     },
                 ];
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
             $finalFields['path'] = [
                 'type' => Type::listOf(Type::int()),
                 'description' => 'A path describing this items\'s location in the nested array',
-                'resolve' => static function ($value) {
+                'resolve' => static function($value) {
                     return $value['path'];
                 },
             ];
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
             $config['fields']['code'] = $config['fields']['code'] ?? [
                 'type' => Type::int(),
                 'description' => 'A numeric error code. 0 on success, non-zero on failure.',
-                'resolve' => static function ($value) {
+                'resolve' => static function($value) {
                     $error = $value['error'] ?? null;
                     switch (gettype($error)) {
                         case 'integer':
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
             $config['fields']['msg'] = $config['fields']['msg'] ?? [
                 'type' => Type::string(),
                 'description' => 'An error message.',
-                'resolve' => static function ($value) {
+                'resolve' => static function($value) {
                     $error = $value['error'] ?? null;
                     switch (gettype($error)) {
                         case 'integer':

Please login to merge, or discard this patch.

tests/Utils.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -22,7 +22,7 @@
 block discarded – undo
         }
 
         // Toss out the first and last lines.
-        $lines = array_slice($lines, 1, count($lines) - 2);
+        $lines = array_slice($lines, 1, count($lines)-2);
 
         // take the tabs from the first line, and subtract them from all lines
         $matches = [];

Please login to merge, or discard this patch.

tests/Type/ErrorCodeTypeGenerationTest.php 1 patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@  discard block
 block discarded – undo
     {
         $types = [];
         new UserErrorsType([
-        	'validate' => static function($val) {},
+            'validate' => static function($val) {},
             'errorCodes' => [
                 'unknownUser',
                 'userIsMinor',
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
                 'name' => 'bookInput',
                 'fields' => [
                     'authorId' => [
-	                    'validate' => static function($authorId) {},
+                        'validate' => static function($authorId) {},
                         'errorCodes' => ['unknownAuthor'],
                         'type' => Type::id(),
                         'description' => 'An author Id',

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/InputObjectTest.php 2 patches

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -45,9 +45,9 @@  discard block
 block discarded – undo
 
     public function testFieldsWithErrorCodesButNoValidate()
     {
-	    $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
+        $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
 
-	    $type  = new UserErrorsType([
+        $type  = new UserErrorsType([
             'type' => new InputObjectType([
                 'name' => 'bookInput',
                 'fields' => [
@@ -61,25 +61,25 @@  discard block
 block discarded – undo
         ], ['updateBook']);
     }
 
-	public function testFieldsWithValidate()
-	{
-		$type  = new UserErrorsType([
-			'type' => new InputObjectType([
-				'name' => 'bookInput',
-				'fields' => [
-					'authorId' => [
-						'errorCodes' => ['unknownAuthor'],
-						'validate' => static function(int $authorId) {
+    public function testFieldsWithValidate()
+    {
+        $type  = new UserErrorsType([
+            'type' => new InputObjectType([
+                'name' => 'bookInput',
+                'fields' => [
+                    'authorId' => [
+                        'errorCodes' => ['unknownAuthor'],
+                        'validate' => static function(int $authorId) {
 
-						},
-						'type' => Type::id(),
-						'description' => 'An author Id',
-					],
-				],
-			])
-		], ['updateBook']);
+                        },
+                        'type' => Type::id(),
+                        'description' => 'An author Id',
+                    ],
+                ],
+            ])
+        ], ['updateBook']);
 
-		self::assertEquals(Utils::nowdoc('
+        self::assertEquals(Utils::nowdoc('
 			schema {
 			  query: UpdateBookError
 			}
@@ -111,5 +111,5 @@  discard block
 block discarded – undo
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -17,7 +17,7 @@  discard block
 block discarded – undo
 {
     public function testFieldsWithNoErrorCodes()
     {
-        $type  = new UserErrorsType([
+        $type = new UserErrorsType([
             'type' => new InputObjectType([
                 'name' => 'bookInput',
                 'fields' => [
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
     {
 	    $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
 
-	    $type  = new UserErrorsType([
+	    $type = new UserErrorsType([
             'type' => new InputObjectType([
                 'name' => 'bookInput',
                 'fields' => [
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
 
 	public function testFieldsWithValidate()
 	{
-		$type  = new UserErrorsType([
+		$type = new UserErrorsType([
 			'type' => new InputObjectType([
 				'name' => 'bookInput',
 				'fields' => [

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/ScalarTest.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -37,7 +37,7 @@
 block discarded – undo
     {
         $type = new UserErrorsType([
             'errorCodes' => ['invalidColor'],
-            'validate' => static function ($value) {
+            'validate' => static function($value) {
                 return 0;
             },
             'type' => new IDType(['name' => 'Color']),

Please login to merge, or discard this patch.

tests/Type/ValidatedFieldDefinition/ListOfScalarValidationTest.php 2 patches

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

@@ -93,10 +93,10 @@  discard block
 block discarded – undo
             null,
             [
                 'phoneNumbers' => [
-                	[
-	                    '123-4567',
-	                    'xxx456-7890xxx'
-		            ]
+                    [
+                        '123-4567',
+                        'xxx456-7890xxx'
+                    ]
                 ],
             ]
         );
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
                         'phoneNumbers' =>
                             [
                                 'suberrors' =>
-	                                [
-	                                    'path' => [0,1],
-	                                    'code' => 'invalidPhoneNumber',
-	                                ]
+                                    [
+                                        'path' => [0,1],
+                                        'code' => 'invalidPhoneNumber',
+                                    ]
                             ],
                     ],
                 'result' => null,
@@ -152,39 +152,39 @@  discard block
 block discarded – undo
             null,
             [
                 'phoneNumbers' => [
-                	[],
-                	[
-	                    '123-4567',
-	                    'xxx-7890',
-	                    '321-1234'
-		            ]
+                    [],
+                    [
+                        '123-4567',
+                        'xxx-7890',
+                        '321-1234'
+                    ]
                 ],
             ]
         );
 
         static::assertEmpty($res->errors);
         static::assertEquals(
-	        array (
-		        'valid' => false,
-		        'suberrors' =>
-			        array (
-				        'phoneNumbers' =>
-					        array (
-						        'code' => NULL,
-						        'msg' => NULL,
-						        'suberrors' =>
-							        array (
-								        'path' =>
-									        array (
-										        0 => 1,
-										        1 => 1,
-									        ),
-								        'code' => 'invalidPhoneNumber',
-							        ),
-					        ),
-			        ),
-		        'result' => NULL,
-	        ),
+            array (
+                'valid' => false,
+                'suberrors' =>
+                    array (
+                        'phoneNumbers' =>
+                            array (
+                                'code' => NULL,
+                                'msg' => NULL,
+                                'suberrors' =>
+                                    array (
+                                        'path' =>
+                                            array (
+                                                0 => 1,
+                                                1 => 1,
+                                            ),
+                                        'code' => 'invalidPhoneNumber',
+                                    ),
+                            ),
+                    ),
+                'result' => NULL,
+            ),
             $res->data['setPhoneNumbers']
         );
 

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -31,7 +31,7 @@  discard block
 block discarded – undo
             'query' => $this->query,
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => static function () {
+                'fields' => static function() {
                     return [
                         'setPhoneNumbers' => new ValidatedFieldDefinition([
                             'name' => 'setPhoneNumbers',
@@ -40,20 +40,20 @@  discard block
 block discarded – undo
                                 'phoneNumbers' => [
                                     'type' => Type::listOf(Type::listOf(Type::string())),
                                     'errorCodes' => ['maxNumExceeded'],
-                                    'validate' => static function (array $phoneNumbers) {
+                                    'validate' => static function(array $phoneNumbers) {
                                         if (count($phoneNumbers) > 2) {
                                             return ['maxNumExceeded', 'You may not submit more than 2 lists of phone numbers'];
                                         }
                                         return 0;
                                     },
                                     'suberrorCodes' => ['invalidPhoneNumber'],
-                                    'validateItem' => static function ($phoneNumber) {
+                                    'validateItem' => static function($phoneNumber) {
                                         $res = preg_match('/^[0-9\-]+$/', $phoneNumber) === 1;
-                                        return ! $res ? ['invalidPhoneNumber', 'That does not seem to be a valid phone number'] : 0;
+                                        return !$res ? ['invalidPhoneNumber', 'That does not seem to be a valid phone number'] : 0;
                                     },
                                 ],
                             ],
-                            'resolve' => static function (array $phoneNumbers, $args) : bool {
+                            'resolve' => static function(array $phoneNumbers, $args) : bool {
                                 // ...
                                 // stash them somewhere
                                 // ...
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
                             [
                                 'suberrors' =>
 	                                [
-	                                    'path' => [0,1],
+	                                    'path' => [0, 1],
 	                                    'code' => 'invalidPhoneNumber',
 	                                ]
                             ],
@@ -164,18 +164,18 @@  discard block
 block discarded – undo
 
         static::assertEmpty($res->errors);
         static::assertEquals(
-	        array (
+	        array(
 		        'valid' => false,
 		        'suberrors' =>
-			        array (
+			        array(
 				        'phoneNumbers' =>
-					        array (
+					        array(
 						        'code' => NULL,
 						        'msg' => NULL,
 						        'suberrors' =>
-							        array (
+							        array(
 								        'path' =>
-									        array (
+									        array(
 										        0 => 1,
 										        1 => 1,
 									        ),

Please login to merge, or discard this patch.

tests/Type/ValidatedFieldDefinition/ListOfInputObjectValidationTest.php 2 patches

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -100,13 +100,13 @@  discard block
 block discarded – undo
                             'args' => [
                                 'bookAttributes' => [
                                     'type' => Type::listOf($this->bookAttributesInputType),
-	                                'validate' => static function($var) {
-                        	            $i = 5;
-	                                },
-	                                'validateItem' => static function($book) {
-                        	            $res = isset($book['author']) || isset($book['title']) ? 0: 1;
-                        	            return $res;
-	                                }
+                                    'validate' => static function($var) {
+                                        $i = 5;
+                                    },
+                                    'validateItem' => static function($book) {
+                                        $res = isset($book['author']) || isset($book['title']) ? 0: 1;
+                                        return $res;
+                                    }
                                 ],
                             ],
                             'resolve' => static function ($value) : bool {
@@ -166,30 +166,30 @@  discard block
 block discarded – undo
             ]
         );
 
-	    static::assertEmpty($res->errors);
+        static::assertEmpty($res->errors);
 
         static::assertEquals(
-	        array (
-		        'valid' => false,
-		        'result' => NULL,
-		        'suberrors' =>
-			        array (
-				        'bookAttributes' =>
-					        array (
-						        'code' => NULL,
-						        'msg' => NULL,
-						        'suberrors' =>
-							        array (
-								        'code' => 1,
-								        'msg' => '',
-								        'path' =>
-									        array (
-										        0 => 1,
-									        ),
-							        ),
-					        ),
-			        ),
-	        ),
+            array (
+                'valid' => false,
+                'result' => NULL,
+                'suberrors' =>
+                    array (
+                        'bookAttributes' =>
+                            array (
+                                'code' => NULL,
+                                'msg' => NULL,
+                                'suberrors' =>
+                                    array (
+                                        'code' => 1,
+                                        'msg' => '',
+                                        'path' =>
+                                            array (
+                                                0 => 1,
+                                            ),
+                                    ),
+                            ),
+                    ),
+            ),
             $res->data['updateBooks']
         );
 

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -62,7 +62,7 @@  discard block
 block discarded – undo
                 'title' => [
                     'type' => Type::string(),
                     'description' => 'Enter a book title, no more than 10 characters in length',
-                    'validate' => static function (string $title) {
+                    'validate' => static function(string $title) {
                         if (strlen($title) > 10) {
                             return [1, 'book title must be less than 10 chaacters'];
                         }
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
                         'unknownAuthor',
                         'authorDeceased',
                     ],
-                    'validate' => function (string $authorId) {
-                        if (! isset($this->data['people'][$authorId])) {
+                    'validate' => function(string $authorId) {
+                        if (!isset($this->data['people'][$authorId])) {
                             return ['unknownAuthor', 'We have no record of that author'];
                         }
                         return 0;
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
             'query' => $this->query,
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => function () {
+                'fields' => function() {
                     return [
                         'updateBooks' => new ValidatedFieldDefinition([
                             'name' => 'updateBooks',
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
                         	            $i = 5;
 	                                },
 	                                'validateItem' => static function($book) {
-                        	            $res = isset($book['author']) || isset($book['title']) ? 0: 1;
+                        	            $res = isset($book['author']) || isset($book['title']) ? 0 : 1;
                         	            return $res;
 	                                }
                                 ],
                             ],
-                            'resolve' => static function ($value) : bool {
+                            'resolve' => static function($value) : bool {
                                 // ...
                                 // do update
                                 // ...
@@ -169,21 +169,21 @@  discard block
 block discarded – undo
 	    static::assertEmpty($res->errors);
 
         static::assertEquals(
-	        array (
+	        array(
 		        'valid' => false,
 		        'result' => NULL,
 		        'suberrors' =>
-			        array (
+			        array(
 				        'bookAttributes' =>
-					        array (
+					        array(
 						        'code' => NULL,
 						        'msg' => NULL,
 						        'suberrors' =>
-							        array (
+							        array(
 								        'code' => 1,
 								        'msg' => '',
 								        'path' =>
-									        array (
+									        array(
 										        0 => 1,
 									        ),
 							        ),

Please login to merge, or discard this patch.

src/Type/Definition/ValidateItemsError.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -2,11 +2,11 @@
 block discarded – undo
 namespace GraphQL\Type\Definition;
 
 class ValidateItemsError extends \Exception {
-	public $path;
-	public $error;
-	function __construct($path, $error) {
-		parent::__construct();
-		$this->path = $path;
-		$this->error = $error;
-	}
+    public $path;
+    public $error;
+    function __construct($path, $error) {
+        parent::__construct();
+        $this->path = $path;
+        $this->error = $error;
+    }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

src/Type/Definition/ValidatedFieldDefinition.php 3 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -81,11 +81,11 @@
 block discarded – undo
         ]);
     }
 
-	protected function _isAssoc(array $arr)
-	{
-		if (array() === $arr) return false;
-		return array_keys($arr) !== range(0, count($arr) - 1);
-	}
+    protected function _isAssoc(array $arr)
+    {
+        if (array() === $arr) return false;
+        return array_keys($arr) !== range(0, count($arr) - 1);
+    }
 
     protected function _validateItems($value, array $path, callable $validate) {
         foreach ($value as $idx => $subValue) {

Please login to merge, or discard this patch.

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 
         $this->typeSetter = $config['typeSetter'] ?? null;
 
-        if (! isset($config['type'])) {
+        if (!isset($config['type'])) {
             throw new Exception('You must specify a type for your field');
         }
 
@@ -38,14 +38,14 @@  discard block
 block discarded – undo
                 'result' => [
                     'type' => $config['type'],
                     'description' => 'The payload, if any',
-                    'resolve' => static function ($value) {
+                    'resolve' => static function($value) {
                         return $value['result'] ?? null;
                     },
                 ],
                 'valid' => [
                     'type' => Type::nonNull(Type::boolean()),
                     'description' => 'Whether all validation passed. True for yes, false for no.',
-                    'resolve' => static function ($value) {
+                    'resolve' => static function($value) {
                         return $value['valid'];
                     },
                 ],
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
             'type' => $type,
             'args' => $args,
             'name' => $name,
-            'resolve' => function ($value, $args1, $context, $info) use ($config, $args) {
+            'resolve' => function($value, $args1, $context, $info) use ($config, $args) {
                 // validate inputs
-                $config['type']  = new InputObjectType([
+                $config['type'] = new InputObjectType([
                     'name'=>'',
                     'fields' => $args,
                 ]);
                 $errors          = $this->_validate($config, $args1);
                 $result          = $errors;
-                $result['valid'] = ! $errors;
+                $result['valid'] = !$errors;
 
-                if (! isset($result['error']) && ! isset($result['suberrors'])) {
+                if (!isset($result['error']) && !isset($result['suberrors'])) {
                     $result['result'] = $config['resolve']($value, $args1, $context, $info);
                 }
 
@@ -84,19 +84,19 @@  discard block
 block discarded – undo
 	protected function _isAssoc(array $arr)
 	{
 		if (array() === $arr) return false;
-		return array_keys($arr) !== range(0, count($arr) - 1);
+		return array_keys($arr) !== range(0, count($arr)-1);
 	}
 
     protected function _validateItems($value, array $path, callable $validate) {
         foreach ($value as $idx => $subValue) {
-            if(is_array($subValue) && !$this->_isAssoc($subValue)) {
+            if (is_array($subValue) && !$this->_isAssoc($subValue)) {
                 $path[count($path)-1] = $idx;
                 $newPath = $path;
                 $newPath[] = 0;
                 $this->_validateItems($subValue, $newPath, $validate);
             }
             else {
-                $path[count($path) - 1] = $idx;
+                $path[count($path)-1] = $idx;
                 $err = $validate($subValue);
 
                 if ($err) {
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
                     }
                 }
 
-                if(isset($arg['validateItem'])) {
+                if (isset($arg['validateItem'])) {
                     try {
                         $this->_validateItems($value, [0], $arg['validateItem']);
                     }
-                    catch(ValidateItemsError $e) {
+                    catch (ValidateItemsError $e) {
                         $res['suberrors'] = [
                             'error' => $e->error,
                             'path' => $e->path

Please login to merge, or discard this patch.

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -83,7 +83,9 @@  discard block
 block discarded – undo
 
 	protected function _isAssoc(array $arr)
 	{
-		if (array() === $arr) return false;
+		if (array() === $arr) {
+		    return false;
+		}
 		return array_keys($arr) !== range(0, count($arr) - 1);
 	}
 
@@ -94,8 +96,7 @@  discard block
 block discarded – undo
                 $newPath = $path;
                 $newPath[] = 0;
                 $this->_validateItems($subValue, $newPath, $validate);
-            }
-            else {
+            } else {
                 $path[count($path) - 1] = $idx;
                 $err = $validate($subValue);
 
@@ -127,8 +128,7 @@  discard block
 block discarded – undo
                 if(isset($arg['validateItem'])) {
                     try {
                         $this->_validateItems($value, [0], $arg['validateItem']);
-                    }
-                    catch(ValidateItemsError $e) {
+                    } catch(ValidateItemsError $e) {
                         $res['suberrors'] = [
                             'error' => $e->error,
                             'path' => $e->path

Please login to merge, or discard this patch.

		@@ -26,33 +26,33 @@
		block discarded – undo
26	26	GraphQL\Utils\Utils::invariant($config['type'] instanceof Type, 'Must provide type.');
27	27
28	28	if (isset($config['errorCodes'])) {
29		- if(isset($config['validate'])) {
30		- /** code property */
31		- $finalFields['code'] = [
32		- 'type' => $this->_set(new EnumType([
33		- 'name' => $this->_nameFromPath(array_merge($path)) . 'ErrorCode',
34		- 'description' => 'Error code',
35		- 'values' => $config['errorCodes'],
36		- ]), $config),
37		- 'description' => 'An error code',
38		- 'resolve' => static function ($value) {
39		- return $value['error'][0] ?? null;
40		- },
41		- ];
42		-
43		- /**
44		- * msg property
45		- */
46		- $finalFields['msg'] = [
47		- 'type' => Type::string(),
48		- 'description' => 'A natural language description of the issue',
49		- 'resolve' => static function ($value) {
50		- return $value['error'][1] ?? null;
51		- },
52		- ];
53		- } else {
54		- throw new \Exception("If you specify errorCodes, you must also provide a validate callback");
55		- }
	29	+ if(isset($config['validate'])) {
	30	+ /** code property */
	31	+ $finalFields['code'] = [
	32	+ 'type' => $this->_set(new EnumType([
	33	+ 'name' => $this->_nameFromPath(array_merge($path)) . 'ErrorCode',
	34	+ 'description' => 'Error code',
	35	+ 'values' => $config['errorCodes'],
	36	+ ]), $config),
	37	+ 'description' => 'An error code',
	38	+ 'resolve' => static function ($value) {
	39	+ return $value['error'][0] ?? null;
	40	+ },
	41	+ ];
	42	+
	43	+ /**
	44	+ * msg property
	45	+ */
	46	+ $finalFields['msg'] = [
	47	+ 'type' => Type::string(),
	48	+ 'description' => 'A natural language description of the issue',
	49	+ 'resolve' => static function ($value) {
	50	+ return $value['error'][1] ?? null;
	51	+ },
	52	+ ];
	53	+ } else {
	54	+ throw new \Exception("If you specify errorCodes, you must also provide a validate callback");
	55	+ }
56	56	}
57	57
58	58	$type = $config['type'];

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	GraphQL\Utils\Utils::invariant($config['type'] instanceof Type, 'Must provide type.');
27	27
28	28	if (isset($config['errorCodes'])) {
29		- if(isset($config['validate'])) {
	29	+ if (isset($config['validate'])) {
30	30	/** code property */
31	31	$finalFields['code'] = [
32	32	'type' => $this->_set(new EnumType([
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	'values' => $config['errorCodes'],
36	36	]), $config),
37	37	'description' => 'An error code',
38		- 'resolve' => static function ($value) {
	38	+ 'resolve' => static function($value) {
39	39	return $value['error'][0] ?? null;
40	40	},
41	41	];
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	$finalFields['msg'] = [
47	47	'type' => Type::string(),
48	48	'description' => 'A natural language description of the issue',
49		- 'resolve' => static function ($value) {
	49	+ 'resolve' => static function($value) {
50	50	return $value['error'][1] ?? null;
51	51	},
52	52	];
		@@ -60,18 +60,18 @@ discard block
		block discarded – undo
60	60	$fields = [];
61	61	foreach ($type->getFields() as $key => $field) {
62	62	$newType = static::create(
63		- $field->config + ['typeSetter' => $config['typeSetter'] ?? null],
	63	+ $field->config+['typeSetter' => $config['typeSetter'] ?? null],
64	64	array_merge($path, [$key])
65	65	);
66	66
67		- if (! $newType) {
	67	+ if (!$newType) {
68	68	continue;
69	69	}
70	70
71	71	$fields[$key] = [
72	72	'description' => 'Error for ' . $key,
73	73	'type' => $newType,
74		- 'resolve' => static function ($value) use ($key) {
	74	+ 'resolve' => static function($value) use ($key) {
75	75	return $value[$key] ?? null;
76	76	},
77	77	];
		@@ -88,7 +88,7 @@ discard block
		block discarded – undo
88	88	'fields' => $fields,
89	89	]), $config),
90	90	'description' => 'Suberrors for ' . ucfirst($path[count($path)-1]),
91		- 'resolve' => static function (array $value) {
	91	+ 'resolve' => static function(array $value) {
92	92	return $value['suberrors'] ?? null;
93	93	},
94	94	];
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$finalFields['suberrors'] = [
113	113	'description' => 'Suberrors for the list of ' . $type->ofType . ' items',
114	114	'type' => $newType,
115		- 'resolve' => static function ($value) {
	115	+ 'resolve' => static function($value) {
116	116	return $value['suberrors'] ?? null;
117	117	},
118	118	];
		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	$finalFields['path'] = [
127	127	'type' => Type::listOf(Type::int()),
128	128	'description' => 'A path describing this items\'s location in the nested array',
129		- 'resolve' => static function ($value) {
	129	+ 'resolve' => static function($value) {
130	130	return $value['path'];
131	131	},
132	132	];
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	$config['fields']['code'] = $config['fields']['code'] ?? [
164	164	'type' => Type::int(),
165	165	'description' => 'A numeric error code. 0 on success, non-zero on failure.',
166		- 'resolve' => static function ($value) {
	166	+ 'resolve' => static function($value) {
167	167	$error = $value['error'] ?? null;
168	168	switch (gettype($error)) {
169	169	case 'integer':
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	$config['fields']['msg'] = $config['fields']['msg'] ?? [
177	177	'type' => Type::string(),
178	178	'description' => 'An error message.',
179		- 'resolve' => static function ($value) {
	179	+ 'resolve' => static function($value) {
180	180	$error = $value['error'] ?? null;
181	181	switch (gettype($error)) {
182	182	case 'integer':

		@@ -22,7 +22,7 @@
		block discarded – undo
22	22	}
23	23
24	24	// Toss out the first and last lines.
25		- $lines = array_slice($lines, 1, count($lines) - 2);
	25	+ $lines = array_slice($lines, 1, count($lines)-2);
26	26
27	27	// take the tabs from the first line, and subtract them from all lines
28	28	$matches = [];

		@@ -19,7 +19,7 @@ discard block
		block discarded – undo
19	19	{
20	20	$types = [];
21	21	new UserErrorsType([
22		- 'validate' => static function($val) {},
	22	+ 'validate' => static function($val) {},
23	23	'errorCodes' => [
24	24	'unknownUser',
25	25	'userIsMinor',
		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79	'name' => 'bookInput',
80	80	'fields' => [
81	81	'authorId' => [
82		- 'validate' => static function($authorId) {},
	82	+ 'validate' => static function($authorId) {},
83	83	'errorCodes' => ['unknownAuthor'],
84	84	'type' => Type::id(),
85	85	'description' => 'An author Id',

		@@ -45,9 +45,9 @@ discard block
		block discarded – undo
45	45
46	46	public function testFieldsWithErrorCodesButNoValidate()
47	47	{
48		- $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
	48	+ $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
49	49
50		- $type = new UserErrorsType([
	50	+ $type = new UserErrorsType([
51	51	'type' => new InputObjectType([
52	52	'name' => 'bookInput',
53	53	'fields' => [
		@@ -61,25 +61,25 @@ discard block
		block discarded – undo
61	61	], ['updateBook']);
62	62	}
63	63
64		- public function testFieldsWithValidate()
65		- {
66		- $type = new UserErrorsType([
67		- 'type' => new InputObjectType([
68		- 'name' => 'bookInput',
69		- 'fields' => [
70		- 'authorId' => [
71		- 'errorCodes' => ['unknownAuthor'],
72		- 'validate' => static function(int $authorId) {
	64	+ public function testFieldsWithValidate()
	65	+ {
	66	+ $type = new UserErrorsType([
	67	+ 'type' => new InputObjectType([
	68	+ 'name' => 'bookInput',
	69	+ 'fields' => [
	70	+ 'authorId' => [
	71	+ 'errorCodes' => ['unknownAuthor'],
	72	+ 'validate' => static function(int $authorId) {
73	73
74		- },
75		- 'type' => Type::id(),
76		- 'description' => 'An author Id',
77		- ],
78		- ],
79		- ])
80		- ], ['updateBook']);
	74	+ },
	75	+ 'type' => Type::id(),
	76	+ 'description' => 'An author Id',
	77	+ ],
	78	+ ],
	79	+ ])
	80	+ ], ['updateBook']);
81	81
82		- self::assertEquals(Utils::nowdoc('
	82	+ self::assertEquals(Utils::nowdoc('
83	83	schema {
84	84	query: UpdateBookError
85	85	}
		@@ -111,5 +111,5 @@ discard block
		block discarded – undo
111	111	}
112	112
113	113	'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
114		- }
	114	+ }
115	115	}

		@@ -17,7 +17,7 @@ discard block
		block discarded – undo
17	17	{
18	18	public function testFieldsWithNoErrorCodes()
19	19	{
20		- $type = new UserErrorsType([
	20	+ $type = new UserErrorsType([
21	21	'type' => new InputObjectType([
22	22	'name' => 'bookInput',
23	23	'fields' => [
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47	{
48	48	$this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
49	49
50		- $type = new UserErrorsType([
	50	+ $type = new UserErrorsType([
51	51	'type' => new InputObjectType([
52	52	'name' => 'bookInput',
53	53	'fields' => [
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63
64	64	public function testFieldsWithValidate()
65	65	{
66		- $type = new UserErrorsType([
	66	+ $type = new UserErrorsType([
67	67	'type' => new InputObjectType([
68	68	'name' => 'bookInput',
69	69	'fields' => [

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37	{
38	38	$type = new UserErrorsType([
39	39	'errorCodes' => ['invalidColor'],
40		- 'validate' => static function ($value) {
	40	+ 'validate' => static function($value) {
41	41	return 0;
42	42	},
43	43	'type' => new IDType(['name' => 'Color']),

		@@ -93,10 +93,10 @@ discard block
		block discarded – undo
93	93	null,
94	94	[
95	95	'phoneNumbers' => [
96		- [
97		- '123-4567',
98		- 'xxx456-7890xxx'
99		- ]
	96	+ [
	97	+ '123-4567',
	98	+ 'xxx456-7890xxx'
	99	+ ]
100	100	],
101	101	]
102	102	);
		@@ -109,10 +109,10 @@ discard block
		block discarded – undo
109	109	'phoneNumbers' =>
110	110	[
111	111	'suberrors' =>
112		- [
113		- 'path' => [0,1],
114		- 'code' => 'invalidPhoneNumber',
115		- ]
	112	+ [
	113	+ 'path' => [0,1],
	114	+ 'code' => 'invalidPhoneNumber',
	115	+ ]
116	116	],
117	117	],
118	118	'result' => null,
		@@ -152,39 +152,39 @@ discard block
		block discarded – undo
152	152	null,
153	153	[
154	154	'phoneNumbers' => [
155		- [],
156		- [
157		- '123-4567',
158		- 'xxx-7890',
159		- '321-1234'
160		- ]
	155	+ [],
	156	+ [
	157	+ '123-4567',
	158	+ 'xxx-7890',
	159	+ '321-1234'
	160	+ ]
161	161	],
162	162	]
163	163	);
164	164
165	165	static::assertEmpty($res->errors);
166	166	static::assertEquals(
167		- array (
168		- 'valid' => false,
169		- 'suberrors' =>
170		- array (
171		- 'phoneNumbers' =>
172		- array (
173		- 'code' => NULL,
174		- 'msg' => NULL,
175		- 'suberrors' =>
176		- array (
177		- 'path' =>
178		- array (
179		- 0 => 1,
180		- 1 => 1,
181		- ),
182		- 'code' => 'invalidPhoneNumber',
183		- ),
184		- ),
185		- ),
186		- 'result' => NULL,
187		- ),
	167	+ array (
	168	+ 'valid' => false,
	169	+ 'suberrors' =>
	170	+ array (
	171	+ 'phoneNumbers' =>
	172	+ array (
	173	+ 'code' => NULL,
	174	+ 'msg' => NULL,
	175	+ 'suberrors' =>
	176	+ array (
	177	+ 'path' =>
	178	+ array (
	179	+ 0 => 1,
	180	+ 1 => 1,
	181	+ ),
	182	+ 'code' => 'invalidPhoneNumber',
	183	+ ),
	184	+ ),
	185	+ ),
	186	+ 'result' => NULL,
	187	+ ),
188	188	$res->data['setPhoneNumbers']
189	189	);
190	190

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31	'query' => $this->query,
32	32	'mutation' => new ObjectType([
33	33	'name' => 'Mutation',
34		- 'fields' => static function () {
	34	+ 'fields' => static function() {
35	35	return [
36	36	'setPhoneNumbers' => new ValidatedFieldDefinition([
37	37	'name' => 'setPhoneNumbers',
		@@ -40,20 +40,20 @@ discard block
		block discarded – undo
40	40	'phoneNumbers' => [
41	41	'type' => Type::listOf(Type::listOf(Type::string())),
42	42	'errorCodes' => ['maxNumExceeded'],
43		- 'validate' => static function (array $phoneNumbers) {
	43	+ 'validate' => static function(array $phoneNumbers) {
44	44	if (count($phoneNumbers) > 2) {
45	45	return ['maxNumExceeded', 'You may not submit more than 2 lists of phone numbers'];
46	46	}
47	47	return 0;
48	48	},
49	49	'suberrorCodes' => ['invalidPhoneNumber'],
50		- 'validateItem' => static function ($phoneNumber) {
	50	+ 'validateItem' => static function($phoneNumber) {
51	51	$res = preg_match('/^[0-9\-]+$/', $phoneNumber) === 1;
52		- return ! $res ? ['invalidPhoneNumber', 'That does not seem to be a valid phone number'] : 0;
	52	+ return !$res ? ['invalidPhoneNumber', 'That does not seem to be a valid phone number'] : 0;
53	53	},
54	54	],
55	55	],
56		- 'resolve' => static function (array $phoneNumbers, $args) : bool {
	56	+ 'resolve' => static function(array $phoneNumbers, $args) : bool {
57	57	// ...
58	58	// stash them somewhere
59	59	// ...
		@@ -110,7 +110,7 @@ discard block
		block discarded – undo
110	110	[
111	111	'suberrors' =>
112	112	[
113		- 'path' => [0,1],
	113	+ 'path' => [0, 1],
114	114	'code' => 'invalidPhoneNumber',
115	115	]
116	116	],
		@@ -164,18 +164,18 @@ discard block
		block discarded – undo
164	164
165	165	static::assertEmpty($res->errors);
166	166	static::assertEquals(
167		- array (
	167	+ array(
168	168	'valid' => false,
169	169	'suberrors' =>
170		- array (
	170	+ array(
171	171	'phoneNumbers' =>
172		- array (
	172	+ array(
173	173	'code' => NULL,
174	174	'msg' => NULL,
175	175	'suberrors' =>
176		- array (
	176	+ array(
177	177	'path' =>
178		- array (
	178	+ array(
179	179	0 => 1,
180	180	1 => 1,
181	181	),

		@@ -100,13 +100,13 @@ discard block
		block discarded – undo
100	100	'args' => [
101	101	'bookAttributes' => [
102	102	'type' => Type::listOf($this->bookAttributesInputType),
103		- 'validate' => static function($var) {
104		- $i = 5;
105		- },
106		- 'validateItem' => static function($book) {
107		- $res = isset($book['author']) \|\| isset($book['title']) ? 0: 1;
108		- return $res;
109		- }
	103	+ 'validate' => static function($var) {
	104	+ $i = 5;
	105	+ },
	106	+ 'validateItem' => static function($book) {
	107	+ $res = isset($book['author']) \|\| isset($book['title']) ? 0: 1;
	108	+ return $res;
	109	+ }
110	110	],
111	111	],
112	112	'resolve' => static function ($value) : bool {
		@@ -166,30 +166,30 @@ discard block
		block discarded – undo
166	166	]
167	167	);
168	168
169		- static::assertEmpty($res->errors);
	169	+ static::assertEmpty($res->errors);
170	170
171	171	static::assertEquals(
172		- array (
173		- 'valid' => false,
174		- 'result' => NULL,
175		- 'suberrors' =>
176		- array (
177		- 'bookAttributes' =>
178		- array (
179		- 'code' => NULL,
180		- 'msg' => NULL,
181		- 'suberrors' =>
182		- array (
183		- 'code' => 1,
184		- 'msg' => '',
185		- 'path' =>
186		- array (
187		- 0 => 1,
188		- ),
189		- ),
190		- ),
191		- ),
192		- ),
	172	+ array (
	173	+ 'valid' => false,
	174	+ 'result' => NULL,
	175	+ 'suberrors' =>
	176	+ array (
	177	+ 'bookAttributes' =>
	178	+ array (
	179	+ 'code' => NULL,
	180	+ 'msg' => NULL,
	181	+ 'suberrors' =>
	182	+ array (
	183	+ 'code' => 1,
	184	+ 'msg' => '',
	185	+ 'path' =>
	186	+ array (
	187	+ 0 => 1,
	188	+ ),
	189	+ ),
	190	+ ),
	191	+ ),
	192	+ ),
193	193	$res->data['updateBooks']
194	194	);
195	195

		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62	'title' => [
63	63	'type' => Type::string(),
64	64	'description' => 'Enter a book title, no more than 10 characters in length',
65		- 'validate' => static function (string $title) {
	65	+ 'validate' => static function(string $title) {
66	66	if (strlen($title) > 10) {
67	67	return [1, 'book title must be less than 10 chaacters'];
68	68	}
		@@ -76,8 +76,8 @@ discard block
		block discarded – undo
76	76	'unknownAuthor',
77	77	'authorDeceased',
78	78	],
79		- 'validate' => function (string $authorId) {
80		- if (! isset($this->data['people'][$authorId])) {
	79	+ 'validate' => function(string $authorId) {
	80	+ if (!isset($this->data['people'][$authorId])) {
81	81	return ['unknownAuthor', 'We have no record of that author'];
82	82	}
83	83	return 0;
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	'query' => $this->query,
93	93	'mutation' => new ObjectType([
94	94	'name' => 'Mutation',
95		- 'fields' => function () {
	95	+ 'fields' => function() {
96	96	return [
97	97	'updateBooks' => new ValidatedFieldDefinition([
98	98	'name' => 'updateBooks',
		@@ -104,12 +104,12 @@ discard block
		block discarded – undo
104	104	$i = 5;
105	105	},
106	106	'validateItem' => static function($book) {
107		- $res = isset($book['author']) \|\| isset($book['title']) ? 0: 1;
	107	+ $res = isset($book['author']) \|\| isset($book['title']) ? 0 : 1;
108	108	return $res;
109	109	}
110	110	],
111	111	],
112		- 'resolve' => static function ($value) : bool {
	112	+ 'resolve' => static function($value) : bool {
113	113	// ...
114	114	// do update
115	115	// ...
		@@ -169,21 +169,21 @@ discard block
		block discarded – undo
169	169	static::assertEmpty($res->errors);
170	170
171	171	static::assertEquals(
172		- array (
	172	+ array(
173	173	'valid' => false,
174	174	'result' => NULL,
175	175	'suberrors' =>
176		- array (
	176	+ array(
177	177	'bookAttributes' =>
178		- array (
	178	+ array(
179	179	'code' => NULL,
180	180	'msg' => NULL,
181	181	'suberrors' =>
182		- array (
	182	+ array(
183	183	'code' => 1,
184	184	'msg' => '',
185	185	'path' =>
186		- array (
	186	+ array(
187	187	0 => 1,
188	188	),
189	189	),

		@@ -2,11 +2,11 @@
		block discarded – undo
2	2	namespace GraphQL\Type\Definition;
3	3
4	4	class ValidateItemsError extends \Exception {
5		- public $path;
6		- public $error;
7		- function __construct($path, $error) {
8		- parent::__construct();
9		- $this->path = $path;
10		- $this->error = $error;
11		- }
	5	+ public $path;
	6	+ public $error;
	7	+ function __construct($path, $error) {
	8	+ parent::__construct();
	9	+ $this->path = $path;
	10	+ $this->error = $error;
	11	+ }
12	12	}
13	13	\ No newline at end of file

		@@ -81,11 +81,11 @@
		block discarded – undo
81	81	]);
82	82	}
83	83
84		- protected function _isAssoc(array $arr)
85		- {
86		- if (array() === $arr) return false;
87		- return array_keys($arr) !== range(0, count($arr) - 1);
88		- }
	84	+ protected function _isAssoc(array $arr)
	85	+ {
	86	+ if (array() === $arr) return false;
	87	+ return array_keys($arr) !== range(0, count($arr) - 1);
	88	+ }
89	89
90	90	protected function _validateItems($value, array $path, callable $validate) {
91	91	foreach ($value as $idx => $subValue) {

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28
29	29	$this->typeSetter = $config['typeSetter'] ?? null;
30	30
31		- if (! isset($config['type'])) {
	31	+ if (!isset($config['type'])) {
32	32	throw new Exception('You must specify a type for your field');
33	33	}
34	34
		@@ -38,14 +38,14 @@ discard block
		block discarded – undo
38	38	'result' => [
39	39	'type' => $config['type'],
40	40	'description' => 'The payload, if any',
41		- 'resolve' => static function ($value) {
	41	+ 'resolve' => static function($value) {
42	42	return $value['result'] ?? null;
43	43	},
44	44	],
45	45	'valid' => [
46	46	'type' => Type::nonNull(Type::boolean()),
47	47	'description' => 'Whether all validation passed. True for yes, false for no.',
48		- 'resolve' => static function ($value) {
	48	+ 'resolve' => static function($value) {
49	49	return $value['valid'];
50	50	},
51	51	],
		@@ -62,17 +62,17 @@ discard block
		block discarded – undo
62	62	'type' => $type,
63	63	'args' => $args,
64	64	'name' => $name,
65		- 'resolve' => function ($value, $args1, $context, $info) use ($config, $args) {
	65	+ 'resolve' => function($value, $args1, $context, $info) use ($config, $args) {
66	66	// validate inputs
67		- $config['type'] = new InputObjectType([
	67	+ $config['type'] = new InputObjectType([
68	68	'name'=>'',
69	69	'fields' => $args,
70	70	]);
71	71	$errors = $this->_validate($config, $args1);
72	72	$result = $errors;
73		- $result['valid'] = ! $errors;
	73	+ $result['valid'] = !$errors;
74	74
75		- if (! isset($result['error']) && ! isset($result['suberrors'])) {
	75	+ if (!isset($result['error']) && !isset($result['suberrors'])) {
76	76	$result['result'] = $config['resolve']($value, $args1, $context, $info);
77	77	}
78	78
		@@ -84,19 +84,19 @@ discard block
		block discarded – undo
84	84	protected function _isAssoc(array $arr)
85	85	{
86	86	if (array() === $arr) return false;
87		- return array_keys($arr) !== range(0, count($arr) - 1);
	87	+ return array_keys($arr) !== range(0, count($arr)-1);
88	88	}
89	89
90	90	protected function _validateItems($value, array $path, callable $validate) {
91	91	foreach ($value as $idx => $subValue) {
92		- if(is_array($subValue) && !$this->_isAssoc($subValue)) {
	92	+ if (is_array($subValue) && !$this->_isAssoc($subValue)) {
93	93	$path[count($path)-1] = $idx;
94	94	$newPath = $path;
95	95	$newPath[] = 0;
96	96	$this->_validateItems($subValue, $newPath, $validate);
97	97	}
98	98	else {
99		- $path[count($path) - 1] = $idx;
	99	+ $path[count($path)-1] = $idx;
100	100	$err = $validate($subValue);
101	101
102	102	if ($err) {
		@@ -124,11 +124,11 @@ discard block
		block discarded – undo
124	124	}
125	125	}
126	126
127		- if(isset($arg['validateItem'])) {
	127	+ if (isset($arg['validateItem'])) {
128	128	try {
129	129	$this->_validateItems($value, [0], $arg['validateItem']);
130	130	}
131		- catch(ValidateItemsError $e) {
	131	+ catch (ValidateItemsError $e) {
132	132	$res['suberrors'] = [
133	133	'error' => $e->error,
134	134	'path' => $e->path

		@@ -83,7 +83,9 @@ discard block
		block discarded – undo
83	83
84	84	protected function _isAssoc(array $arr)
85	85	{
86		- if (array() === $arr) return false;
	86	+ if (array() === $arr) {
	87	+ return false;
	88	+ }
87	89	return array_keys($arr) !== range(0, count($arr) - 1);
88	90	}
89	91
		@@ -94,8 +96,7 @@ discard block
		block discarded – undo
94	96	$newPath = $path;
95	97	$newPath[] = 0;
96	98	$this->_validateItems($subValue, $newPath, $validate);
97		- }
98		- else {
	99	+ } else {
99	100	$path[count($path) - 1] = $idx;
100	101	$err = $validate($subValue);
101	102
		@@ -127,8 +128,7 @@ discard block
		block discarded – undo
127	128	if(isset($arg['validateItem'])) {
128	129	try {
129	130	$this->_validateItems($value, [0], $arg['validateItem']);
130		- }
131		- catch(ValidateItemsError $e) {
	131	+ } catch(ValidateItemsError $e) {
132	132	$res['suberrors'] = [
133	133	'error' => $e->error,
134	134	'path' => $e->path

shmax / graphql-php-validation-toolkit

Pull Request — master (#1)

Status

Category

Indentation +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +35 added lines, -35 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Braces +5 added lines, -5 removed lines patch added patch discarded remove patch