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

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.

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

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.

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

@@ -34,14 +34,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'];
                     },
                 ],
@@ -58,17 +58,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);
                 }
 
@@ -80,19 +80,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) {
@@ -120,11 +120,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
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
                 }
 
                 $fields = $type->getFields();
-                if(is_array($value)) {
+                if (is_array($value)) {
 	                foreach ($value as $key => $subValue) {
 		                $config = $fields[$key]->config;
 		                $res['suberrors'][$key] = $this->_validate($config, $subValue);

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/ListOfTest.php 2 patches

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

@@ -38,7 +38,7 @@  discard block
 block discarded – undo
         $type = new UserErrorsType([
             'type' => Type::listOf(Type::id()),
             'errorCodes'=> ['atLeastOneRequired'],
-            'validate' => static function ($value) {
+            'validate' => static function($value) {
                 return 0;
             },
         ], ['users']);
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
         $type = new UserErrorsType([
             'type' => Type::listOf(Type::listOf(Type::listOf(Type::id()))),
             'errorCodes'=> ['atLeastOneRequired'],
-            'validate' => static function ($value) {
+            'validate' => static function($value) {
                 return 0;
             },
-            'validateItem' => static function ($value) {
+            'validateItem' => static function($value) {
                 return 0;
             }
         ], ['users']);
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
 
     public function testListOfInputObjectWithValidationOnSelf()
     {
-        $type  = new UserErrorsType([
+        $type = new UserErrorsType([
 	        'validate' => static function(array $authors) {
-        	    if(count($authors) < 1) {
+        	    if (count($authors) < 1) {
         	    	return ['atLeastOneAuthorRequired', "You must submit at least one author"];
 	            }
 	        },
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
 
 	public function testListOfInputObjectWithValidationOnWrappedSelf()
 	{
-		$type  = new UserErrorsType([
+		$type = new UserErrorsType([
 			'suberrorCodes' => ['firstNameOrLastNameRequired'],
 			'validateItem' => static function(array $author) {
-				if(!isset($author['firstName']) && !isset($author['lastName'])) {
+				if (!isset($author['firstName']) && !isset($author['lastName'])) {
 					return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
 				}
 			},

Please login to merge, or discard this 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/ValidatedFieldDefinition/ListOfScalarValidationTest.php 2 patches

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.

Spacing +14 added lines, -14 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' => ['atLeastOneList'],
-                                    'validate' => static function (array $phoneNumberLists) {
+                                    'validate' => static function(array $phoneNumberLists) {
                                         if (count($phoneNumberLists) < 1) {
                                             return ['atLeastOneList', 'You must submit at least one list of 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',
 	                                ]
                             ],
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
 		);
 
 		static::assertEquals(
-			array (
+			array(
 				'valid' => false,
 				'suberrors' =>
-					array (
+					array(
 						'phoneNumbers' =>
-							array (
+							array(
 								'code' => 'atLeastOneList',
 								'msg' => 'You must submit at least one list of numbers',
 								'suberrors' => NULL,
@@ -217,18 +217,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/InputObjectValidationTest.php 2 patches

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.

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

@@ -61,7 +61,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'];
                         }
@@ -75,8 +75,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;
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
             'query' => $this->query,
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => function () {
+                'fields' => function() {
                     return [
                         'updateBook' => new ValidatedFieldDefinition([
                             'name' => 'updateBook',
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 										'titleOrIdRequired'
 	                                ],
 	                                'validate' => static function(?array $bookAttributes) {
-                        	            if(is_null($bookAttributes)) {
+                        	            if (is_null($bookAttributes)) {
                         	                return 0;
 	                                    }
                         	            
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
 	                                }
                                 ],
                             ],
-                            'resolve' => static function ($value, $args) : bool {
+                            'resolve' => static function($value, $args) : bool {
                                 // ...
                                 // do update
                                 // ...
@@ -240,12 +240,12 @@  discard block
 block discarded – undo
 		);
 
 		static::assertEquals(
-			array (
+			array(
 				'valid' => false,
 				'suberrors' =>
-					array (
+					array(
 						'bookAttributes' =>
-							array (
+							array(
 								'code' => 'titleOrIdRequired',
 								'msg' => 'You must supply at least one of title or author',
 								'suberrors' => NULL,
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
 
         static::assertEmpty($res->errors);
         static::assertEquals(
-	        array (
+	        array(
 		        'valid' => true,
 		        'suberrors' => NULL,
 		        'result' => true,

Please login to merge, or discard this patch.

tests/Type/UserErrorsType/BasicTest.php 2 patches

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.

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

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

Please login to merge, or discard this patch.

src/Type/Definition/UserErrorsType.php 2 patches

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.

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

@@ -30,7 +30,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([
@@ -39,7 +39,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;
 			        },
 		        ];
@@ -50,7 +50,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;
 			        },
 		        ];
@@ -64,18 +64,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;
                     },
                 ];
@@ -92,7 +92,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;
                     },
                 ];
@@ -116,7 +116,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;
                     },
                 ];
@@ -130,7 +130,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'];
                 },
             ];
@@ -167,7 +167,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':
@@ -180,7 +180,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/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 $value ? 0 : 1;
             },
             'type' => new IDType(['name' => 'Color']),

Please login to merge, or discard this patch.

		@@ -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 = [];

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

		@@ -34,14 +34,14 @@ discard block
		block discarded – undo
34	34	'result' => [
35	35	'type' => $config['type'],
36	36	'description' => 'The payload, if any',
37		- 'resolve' => static function ($value) {
	37	+ 'resolve' => static function($value) {
38	38	return $value['result'] ?? null;
39	39	},
40	40	],
41	41	'valid' => [
42	42	'type' => Type::nonNull(Type::boolean()),
43	43	'description' => 'Whether all validation passed. True for yes, false for no.',
44		- 'resolve' => static function ($value) {
	44	+ 'resolve' => static function($value) {
45	45	return $value['valid'];
46	46	},
47	47	],
		@@ -58,17 +58,17 @@ discard block
		block discarded – undo
58	58	'type' => $type,
59	59	'args' => $args,
60	60	'name' => $name,
61		- 'resolve' => function ($value, $args1, $context, $info) use ($config, $args) {
	61	+ 'resolve' => function($value, $args1, $context, $info) use ($config, $args) {
62	62	// validate inputs
63		- $config['type'] = new InputObjectType([
	63	+ $config['type'] = new InputObjectType([
64	64	'name'=>'',
65	65	'fields' => $args,
66	66	]);
67	67	$errors = $this->_validate($config, $args1);
68	68	$result = $errors;
69		- $result['valid'] = ! $errors;
	69	+ $result['valid'] = !$errors;
70	70
71		- if (! isset($result['error']) && ! isset($result['suberrors'])) {
	71	+ if (!isset($result['error']) && !isset($result['suberrors'])) {
72	72	$result['result'] = $config['resolve']($value, $args1, $context, $info);
73	73	}
74	74
		@@ -80,19 +80,19 @@ discard block
		block discarded – undo
80	80	protected function _isAssoc(array $arr)
81	81	{
82	82	if (array() === $arr) return false;
83		- return array_keys($arr) !== range(0, count($arr) - 1);
	83	+ return array_keys($arr) !== range(0, count($arr)-1);
84	84	}
85	85
86	86	protected function _validateItems($value, array $path, callable $validate) {
87	87	foreach ($value as $idx => $subValue) {
88		- if(is_array($subValue) && !$this->_isAssoc($subValue)) {
	88	+ if (is_array($subValue) && !$this->_isAssoc($subValue)) {
89	89	$path[count($path)-1] = $idx;
90	90	$newPath = $path;
91	91	$newPath[] = 0;
92	92	$this->_validateItems($subValue, $newPath, $validate);
93	93	}
94	94	else {
95		- $path[count($path) - 1] = $idx;
	95	+ $path[count($path)-1] = $idx;
96	96	$err = $validate($subValue);
97	97
98	98	if ($err) {
		@@ -120,11 +120,11 @@ discard block
		block discarded – undo
120	120	}
121	121	}
122	122
123		- if(isset($arg['validateItem'])) {
	123	+ if (isset($arg['validateItem'])) {
124	124	try {
125	125	$this->_validateItems($value, [0], $arg['validateItem']);
126	126	}
127		- catch(ValidateItemsError $e) {
	127	+ catch (ValidateItemsError $e) {
128	128	$res['suberrors'] = [
129	129	'error' => $e->error,
130	130	'path' => $e->path
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	}
149	149
150	150	$fields = $type->getFields();
151		- if(is_array($value)) {
	151	+ if (is_array($value)) {
152	152	foreach ($value as $key => $subValue) {
153	153	$config = $fields[$key]->config;
154	154	$res['suberrors'][$key] = $this->_validate($config, $subValue);

		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38	$type = new UserErrorsType([
39	39	'type' => Type::listOf(Type::id()),
40	40	'errorCodes'=> ['atLeastOneRequired'],
41		- 'validate' => static function ($value) {
	41	+ 'validate' => static function($value) {
42	42	return 0;
43	43	},
44	44	], ['users']);
		@@ -70,10 +70,10 @@ discard block
		block discarded – undo
70	70	$type = new UserErrorsType([
71	71	'type' => Type::listOf(Type::listOf(Type::listOf(Type::id()))),
72	72	'errorCodes'=> ['atLeastOneRequired'],
73		- 'validate' => static function ($value) {
	73	+ 'validate' => static function($value) {
74	74	return 0;
75	75	},
76		- 'validateItem' => static function ($value) {
	76	+ 'validateItem' => static function($value) {
77	77	return 0;
78	78	}
79	79	], ['users']);
		@@ -117,9 +117,9 @@ discard block
		block discarded – undo
117	117
118	118	public function testListOfInputObjectWithValidationOnSelf()
119	119	{
120		- $type = new UserErrorsType([
	120	+ $type = new UserErrorsType([
121	121	'validate' => static function(array $authors) {
122		- if(count($authors) < 1) {
	122	+ if (count($authors) < 1) {
123	123	return ['atLeastOneAuthorRequired', "You must submit at least one author"];
124	124	}
125	125	},
		@@ -161,10 +161,10 @@ discard block
		block discarded – undo
161	161
162	162	public function testListOfInputObjectWithValidationOnWrappedSelf()
163	163	{
164		- $type = new UserErrorsType([
	164	+ $type = new UserErrorsType([
165	165	'suberrorCodes' => ['firstNameOrLastNameRequired'],
166	166	'validateItem' => static function(array $author) {
167		- if(!isset($author['firstName']) && !isset($author['lastName'])) {
	167	+ if (!isset($author['firstName']) && !isset($author['lastName'])) {
168	168	return ['atLeastOneAuthorRequired', "You must submit a first name or a last name"];
169	169	}
170	170	},

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

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

		@@ -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' => ['atLeastOneList'],
43		- 'validate' => static function (array $phoneNumberLists) {
	43	+ 'validate' => static function(array $phoneNumberLists) {
44	44	if (count($phoneNumberLists) < 1) {
45	45	return ['atLeastOneList', 'You must submit at least one list of 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	],
		@@ -157,12 +157,12 @@ discard block
		block discarded – undo
157	157	);
158	158
159	159	static::assertEquals(
160		- array (
	160	+ array(
161	161	'valid' => false,
162	162	'suberrors' =>
163		- array (
	163	+ array(
164	164	'phoneNumbers' =>
165		- array (
	165	+ array(
166	166	'code' => 'atLeastOneList',
167	167	'msg' => 'You must submit at least one list of numbers',
168	168	'suberrors' => NULL,
		@@ -217,18 +217,18 @@ discard block
		block discarded – undo
217	217
218	218	static::assertEmpty($res->errors);
219	219	static::assertEquals(
220		- array (
	220	+ array(
221	221	'valid' => false,
222	222	'suberrors' =>
223		- array (
	223	+ array(
224	224	'phoneNumbers' =>
225		- array (
	225	+ array(
226	226	'code' => NULL,
227	227	'msg' => NULL,
228	228	'suberrors' =>
229		- array (
	229	+ array(
230	230	'path' =>
231		- array (
	231	+ array(
232	232	0 => 1,
233	233	1 => 1,
234	234	),

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

		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61	'title' => [
62	62	'type' => Type::string(),
63	63	'description' => 'Enter a book title, no more than 10 characters in length',
64		- 'validate' => static function (string $title) {
	64	+ 'validate' => static function(string $title) {
65	65	if (strlen($title) > 10) {
66	66	return [1, 'book title must be less than 10 chaacters'];
67	67	}
		@@ -75,8 +75,8 @@ discard block
		block discarded – undo
75	75	'unknownAuthor',
76	76	'authorDeceased',
77	77	],
78		- 'validate' => function (string $authorId) {
79		- if (! isset($this->data['people'][$authorId])) {
	78	+ 'validate' => function(string $authorId) {
	79	+ if (!isset($this->data['people'][$authorId])) {
80	80	return ['unknownAuthor', 'We have no record of that author'];
81	81	}
82	82	return 0;
		@@ -91,7 +91,7 @@ discard block
		block discarded – undo
91	91	'query' => $this->query,
92	92	'mutation' => new ObjectType([
93	93	'name' => 'Mutation',
94		- 'fields' => function () {
	94	+ 'fields' => function() {
95	95	return [
96	96	'updateBook' => new ValidatedFieldDefinition([
97	97	'name' => 'updateBook',
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	'titleOrIdRequired'
104	104	],
105	105	'validate' => static function(?array $bookAttributes) {
106		- if(is_null($bookAttributes)) {
	106	+ if (is_null($bookAttributes)) {
107	107	return 0;
108	108	}
109	109
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	}
114	114	],
115	115	],
116		- 'resolve' => static function ($value, $args) : bool {
	116	+ 'resolve' => static function($value, $args) : bool {
117	117	// ...
118	118	// do update
119	119	// ...
		@@ -240,12 +240,12 @@ discard block
		block discarded – undo
240	240	);
241	241
242	242	static::assertEquals(
243		- array (
	243	+ array(
244	244	'valid' => false,
245	245	'suberrors' =>
246		- array (
	246	+ array(
247	247	'bookAttributes' =>
248		- array (
	248	+ array(
249	249	'code' => 'titleOrIdRequired',
250	250	'msg' => 'You must supply at least one of title or author',
251	251	'suberrors' => NULL,
		@@ -351,7 +351,7 @@ discard block
		block discarded – undo
351	351
352	352	static::assertEmpty($res->errors);
353	353	static::assertEquals(
354		- array (
	354	+ array(
355	355	'valid' => true,
356	356	'suberrors' => NULL,
357	357	'result' => true,

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

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	public function testNoType() {
36	36	$this->expectExceptionMessage("You must specify a type for your field");
37	37	UserErrorsType::create([
38		- 'validate' => static function ($value) {
	38	+ 'validate' => static function($value) {
39	39	}
40	40	], ['upsertSku']);
41	41	}
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	public function testValidationWithNoErrorCodes()
44	44	{
45	45	$type = UserErrorsType::create([
46		- 'validate' => static function ($value) {
	46	+ 'validate' => static function($value) {
47	47	},
48	48	'type' => Type::id(),
49	49	], ['upsertSku']);

		@@ -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'];

		@@ -30,7 +30,7 @@ discard block
		block discarded – undo
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'])) {
	33	+ if (isset($config['validate'])) {
34	34	/** code property */
35	35	$finalFields['code'] = [
36	36	'type' => $this->_set(new EnumType([
		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39	'values' => $config['errorCodes'],
40	40	]), $config),
41	41	'description' => 'An error code',
42		- 'resolve' => static function ($value) {
	42	+ 'resolve' => static function($value) {
43	43	return $value['error'][0] ?? null;
44	44	},
45	45	];
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	$finalFields['msg'] = [
51	51	'type' => Type::string(),
52	52	'description' => 'A natural language description of the issue',
53		- 'resolve' => static function ($value) {
	53	+ 'resolve' => static function($value) {
54	54	return $value['error'][1] ?? null;
55	55	},
56	56	];
		@@ -64,18 +64,18 @@ discard block
		block discarded – undo
64	64	$fields = [];
65	65	foreach ($type->getFields() as $key => $field) {
66	66	$newType = static::create(
67		- $field->config + ['typeSetter' => $config['typeSetter'] ?? null],
	67	+ $field->config+['typeSetter' => $config['typeSetter'] ?? null],
68	68	array_merge($path, [$key])
69	69	);
70	70
71		- if (! $newType) {
	71	+ if (!$newType) {
72	72	continue;
73	73	}
74	74
75	75	$fields[$key] = [
76	76	'description' => 'Error for ' . $key,
77	77	'type' => $newType,
78		- 'resolve' => static function ($value) use ($key) {
	78	+ 'resolve' => static function($value) use ($key) {
79	79	return $value[$key] ?? null;
80	80	},
81	81	];
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	'fields' => $fields,
93	93	]), $config),
94	94	'description' => 'Suberrors for ' . ucfirst($path[count($path)-1]),
95		- 'resolve' => static function (array $value) {
	95	+ 'resolve' => static function(array $value) {
96	96	return $value['suberrors'] ?? null;
97	97	},
98	98	];
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	$finalFields['suberrors'] = [
117	117	'description' => 'Suberrors for the list of ' . $type->ofType . ' items',
118	118	'type' => $newType,
119		- 'resolve' => static function ($value) {
	119	+ 'resolve' => static function($value) {
120	120	return $value['suberrors'] ?? null;
121	121	},
122	122	];
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	$finalFields['path'] = [
131	131	'type' => Type::listOf(Type::int()),
132	132	'description' => 'A path describing this items\'s location in the nested array',
133		- 'resolve' => static function ($value) {
	133	+ 'resolve' => static function($value) {
134	134	return $value['path'];
135	135	},
136	136	];
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	$config['fields']['code'] = $config['fields']['code'] ?? [
168	168	'type' => Type::int(),
169	169	'description' => 'A numeric error code. 0 on success, non-zero on failure.',
170		- 'resolve' => static function ($value) {
	170	+ 'resolve' => static function($value) {
171	171	$error = $value['error'] ?? null;
172	172	switch (gettype($error)) {
173	173	case 'integer':
		@@ -180,7 +180,7 @@ discard block
		block discarded – undo
180	180	$config['fields']['msg'] = $config['fields']['msg'] ?? [
181	181	'type' => Type::string(),
182	182	'description' => 'An error message.',
183		- 'resolve' => static function ($value) {
	183	+ 'resolve' => static function($value) {
184	184	$error = $value['error'] ?? null;
185	185	switch (gettype($error)) {
186	186	case 'integer':

		@@ -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 $value ? 0 : 1;
42	42	},
43	43	'type' => new IDType(['name' => 'Color']),

shmax / graphql-php-validation-toolkit

Pull Request — master (#1)

Status

Category

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

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

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

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

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

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

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

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

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

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

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

Indentation +30 added lines, -30 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