shmax / graphql-php-validation-toolkit

tests/Type/ValidatedFieldDefinition/NonNullScalarValidationTest.php

Spacing +5 added lines, -5 removed lines

@@ -55,13 +55,13 @@ 
             'fields' => [
                 'title' => [
                     'type' => Type::string(),
-                    'resolve' => static function ($book) {
+                    'resolve' => static function($book) {
                         return $book['title'];
                     },
                 ],
                 'author' => [
                     'type' => $this->personType,
-                    'resolve' => static function ($book) {
+                    'resolve' => static function($book) {
                         return $book['author'];
                     },
                 ],
@@ -71,7 +71,7 @@ 
         $this->schema = new Schema([
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => function () {
+                'fields' => function() {
                     return [
                         'updateBook' => new ValidatedFieldDefinition([
                             'name' => 'updateBook',
@@ -80,7 +80,7 @@ 
                                 'bookId' => [
                                     'type' => Type::nonNull(Type::id()),
                                     'errorCodes' => ['bookNotFound'],
-                                    'validate' => function ($bookId) {
+                                    'validate' => function($bookId) {
                                         if (isset($this->data['books'][$bookId])) {
                                             return 0;
                                         }
@@ -89,7 +89,7 @@ 
                                     },
                                 ],
                             ],
-                            'resolve' => function ($value, $args) : array {
+                            'resolve' => function($value, $args) : array {
                                 return $this->data['books'][$args['bookId']];
                             },
                         ]),

tests/Type/ValidatedFieldDefinition/ScalarValidationTest.php

Spacing +5 added lines, -5 removed lines

@@ -58,13 +58,13 @@ 
             'fields' => [
                 'title' => [
                     'type' => Type::string(),
-                    'resolve' => static function ($book) {
+                    'resolve' => static function($book) {
                         return $book['title'];
                     },
                 ],
                 'author' => [
                     'type' => $this->personType,
-                    'resolve' => static function ($book) {
+                    'resolve' => static function($book) {
                         return $book['author'];
                     },
                 ],
@@ -77,7 +77,7 @@ 
             'query' => $this->query,
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => function () {
+                'fields' => function() {
                     return [
                         'updateBook' => new ValidatedFieldDefinition([
                             'name' => 'updateBook',
@@ -86,7 +86,7 @@ 
                                 'bookId' => [
                                     'type' => Type::id(),
                                     'errorCodes' => ['bookNotFound'],
-                                    'validate' => function ($bookId) {
+                                    'validate' => function($bookId) {
                                         if (isset($this->data['books'][$bookId])) {
                                             return 0;
                                         }
@@ -95,7 +95,7 @@ 
                                     },
                                 ],
                             ],
-                            'resolve' => static function ($value, $args) : bool {
+                            'resolve' => static function($value, $args) : bool {
                                 return true;
                             },
                         ]),

tests/Type/ErrorCodeTypeGenerationTest.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
                 'unknownUser',
                 'userIsMinor',
             ],
-            'typeSetter' => static function ($type) use (&$types) {
+            'typeSetter' => static function($type) use (&$types) {
                 $types[$type->name] = $type;
             },
             'type' => new IDType(['name' => 'User']),
@@ -56,7 +56,7 @@ 
                     ],
                 ],
             ]),
-            'typeSetter' => static function ($type) use (&$types) {
+            'typeSetter' => static function($type) use (&$types) {
                 $types[$type->name] = $type;
             },
         ], ['updateBook']);
@@ -84,7 +84,7 @@ 
                     ],
                 ],
             ]),
-            'typeSetter' => static function ($type) use (&$types) {
+            'typeSetter' => static function($type) use (&$types) {
                 $types[$type->name] = $type;
             },
         ], ['updateBook']);

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/Utils.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         }
 
         // 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 = [];

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])));
-	}
+    }
 }

Spacing +3 added lines, -3 removed lines

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

tests/Type/UserErrorsType/ScalarTest.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

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

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

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;

 

Spacing +12 added lines, -12 removed lines

@@ -34,14 +34,14 @@ 
                 '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 @@ 
             '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 @@ 
 	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 @@ 
                     }

                 }

 

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

 

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