shmax / graphql-php-validation-toolkit

src/Type/Definition/UserErrorsType.php

Indentation +27 added lines, -27 removed lines

@@ -26,33 +26,33 @@
         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'];

tests/Type/ErrorCodeTypeGenerationTest.php

Indentation +2 added lines, -2 removed lines

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

tests/Type/UserErrorsType/InputObjectTest.php

Indentation +20 added lines, -20 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");
 
-	    $type  = new UserErrorsType([
+        $type  = 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) {
+    public function testFieldsWithValidate()
+    {
+        $type  = new UserErrorsType([
+            'type' => new InputObjectType([
+                'name' => 'bookInput',
+                'fields' => [
+                    'authorId' => [
+                        'errorCodes' => ['unknownAuthor'],
+                        'validate' => static function(int $authorId) {
 
-						},
-						'type' => Type::id(),
-						'description' => 'An author Id',
-					],
-				],
-			])
-		], ['updateBook']);
+                        },
+                        'type' => Type::id(),
+                        'description' => 'An author Id',
+                    ],
+                ],
+            ])
+        ], ['updateBook']);
 
-		self::assertEquals(Utils::nowdoc('
+        self::assertEquals(Utils::nowdoc('
 			schema {
 			  query: UpdateBookError
 			}
@@ -111,5 +111,5 @@ 
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }

tests/Type/ValidatedFieldDefinition/ListOfScalarValidationTest.php

Indentation +35 added lines, -35 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,
@@ -152,39 +152,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/ListOfInputObjectValidationTest.php

Indentation +29 added lines, -29 removed lines

@@ -100,13 +100,13 @@ 
                             'args' => [
                                 'bookAttributes' => [
                                     'type' => Type::listOf($this->bookAttributesInputType),
-	                                'validate' => static function($var) {
-                        	            $i = 5;
-	                                },
-	                                'validateItem' => static function($book) {
-                        	            $res = isset($book['author']) || isset($book['title']) ? 0: 1;
-                        	            return $res;
-	                                }
+                                    'validate' => static function($var) {
+                                        $i = 5;
+                                    },
+                                    'validateItem' => static function($book) {
+                                        $res = isset($book['author']) || isset($book['title']) ? 0: 1;
+                                        return $res;
+                                    }
                                 ],
                             ],
                             'resolve' => static function ($value) : bool {
@@ -166,30 +166,30 @@ 
             ]
         );
 
-	    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']
         );
 

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

src/Type/Definition/ValidatedFieldDefinition.php

Indentation +5 added lines, -5 removed lines

@@ -81,11 +81,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) {

Braces +5 added lines, -5 removed lines

@@ -83,7 +83,9 @@ 
 

 	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 @@ 
                 $newPath = $path;

                 $newPath[] = 0;

                 $this->_validateItems($subValue, $newPath, $validate);

-            }

-            else {

+            } else {

                 $path[count($path) - 1] = $idx;

                 $err = $validate($subValue);

 

@@ -127,8 +128,7 @@ 
                 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

tests/Type/UserErrorsType/ListOfTest.php

Indentation +35 added lines, -35 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,30 +159,30 @@ 
 		'), 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) {}
-					],
-					'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) {}
+                    ],
+                    'lastName' => [
+                        'type' => Type::string(),
+                    ],
+                ],
+            ]))
+        ], ['authorList']);
+
+        self::assertEquals(Utils::nowdoc('
 			schema {
 			  query: AuthorListError
 			}
@@ -229,5 +229,5 @@ 
 			}
 
 		'), SchemaPrinter::doPrint(new Schema(['query' => $type])));
-	}
+    }
 }