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 16:57 UTC

Status

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 2 patches

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.

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

@@ -77,11 +77,11 @@  discard block
 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) {
@@ -149,11 +149,11 @@  discard block
 block discarded – undo
 
                 $fields = $type->getFields();
                 if(is_array($value)) {
-	                foreach ($value as $key => $subValue) {
-		                $config = $fields[$key]->config;
-		                $res['suberrors'][$key] = $this->_validate($config, $subValue);
-	                }
-	                $res['suberrors'] = array_filter($res['suberrors'] ?? []);
+                    foreach ($value as $key => $subValue) {
+                        $config = $fields[$key]->config;
+                        $res['suberrors'][$key] = $this->_validate($config, $subValue);
+                    }
+                    $res['suberrors'] = array_filter($res['suberrors'] ?? []);
                 }
                 break;
 

Please login to merge, or discard this patch.

tests/Type/ValidatedFieldDefinition/ListOfScalarValidationTest.php 1 patch

Indentation +68 added lines, -68 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,
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
         static::assertFalse($res->data['setPhoneNumbers']['valid']);
     }
 
-	public function testItemsValidationOnSelfFail()
-	{
-		$res = GraphQL::executeQuery(
-			$this->schema,
-			Utils::nowdoc('
+    public function testItemsValidationOnSelfFail()
+    {
+        $res = GraphQL::executeQuery(
+            $this->schema,
+            Utils::nowdoc('
 				mutation SetPhoneNumbers(
 						$phoneNumbers: [[String]]
 					) {
@@ -148,34 +148,34 @@  discard block
 block discarded – undo
 						}
 					}
 			'),
-			[],
-			null,
-			[
-				'phoneNumbers' => [
-				],
-			]
-		);
-
-		static::assertEquals(
-			array (
-				'valid' => false,
-				'suberrors' =>
-					array (
-						'phoneNumbers' =>
-							array (
-								'code' => 'atLeastOneList',
-								'msg' => 'You must submit at least one list of numbers',
-								'suberrors' => NULL,
-							),
-					),
-				'result' => NULL,
-			),
-			$res->data['setPhoneNumbers']
-		);
-
-		static::assertEmpty($res->errors);
-		static::assertFalse($res->data['setPhoneNumbers']['valid']);
-	}
+            [],
+            null,
+            [
+                'phoneNumbers' => [
+                ],
+            ]
+        );
+
+        static::assertEquals(
+            array (
+                'valid' => false,
+                'suberrors' =>
+                    array (
+                        'phoneNumbers' =>
+                            array (
+                                'code' => 'atLeastOneList',
+                                'msg' => 'You must submit at least one list of numbers',
+                                'suberrors' => NULL,
+                            ),
+                    ),
+                'result' => NULL,
+            ),
+            $res->data['setPhoneNumbers']
+        );
+
+        static::assertEmpty($res->errors);
+        static::assertFalse($res->data['setPhoneNumbers']['valid']);
+    }
 
     public function testListOfValidationFail()
     {
@@ -205,39 +205,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.

tests/Type/ValidatedFieldDefinition/InputObjectValidationTest.php 1 patch

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

@@ -99,18 +99,18 @@  discard block
 block discarded – undo
                             'args' => [
                                 'bookAttributes' => [
                                     'type' => $this->bookAttributesInputType,
-	                                'errorCodes' => [
-										'titleOrIdRequired'
-	                                ],
-	                                'validate' => static function(?array $bookAttributes) {
-                        	            if(is_null($bookAttributes)) {
-                        	                return 0;
-	                                    }
+                                    'errorCodes' => [
+                                        'titleOrIdRequired'
+                                    ],
+                                    'validate' => static function(?array $bookAttributes) {
+                                        if(is_null($bookAttributes)) {
+                                            return 0;
+                                        }
                         	            
-                        	            return (isset($bookAttributes['title']) || isset($bookAttributes['author'])) ? 0 : [
-                        	            	'titleOrIdRequired', 'You must supply at least one of title or author'
-	                                    ];
-	                                }
+                                        return (isset($bookAttributes['title']) || isset($bookAttributes['author'])) ? 0 : [
+                                            'titleOrIdRequired', 'You must supply at least one of title or author'
+                                        ];
+                                    }
                                 ],
                             ],
                             'resolve' => static function ($value, $args) : bool {
@@ -197,11 +197,11 @@  discard block
 block discarded – undo
         static::assertFalse($res->data['updateBook']['valid']);
     }
 
-	public function testValidationInputObjectSelfFail()
-	{
-		$res = GraphQL::executeQuery(
-			$this->schema,
-			Utils::nowdoc('
+    public function testValidationInputObjectSelfFail()
+    {
+        $res = GraphQL::executeQuery(
+            $this->schema,
+            Utils::nowdoc('
 				mutation UpdateBook(
 						$bookAttributes: BookAttributes
 					) {
@@ -229,35 +229,35 @@  discard block
 block discarded – undo
 					}
 				}
 			'),
-			[],
-			null,
-			[
-				'bookAttributes' => [
-					'title' => null,
-					'author' => null,
-				],
-			]
-		);
+            [],
+            null,
+            [
+                'bookAttributes' => [
+                    'title' => null,
+                    'author' => null,
+                ],
+            ]
+        );
 
-		static::assertEquals(
-			array (
-				'valid' => false,
-				'suberrors' =>
-					array (
-						'bookAttributes' =>
-							array (
-								'code' => 'titleOrIdRequired',
-								'msg' => 'You must supply at least one of title or author',
-								'suberrors' => NULL,
-							),
-					),
-				'result' => NULL,
-			),
-			$res->data['updateBook']
-		);
+        static::assertEquals(
+            array (
+                'valid' => false,
+                'suberrors' =>
+                    array (
+                        'bookAttributes' =>
+                            array (
+                                'code' => 'titleOrIdRequired',
+                                'msg' => 'You must supply at least one of title or author',
+                                'suberrors' => NULL,
+                            ),
+                    ),
+                'result' => NULL,
+            ),
+            $res->data['updateBook']
+        );
 
-		static::assertFalse($res->data['updateBook']['valid']);
-	}
+        static::assertFalse($res->data['updateBook']['valid']);
+    }
 
     public function testValidationSuccess()
     {
@@ -351,11 +351,11 @@  discard block
 block discarded – undo
 
         static::assertEmpty($res->errors);
         static::assertEquals(
-	        array (
-		        'valid' => true,
-		        'suberrors' => NULL,
-		        'result' => true,
-	        ),
+            array (
+                'valid' => true,
+                'suberrors' => NULL,
+                'result' => true,
+            ),
             $res->data['updateBook']
         );
 

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/BasicTest.php 1 patch

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

@@ -33,11 +33,11 @@
 block discarded – undo
     }
 
     public function testNoType() {
-	    $this->expectExceptionMessage("You must specify a type for your field");
-	    UserErrorsType::create([
-		    'validate' => static function ($value) {
-		    }
-	    ], ['upsertSku']);
+        $this->expectExceptionMessage("You must specify a type for your field");
+        UserErrorsType::create([
+            'validate' => static function ($value) {
+            }
+        ], ['upsertSku']);
     }
 
     public function testValidationWithNoErrorCodes()

Please login to merge, or discard this patch.

src/Type/Definition/UserErrorsType.php 1 patch

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

@@ -23,40 +23,40 @@
 block discarded – undo
     {
         $finalFields = $config['fields'] ?? [];
 
-	    if (!isset($config['type'])) {
-		    throw new \Exception('You must specify a type for your field');
-	    }
+        if (!isset($config['type'])) {
+            throw new \Exception('You must specify a type for your field');
+        }
 
         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.

tests/Type/UserErrorsType/ListOfTest.php 1 patch

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

@@ -118,21 +118,21 @@  discard block
 block discarded – undo
     public function testListOfInputObjectWithValidationOnSelf()
     {
         $type  = new UserErrorsType([
-	        'validate' => static function(array $authors) {
-        	    if(count($authors) < 1) {
-        	    	return ['atLeastOneAuthorRequired', "You must submit at least one author"];
-	            }
-	        },
-	        'errorCodes' => ['atLeastOneBookRequired'],
-	        'type' => Type::listOf(new InputObjectType([
+            'validate' => static function(array $authors) {
+                if(count($authors) < 1) {
+                    return ['atLeastOneAuthorRequired', "You must submit at least one author"];
+                }
+            },
+            'errorCodes' => ['atLeastOneBookRequired'],
+            'type' => Type::listOf(new InputObjectType([
                 'name'=> 'Author',
                 'fields' => [
                     'firstName' => [
                         'type' => Type::string(),
                     ],
-	                'lastName' => [
-		                'type' => Type::string(),
-	                ],
+                    'lastName' => [
+                        'type' => Type::string(),
+                    ],
                 ],
             ]))
         ], ['authorList']);
@@ -159,32 +159,32 @@  discard block
 block discarded – undo
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
     }
 
-	public function testListOfInputObjectWithValidationOnWrappedSelf()
-	{
-		$type  = new UserErrorsType([
-			'suberrorCodes' => ['firstNameOrLastNameRequired'],
-			'validateItem' => static function(array $author) {
-				if(!isset($author['firstName']) && !isset($author['lastName'])) {
-					return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
-				}
-			},
-			'type' => Type::listOf(new InputObjectType([
-				'name'=> 'Author',
-				'fields' => [
-					'firstName' => [
-						'type' => Type::string(),
-						'validate' => function(string $name) {
-							return $name ? 0 : 1;
-						}
-					],
-					'lastName' => [
-						'type' => Type::string(),
-					],
-				],
-			]))
-		], ['authorList']);
-
-		self::assertEquals(Utils::nowdoc('
+    public function testListOfInputObjectWithValidationOnWrappedSelf()
+    {
+        $type  = new UserErrorsType([
+            'suberrorCodes' => ['firstNameOrLastNameRequired'],
+            'validateItem' => static function(array $author) {
+                if(!isset($author['firstName']) && !isset($author['lastName'])) {
+                    return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
+                }
+            },
+            'type' => Type::listOf(new InputObjectType([
+                'name'=> 'Author',
+                'fields' => [
+                    'firstName' => [
+                        'type' => Type::string(),
+                        'validate' => function(string $name) {
+                            return $name ? 0 : 1;
+                        }
+                    ],
+                    'lastName' => [
+                        'type' => Type::string(),
+                    ],
+                ],
+            ]))
+        ], ['authorList']);
+
+        self::assertEquals(Utils::nowdoc('
 			schema {
 			  query: AuthorListError
 			}
@@ -231,5 +231,5 @@  discard block
 block discarded – undo
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/InputObjectTest.php 1 patch

Indentation +21 added lines, -21 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");
 
-	    new UserErrorsType([
+        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) {
-							return $authorId ? 0 : 1;
-						},
-						'type' => Type::id(),
-						'description' => 'An author Id',
-					],
-				],
-			])
-		], ['updateBook']);
+    public function testFieldsWithValidate()
+    {
+        $type  = new UserErrorsType([
+            'type' => new InputObjectType([
+                'name' => 'bookInput',
+                'fields' => [
+                    'authorId' => [
+                        'errorCodes' => ['unknownAuthor'],
+                        'validate' => static function(int $authorId) {
+                            return $authorId ? 0 : 1;
+                        },
+                        '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.

tests/Type/ValidatedFieldDefinition/ListOfInputObjectValidationTest.php 1 patch

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) {
-                        	            return $var ? 0: 1;
-	                                },
-	                                'validateItem' => static function($book) {
-                        	            $res = isset($book['author']) || isset($book['title']) ? 0: 1;
-                        	            return $res;
-	                                }
+                                    'validate' => static function($var) {
+                                        return $var ? 0: 1;
+                                    },
+                                    'validateItem' => static function($book) {
+                                        $res = isset($book['author']) || isset($book['title']) ? 0: 1;
+                                        return $res;
+                                    }
                                 ],
                             ],
                             'resolve' => static function ($value) : bool {
@@ -162,30 +162,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.

		@@ -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

		@@ -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

		@@ -77,11 +77,11 @@ discard block
		block discarded – undo
77	77	]);
78	78	}
79	79
80		- protected function _isAssoc(array $arr)
81		- {
82		- if (array() === $arr) return false;
83		- return array_keys($arr) !== range(0, count($arr) - 1);
84		- }
	80	+ protected function _isAssoc(array $arr)
	81	+ {
	82	+ if (array() === $arr) return false;
	83	+ return array_keys($arr) !== range(0, count($arr) - 1);
	84	+ }
85	85
86	86	protected function _validateItems($value, array $path, callable $validate) {
87	87	foreach ($value as $idx => $subValue) {
		@@ -149,11 +149,11 @@ discard block
		block discarded – undo
149	149
150	150	$fields = $type->getFields();
151	151	if(is_array($value)) {
152		- foreach ($value as $key => $subValue) {
153		- $config = $fields[$key]->config;
154		- $res['suberrors'][$key] = $this->_validate($config, $subValue);
155		- }
156		- $res['suberrors'] = array_filter($res['suberrors'] ?? []);
	152	+ foreach ($value as $key => $subValue) {
	153	+ $config = $fields[$key]->config;
	154	+ $res['suberrors'][$key] = $this->_validate($config, $subValue);
	155	+ }
	156	+ $res['suberrors'] = array_filter($res['suberrors'] ?? []);
157	157	}
158	158	break;
159	159

		@@ -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,
		@@ -124,11 +124,11 @@ discard block
		block discarded – undo
124	124	static::assertFalse($res->data['setPhoneNumbers']['valid']);
125	125	}
126	126
127		- public function testItemsValidationOnSelfFail()
128		- {
129		- $res = GraphQL::executeQuery(
130		- $this->schema,
131		- Utils::nowdoc('
	127	+ public function testItemsValidationOnSelfFail()
	128	+ {
	129	+ $res = GraphQL::executeQuery(
	130	+ $this->schema,
	131	+ Utils::nowdoc('
132	132	mutation SetPhoneNumbers(
133	133	$phoneNumbers: [[String]]
134	134	) {
		@@ -148,34 +148,34 @@ discard block
		block discarded – undo
148	148	}
149	149	}
150	150	'),
151		- [],
152		- null,
153		- [
154		- 'phoneNumbers' => [
155		- ],
156		- ]
157		- );
158		-
159		- static::assertEquals(
160		- array (
161		- 'valid' => false,
162		- 'suberrors' =>
163		- array (
164		- 'phoneNumbers' =>
165		- array (
166		- 'code' => 'atLeastOneList',
167		- 'msg' => 'You must submit at least one list of numbers',
168		- 'suberrors' => NULL,
169		- ),
170		- ),
171		- 'result' => NULL,
172		- ),
173		- $res->data['setPhoneNumbers']
174		- );
175		-
176		- static::assertEmpty($res->errors);
177		- static::assertFalse($res->data['setPhoneNumbers']['valid']);
178		- }
	151	+ [],
	152	+ null,
	153	+ [
	154	+ 'phoneNumbers' => [
	155	+ ],
	156	+ ]
	157	+ );
	158	+
	159	+ static::assertEquals(
	160	+ array (
	161	+ 'valid' => false,
	162	+ 'suberrors' =>
	163	+ array (
	164	+ 'phoneNumbers' =>
	165	+ array (
	166	+ 'code' => 'atLeastOneList',
	167	+ 'msg' => 'You must submit at least one list of numbers',
	168	+ 'suberrors' => NULL,
	169	+ ),
	170	+ ),
	171	+ 'result' => NULL,
	172	+ ),
	173	+ $res->data['setPhoneNumbers']
	174	+ );
	175	+
	176	+ static::assertEmpty($res->errors);
	177	+ static::assertFalse($res->data['setPhoneNumbers']['valid']);
	178	+ }
179	179
180	180	public function testListOfValidationFail()
181	181	{
		@@ -205,39 +205,39 @@ discard block
		block discarded – undo
205	205	null,
206	206	[
207	207	'phoneNumbers' => [
208		- [],
209		- [
210		- '123-4567',
211		- 'xxx-7890',
212		- '321-1234'
213		- ]
	208	+ [],
	209	+ [
	210	+ '123-4567',
	211	+ 'xxx-7890',
	212	+ '321-1234'
	213	+ ]
214	214	],
215	215	]
216	216	);
217	217
218	218	static::assertEmpty($res->errors);
219	219	static::assertEquals(
220		- array (
221		- 'valid' => false,
222		- 'suberrors' =>
223		- array (
224		- 'phoneNumbers' =>
225		- array (
226		- 'code' => NULL,
227		- 'msg' => NULL,
228		- 'suberrors' =>
229		- array (
230		- 'path' =>
231		- array (
232		- 0 => 1,
233		- 1 => 1,
234		- ),
235		- 'code' => 'invalidPhoneNumber',
236		- ),
237		- ),
238		- ),
239		- 'result' => NULL,
240		- ),
	220	+ array (
	221	+ 'valid' => false,
	222	+ 'suberrors' =>
	223	+ array (
	224	+ 'phoneNumbers' =>
	225	+ array (
	226	+ 'code' => NULL,
	227	+ 'msg' => NULL,
	228	+ 'suberrors' =>
	229	+ array (
	230	+ 'path' =>
	231	+ array (
	232	+ 0 => 1,
	233	+ 1 => 1,
	234	+ ),
	235	+ 'code' => 'invalidPhoneNumber',
	236	+ ),
	237	+ ),
	238	+ ),
	239	+ 'result' => NULL,
	240	+ ),
241	241	$res->data['setPhoneNumbers']
242	242	);
243	243

		@@ -99,18 +99,18 @@ discard block
		block discarded – undo
99	99	'args' => [
100	100	'bookAttributes' => [
101	101	'type' => $this->bookAttributesInputType,
102		- 'errorCodes' => [
103		- 'titleOrIdRequired'
104		- ],
105		- 'validate' => static function(?array $bookAttributes) {
106		- if(is_null($bookAttributes)) {
107		- return 0;
108		- }
	102	+ 'errorCodes' => [
	103	+ 'titleOrIdRequired'
	104	+ ],
	105	+ 'validate' => static function(?array $bookAttributes) {
	106	+ if(is_null($bookAttributes)) {
	107	+ return 0;
	108	+ }
109	109
110		- return (isset($bookAttributes['title']) \|\| isset($bookAttributes['author'])) ? 0 : [
111		- 'titleOrIdRequired', 'You must supply at least one of title or author'
112		- ];
113		- }
	110	+ return (isset($bookAttributes['title']) \|\| isset($bookAttributes['author'])) ? 0 : [
	111	+ 'titleOrIdRequired', 'You must supply at least one of title or author'
	112	+ ];
	113	+ }
114	114	],
115	115	],
116	116	'resolve' => static function ($value, $args) : bool {
		@@ -197,11 +197,11 @@ discard block
		block discarded – undo
197	197	static::assertFalse($res->data['updateBook']['valid']);
198	198	}
199	199
200		- public function testValidationInputObjectSelfFail()
201		- {
202		- $res = GraphQL::executeQuery(
203		- $this->schema,
204		- Utils::nowdoc('
	200	+ public function testValidationInputObjectSelfFail()
	201	+ {
	202	+ $res = GraphQL::executeQuery(
	203	+ $this->schema,
	204	+ Utils::nowdoc('
205	205	mutation UpdateBook(
206	206	$bookAttributes: BookAttributes
207	207	) {
		@@ -229,35 +229,35 @@ discard block
		block discarded – undo
229	229	}
230	230	}
231	231	'),
232		- [],
233		- null,
234		- [
235		- 'bookAttributes' => [
236		- 'title' => null,
237		- 'author' => null,
238		- ],
239		- ]
240		- );
	232	+ [],
	233	+ null,
	234	+ [
	235	+ 'bookAttributes' => [
	236	+ 'title' => null,
	237	+ 'author' => null,
	238	+ ],
	239	+ ]
	240	+ );
241	241
242		- static::assertEquals(
243		- array (
244		- 'valid' => false,
245		- 'suberrors' =>
246		- array (
247		- 'bookAttributes' =>
248		- array (
249		- 'code' => 'titleOrIdRequired',
250		- 'msg' => 'You must supply at least one of title or author',
251		- 'suberrors' => NULL,
252		- ),
253		- ),
254		- 'result' => NULL,
255		- ),
256		- $res->data['updateBook']
257		- );
	242	+ static::assertEquals(
	243	+ array (
	244	+ 'valid' => false,
	245	+ 'suberrors' =>
	246	+ array (
	247	+ 'bookAttributes' =>
	248	+ array (
	249	+ 'code' => 'titleOrIdRequired',
	250	+ 'msg' => 'You must supply at least one of title or author',
	251	+ 'suberrors' => NULL,
	252	+ ),
	253	+ ),
	254	+ 'result' => NULL,
	255	+ ),
	256	+ $res->data['updateBook']
	257	+ );
258	258
259		- static::assertFalse($res->data['updateBook']['valid']);
260		- }
	259	+ static::assertFalse($res->data['updateBook']['valid']);
	260	+ }
261	261
262	262	public function testValidationSuccess()
263	263	{
		@@ -351,11 +351,11 @@ discard block
		block discarded – undo
351	351
352	352	static::assertEmpty($res->errors);
353	353	static::assertEquals(
354		- array (
355		- 'valid' => true,
356		- 'suberrors' => NULL,
357		- 'result' => true,
358		- ),
	354	+ array (
	355	+ 'valid' => true,
	356	+ 'suberrors' => NULL,
	357	+ 'result' => true,
	358	+ ),
359	359	$res->data['updateBook']
360	360	);
361	361

		@@ -33,11 +33,11 @@
		block discarded – undo
33	33	}
34	34
35	35	public function testNoType() {
36		- $this->expectExceptionMessage("You must specify a type for your field");
37		- UserErrorsType::create([
38		- 'validate' => static function ($value) {
39		- }
40		- ], ['upsertSku']);
	36	+ $this->expectExceptionMessage("You must specify a type for your field");
	37	+ UserErrorsType::create([
	38	+ 'validate' => static function ($value) {
	39	+ }
	40	+ ], ['upsertSku']);
41	41	}
42	42
43	43	public function testValidationWithNoErrorCodes()

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

		@@ -118,21 +118,21 @@ discard block
		block discarded – undo
118	118	public function testListOfInputObjectWithValidationOnSelf()
119	119	{
120	120	$type = new UserErrorsType([
121		- 'validate' => static function(array $authors) {
122		- if(count($authors) < 1) {
123		- return ['atLeastOneAuthorRequired', "You must submit at least one author"];
124		- }
125		- },
126		- 'errorCodes' => ['atLeastOneBookRequired'],
127		- 'type' => Type::listOf(new InputObjectType([
	121	+ 'validate' => static function(array $authors) {
	122	+ if(count($authors) < 1) {
	123	+ return ['atLeastOneAuthorRequired', "You must submit at least one author"];
	124	+ }
	125	+ },
	126	+ 'errorCodes' => ['atLeastOneBookRequired'],
	127	+ 'type' => Type::listOf(new InputObjectType([
128	128	'name'=> 'Author',
129	129	'fields' => [
130	130	'firstName' => [
131	131	'type' => Type::string(),
132	132	],
133		- 'lastName' => [
134		- 'type' => Type::string(),
135		- ],
	133	+ 'lastName' => [
	134	+ 'type' => Type::string(),
	135	+ ],
136	136	],
137	137	]))
138	138	], ['authorList']);
		@@ -159,32 +159,32 @@ discard block
		block discarded – undo
159	159	'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
160	160	}
161	161
162		- public function testListOfInputObjectWithValidationOnWrappedSelf()
163		- {
164		- $type = new UserErrorsType([
165		- 'suberrorCodes' => ['firstNameOrLastNameRequired'],
166		- 'validateItem' => static function(array $author) {
167		- if(!isset($author['firstName']) && !isset($author['lastName'])) {
168		- return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
169		- }
170		- },
171		- 'type' => Type::listOf(new InputObjectType([
172		- 'name'=> 'Author',
173		- 'fields' => [
174		- 'firstName' => [
175		- 'type' => Type::string(),
176		- 'validate' => function(string $name) {
177		- return $name ? 0 : 1;
178		- }
179		- ],
180		- 'lastName' => [
181		- 'type' => Type::string(),
182		- ],
183		- ],
184		- ]))
185		- ], ['authorList']);
186		-
187		- self::assertEquals(Utils::nowdoc('
	162	+ public function testListOfInputObjectWithValidationOnWrappedSelf()
	163	+ {
	164	+ $type = new UserErrorsType([
	165	+ 'suberrorCodes' => ['firstNameOrLastNameRequired'],
	166	+ 'validateItem' => static function(array $author) {
	167	+ if(!isset($author['firstName']) && !isset($author['lastName'])) {
	168	+ return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
	169	+ }
	170	+ },
	171	+ 'type' => Type::listOf(new InputObjectType([
	172	+ 'name'=> 'Author',
	173	+ 'fields' => [
	174	+ 'firstName' => [
	175	+ 'type' => Type::string(),
	176	+ 'validate' => function(string $name) {
	177	+ return $name ? 0 : 1;
	178	+ }
	179	+ ],
	180	+ 'lastName' => [
	181	+ 'type' => Type::string(),
	182	+ ],
	183	+ ],
	184	+ ]))
	185	+ ], ['authorList']);
	186	+
	187	+ self::assertEquals(Utils::nowdoc('
188	188	schema {
189	189	query: AuthorListError
190	190	}
		@@ -231,5 +231,5 @@ discard block
		block discarded – undo
231	231	}
232	232
233	233	'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
234		- }
	234	+ }
235	235	}

		@@ -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		- new UserErrorsType([
	50	+ 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) {
73		- return $authorId ? 0 : 1;
74		- },
75		- 'type' => Type::id(),
76		- 'description' => 'An author Id',
77		- ],
78		- ],
79		- ])
80		- ], ['updateBook']);
	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	+ return $authorId ? 0 : 1;
	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	}

		@@ -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		- return $var ? 0: 1;
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	+ return $var ? 0: 1;
	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 {
		@@ -162,30 +162,30 @@ discard block
		block discarded – undo
162	162	]
163	163	);
164	164
165		- static::assertEmpty($res->errors);
	165	+ static::assertEmpty($res->errors);
166	166
167	167	static::assertEquals(
168		- array (
169		- 'valid' => false,
170		- 'result' => NULL,
171		- 'suberrors' =>
172		- array (
173		- 'bookAttributes' =>
174		- array (
175		- 'code' => NULL,
176		- 'msg' => NULL,
177		- 'suberrors' =>
178		- array (
179		- 'code' => 1,
180		- 'msg' => '',
181		- 'path' =>
182		- array (
183		- 0 => 1,
184		- ),
185		- ),
186		- ),
187		- ),
188		- ),
	168	+ array (
	169	+ 'valid' => false,
	170	+ 'result' => NULL,
	171	+ 'suberrors' =>
	172	+ array (
	173	+ 'bookAttributes' =>
	174	+ array (
	175	+ 'code' => NULL,
	176	+ 'msg' => NULL,
	177	+ 'suberrors' =>
	178	+ array (
	179	+ 'code' => 1,
	180	+ 'msg' => '',
	181	+ 'path' =>
	182	+ array (
	183	+ 0 => 1,
	184	+ ),
	185	+ ),
	186	+ ),
	187	+ ),
	188	+ ),
189	189	$res->data['updateBooks']
190	190	);
191	191

shmax / graphql-php-validation-toolkit

Pull Request — master (#1)

Status

Category

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

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

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

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

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

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

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

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

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

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