shmax / graphql-php-validation-toolkit

src/Type/Definition/ValidateItemsError.php

Indentation +7 added lines, -7 removed lines

@@ -2,11 +2,11 @@
 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

tests/Type/ValidatedFieldDefinition/ListOfScalarValidationTest.php

Indentation +68 added lines, -68 removed lines

@@ -93,10 +93,10 @@ 
             null,
             [
                 'phoneNumbers' => [
-                	[
-	                    '123-4567',
-	                    'xxx456-7890xxx'
-		            ]
+                    [
+                        '123-4567',
+                        'xxx456-7890xxx'
+                    ]
                 ],
             ]
         );
@@ -109,10 +109,10 @@ 
                         'phoneNumbers' =>
                             [
                                 'suberrors' =>
-	                                [
-	                                    'path' => [0,1],
-	                                    'code' => 'invalidPhoneNumber',
-	                                ]
+                                    [
+                                        'path' => [0,1],
+                                        'code' => 'invalidPhoneNumber',
+                                    ]
                             ],
                     ],
                 'result' => null,
@@ -124,11 +124,11 @@ 
         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 @@ 
 						}
 					}
 			'),
-			[],
-			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 @@ 
             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']
         );
 

tests/Type/ValidatedFieldDefinition/InputObjectValidationTest.php

Indentation +48 added lines, -48 removed lines

@@ -99,18 +99,18 @@ 
                             '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 @@ 
         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 @@ 
 					}
 				}
 			'),
-			[],
-			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 @@ 
 
         static::assertEmpty($res->errors);
         static::assertEquals(
-	        array (
-		        'valid' => true,
-		        'suberrors' => NULL,
-		        'result' => true,
-	        ),
+            array (
+                'valid' => true,
+                'suberrors' => NULL,
+                'result' => true,
+            ),
             $res->data['updateBook']
         );
 

tests/Type/UserErrorsType/BasicTest.php

Indentation +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@
     }
 
     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()

src/Type/Definition/UserErrorsType.php

Indentation +30 added lines, -30 removed lines

@@ -23,40 +23,40 @@
     {

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

src/Type/Definition/ValidatedFieldDefinition.php

Indentation +10 added lines, -10 removed lines

@@ -77,11 +77,11 @@ 
         ]);

     }

 

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

                 $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;

 

tests/Type/UserErrorsType/ListOfTest.php

Indentation +37 added lines, -37 removed lines

@@ -118,21 +118,21 @@ 
     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 @@ 
 		'), 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 @@ 
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }

tests/Type/UserErrorsType/InputObjectTest.php

Indentation +21 added lines, -21 removed lines

@@ -45,9 +45,9 @@ 
 
     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 @@ 
         ], ['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 @@ 
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }

tests/Type/ValidatedFieldDefinition/ListOfInputObjectValidationTest.php

Indentation +29 added lines, -29 removed lines

@@ -100,13 +100,13 @@ 
                             '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 @@ 
             ]
         );
 
-	    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']
         );