View GitHub Repository graphql-php-validation-toolkit

Schedule Inspection
Subscribe
Passed
Pull Request — master (#1)
by Max
05:13
created
Status
Category
Toggle Patches
tests/Type/ValidatedFieldDefinition/NonNullScalarValidationTest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -55,13 +55,13 @@  discard block
 
 block discarded – undo
55 55 
             'fields' => [
56 56 
                 'title' => [
57 57 
                     'type' => Type::string(),
58 
-                    'resolve' => static function ($book) {
58 
+                    'resolve' => static function($book) {
59 59 
                         return $book['title'];
60 60 
                     },
61 61 
                 ],
62 62 
                 'author' => [
63 63 
                     'type' => $this->personType,
64 
-                    'resolve' => static function ($book) {
64 
+                    'resolve' => static function($book) {
65 65 
                         return $book['author'];
66 66 
                     },
67 67 
                 ],
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
         $this->schema = new Schema([
72 72 
             'mutation' => new ObjectType([
73 73 
                 'name' => 'Mutation',
74 
-                'fields' => function () {
74 
+                'fields' => function() {
75 75 
                     return [
76 76 
                         'updateBook' => new ValidatedFieldDefinition([
77 77 
                             'name' => 'updateBook',
 
@@ -80,7 +80,7 @@  discard block
 
 block discarded – undo
80 80 
                                 'bookId' => [
81 81 
                                     'type' => Type::nonNull(Type::id()),
82 82 
                                     'errorCodes' => ['bookNotFound'],
83 
-                                    'validate' => function ($bookId) {
83 
+                                    'validate' => function($bookId) {
84 84 
                                         if (isset($this->data['books'][$bookId])) {
85 85 
                                             return 0;
86 86 
                                         }
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
                                     },
90 90 
                                 ],
91 91 
                             ],
92 
-                            'resolve' => function ($value, $args) : array {
92 
+                            'resolve' => function($value, $args) : array {
93 93 
                                 return $this->data['books'][$args['bookId']];
94 94 
                             },
95 95 
                         ]),
Please login to merge, or discard this patch.
tests/Type/ValidatedFieldDefinition/ScalarValidationTest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -58,13 +58,13 @@  discard block
 
 block discarded – undo
58 58 
             'fields' => [
59 59 
                 'title' => [
60 60 
                     'type' => Type::string(),
61 
-                    'resolve' => static function ($book) {
61 
+                    'resolve' => static function($book) {
62 62 
                         return $book['title'];
63 63 
                     },
64 64 
                 ],
65 65 
                 'author' => [
66 66 
                     'type' => $this->personType,
67 
-                    'resolve' => static function ($book) {
67 
+                    'resolve' => static function($book) {
68 68 
                         return $book['author'];
69 69 
                     },
70 70 
                 ],
 
@@ -77,7 +77,7 @@  discard block
 
 block discarded – undo
77 77 
             'query' => $this->query,
78 78 
             'mutation' => new ObjectType([
79 79 
                 'name' => 'Mutation',
80 
-                'fields' => function () {
80 
+                'fields' => function() {
81 81 
                     return [
82 82 
                         'updateBook' => new ValidatedFieldDefinition([
83 83 
                             'name' => 'updateBook',
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
                                 'bookId' => [
87 87 
                                     'type' => Type::id(),
88 88 
                                     'errorCodes' => ['bookNotFound'],
89 
-                                    'validate' => function ($bookId) {
89 
+                                    'validate' => function($bookId) {
90 90 
                                         if (isset($this->data['books'][$bookId])) {
91 91 
                                             return 0;
92 92 
                                         }
 
@@ -95,7 +95,7 @@  discard block
 
 block discarded – undo
95 95 
                                     },
96 96 
                                 ],
97 97 
                             ],
98 
-                            'resolve' => static function ($value, $args) : bool {
98 
+                            'resolve' => static function($value, $args) : bool {
99 99 
                                 return true;
100 100 
                             },
101 101 
                         ]),
Please login to merge, or discard this patch.
tests/Type/ErrorCodeTypeGenerationTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@  discard block
 
 block discarded – undo
23 23 
                 'unknownUser',
24 24 
                 'userIsMinor',
25 25 
             ],
26 
-            'typeSetter' => static function ($type) use (&$types) {
26 
+            'typeSetter' => static function($type) use (&$types) {
27 27 
                 $types[$type->name] = $type;
28 28 
             },
29 29 
             'type' => new IDType(['name' => 'User']),
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
                     ],
57 57 
                 ],
58 58 
             ]),
59 
-            'typeSetter' => static function ($type) use (&$types) {
59 
+            'typeSetter' => static function($type) use (&$types) {
60 60 
                 $types[$type->name] = $type;
61 61 
             },
62 62 
         ], ['updateBook']);
 
@@ -84,7 +84,7 @@  discard block
 
 block discarded – undo
84 84 
                     ],
85 85 
                 ],
86 86 
             ]),
87 
-            'typeSetter' => static function ($type) use (&$types) {
87 
+            'typeSetter' => static function($type) use (&$types) {
88 88 
                 $types[$type->name] = $type;
89 89 
             },
90 90 
         ], ['updateBook']);
Please login to merge, or discard this patch.
tests/Utils.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove 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 = [];
Please login to merge, or discard this patch.
tests/Type/UserErrorsType/InputObjectTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -17,7 +17,7 @@  discard block
 
 block discarded – undo
17 17 
 {
18 18 
     public function testFieldsWithNoErrorCodes()
19 19 
     {
20 
-        $type  = new UserErrorsType([
20 
+        $type = new UserErrorsType([
21 21 
             'type' => new InputObjectType([
22 22 
                 'name' => 'bookInput',
23 23 
                 'fields' => [
 
@@ -47,7 +47,7 @@  discard block
 
 block discarded – undo
47 47 
     {
48 48 
 	    $this->expectExceptionMessage("If you specify errorCodes, you must also provide a validate callback");
49 49
50 
-	    $type  = new UserErrorsType([
50 
+	    $type = new UserErrorsType([
51 51 
             'type' => new InputObjectType([
52 52 
                 'name' => 'bookInput',
53 53 
                 'fields' => [
 
@@ -63,7 +63,7 @@  discard block
 
 block discarded – undo
63 63
64 64 
 	public function testFieldsWithValidate()
65 65 
 	{
66 
-		$type  = new UserErrorsType([
66 
+		$type = new UserErrorsType([
67 67 
 			'type' => new InputObjectType([
68 68 
 				'name' => 'bookInput',
69 69 
 				'fields' => [
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
37 37 
     {
38 38 
         $type = new UserErrorsType([
39 39 
             'errorCodes' => ['invalidColor'],
40 
-            'validate' => static function ($value) {
40 
+            'validate' => static function($value) {
41 41 
                 return 0;
42 42 
             },
43 43 
             'type' => new IDType(['name' => 'Color']),
Please login to merge, or discard this patch.
tests/Type/ValidatedFieldDefinition/ListOfInputObjectValidationTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -62,7 +62,7 @@  discard block
 
 block discarded – undo
62 62 
                 'title' => [
63 63 
                     'type' => Type::string(),
64 64 
                     'description' => 'Enter a book title, no more than 10 characters in length',
65 
-                    'validate' => static function (string $title) {
65 
+                    'validate' => static function(string $title) {
66 66 
                         if (strlen($title) > 10) {
67 67 
                             return [1, 'book title must be less than 10 chaacters'];
68 68 
                         }
 
@@ -76,8 +76,8 @@  discard block
 
 block discarded – undo
76 76 
                         'unknownAuthor',
77 77 
                         'authorDeceased',
78 78 
                     ],
79 
-                    'validate' => function (string $authorId) {
80 
-                        if (! isset($this->data['people'][$authorId])) {
79 
+                    'validate' => function(string $authorId) {
80 
+                        if (!isset($this->data['people'][$authorId])) {
81 81 
                             return ['unknownAuthor', 'We have no record of that author'];
82 82 
                         }
83 83 
                         return 0;
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
             'query' => $this->query,
93 93 
             'mutation' => new ObjectType([
94 94 
                 'name' => 'Mutation',
95 
-                'fields' => function () {
95 
+                'fields' => function() {
96 96 
                     return [
97 97 
                         'updateBooks' => new ValidatedFieldDefinition([
98 98 
                             'name' => 'updateBooks',
 
@@ -104,12 +104,12 @@  discard block
 
 block discarded – undo
104 104 
                         	            $i = 5;
105 105 
 	                                },
106 106 
 	                                'validateItem' => static function($book) {
107 
-                        	            $res = isset($book['author']) || isset($book['title']) ? 0: 1;
107 
+                        	            $res = isset($book['author']) || isset($book['title']) ? 0 : 1;
108 108 
                         	            return $res;
109 109 
 	                                }
110 110 
                                 ],
111 111 
                             ],
112 
-                            'resolve' => static function ($value) : bool {
112 
+                            'resolve' => static function($value) : bool {
113 113 
                                 // ...
114 114 
                                 // do update
115 115 
                                 // ...
 
@@ -169,21 +169,21 @@  discard block
 
 block discarded – undo
169 169 
 	    static::assertEmpty($res->errors);
170 170
171 171 
         static::assertEquals(
172 
-	        array (
172 
+	        array(
173 173 
 		        'valid' => false,
174 174 
 		        'result' => NULL,
175 175 
 		        'suberrors' =>
176 
-			        array (
176 
+			        array(
177 177 
 				        'bookAttributes' =>
178 
-					        array (
178 
+					        array(
179 179 
 						        'code' => NULL,
180 180 
 						        'msg' => NULL,
181 181 
 						        'suberrors' =>
182 
-							        array (
182 
+							        array(
183 183 
 								        'code' => 1,
184 184 
 								        'msg' => '',
185 185 
 								        'path' =>
186 
-									        array (
186 
+									        array(
187 187 
 										        0 => 1,
188 188 
 									        ),
189 189 
 							        ),
Please login to merge, or discard this patch.
src/Type/Definition/ValidatedFieldDefinition.php 2 patches
Braces   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -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
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
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);
Please login to merge, or discard this patch.
tests/Type/UserErrorsType/ListOfTest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -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 
 			},
Please login to merge, or discard this patch.