shmax / graphql-php-validation-toolkit

src/Type/Definition/UserErrorsType.php

Spacing +11 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
         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([
@@ -35,7 +35,7 @@ 
 				        'values' => $config['errorCodes'],
 			        ]), $config),
 			        'description' => 'An error code',
-			        'resolve' => static function ($value) {
+			        'resolve' => static function($value) {
 				        return $value['error'][0] ?? null;
 			        },
 		        ];
@@ -46,7 +46,7 @@ 
 		        $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;
 			        },
 		        ];
@@ -60,18 +60,18 @@ 
             $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;
                     },
                 ];
@@ -88,7 +88,7 @@ 
                         '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;
                     },
                 ];
@@ -112,7 +112,7 @@ 
                 $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;
                     },
                 ];
@@ -126,7 +126,7 @@ 
             $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'];
                 },
             ];
@@ -163,7 +163,7 @@ 
             $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':
@@ -176,7 +176,7 @@ 
             $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':

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

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

Spacing +11 added lines, -11 removed lines

@@ -31,7 +31,7 @@ 
             'query' => $this->query,
             'mutation' => new ObjectType([
                 'name' => 'Mutation',
-                'fields' => static function () {
+                'fields' => static function() {
                     return [
                         'setPhoneNumbers' => new ValidatedFieldDefinition([
                             'name' => 'setPhoneNumbers',
@@ -40,20 +40,20 @@ 
                                 'phoneNumbers' => [
                                     'type' => Type::listOf(Type::listOf(Type::string())),
                                     'errorCodes' => ['maxNumExceeded'],
-                                    'validate' => static function (array $phoneNumbers) {
+                                    'validate' => static function(array $phoneNumbers) {
                                         if (count($phoneNumbers) > 2) {
                                             return ['maxNumExceeded', 'You may not submit more than 2 lists of phone 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 @@ 
                             [
                                 'suberrors' =>
 	                                [
-	                                    'path' => [0,1],
+	                                    'path' => [0, 1],
 	                                    'code' => 'invalidPhoneNumber',
 	                                ]
                             ],
@@ -164,18 +164,18 @@ 
 
         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,
 									        ),

tests/Type/ValidatedFieldDefinition/ListOfInputObjectValidationTest.php

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

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 

         $this->typeSetter = $config['typeSetter'] ?? null;

 

-        if (! isset($config['type'])) {

+        if (!isset($config['type'])) {

             throw new Exception('You must specify a type for your field');

         }

 

@@ -38,14 +38,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'];

                     },

                 ],

@@ -62,17 +62,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);

                 }

 

@@ -84,19 +84,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) {

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

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

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
         $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 @@ 
         $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 @@ 
 
     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 @@ 
 
 	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"];
 				}
 			},