@@ -45,7 +45,7 @@ |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | foreach ($value->getTypesList()->getTypes() as $type) { |
48 | - $this->collectTypes($type); |
|
48 | + $this->collectTypes($type); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | return array_values($this->types); |
@@ -20,7 +20,9 @@ |
||
20 | 20 | |
21 | 21 | protected function collectTypes(AbstractType $type) |
22 | 22 | { |
23 | - if (is_object($type) && array_key_exists($type->getName(), $this->types)) return; |
|
23 | + if (is_object($type) && array_key_exists($type->getName(), $this->types)) { |
|
24 | + return; |
|
25 | + } |
|
24 | 26 | |
25 | 27 | switch ($type->getKind()) { |
26 | 28 | case TypeMap::KIND_INTERFACE: |
@@ -22,7 +22,7 @@ |
||
22 | 22 | |
23 | 23 | self::assertTrue(isset($res['data']['items'])); |
24 | 24 | |
25 | - foreach($res['data']['items'] as $item) { |
|
25 | + foreach ($res['data']['items'] as $item) { |
|
26 | 26 | self::assertTrue(isset($item['custom']['value'])); |
27 | 27 | self::assertEquals(self::BUG_NOT_EXISTS_VALUE, $item['custom']['value']); |
28 | 28 | } |
@@ -52,7 +52,7 @@ |
||
52 | 52 | 'args' => [ |
53 | 53 | 'example' => new StringType() |
54 | 54 | ], |
55 | - 'resolve' => function () { |
|
55 | + 'resolve' => function() { |
|
56 | 56 | return [ |
57 | 57 | ['id' => 1], |
58 | 58 | ['id' => 2], |
@@ -24,7 +24,6 @@ |
||
24 | 24 | use Youshido\GraphQL\Parser\Ast\Interfaces\FieldInterface as AstFieldInterface; |
25 | 25 | use Youshido\GraphQL\Parser\Ast\Mutation as AstMutation; |
26 | 26 | use Youshido\GraphQL\Parser\Ast\Query as AstQuery; |
27 | -use Youshido\GraphQL\Parser\Ast\Query; |
|
28 | 27 | use Youshido\GraphQL\Parser\Ast\TypedFragmentReference; |
29 | 28 | use Youshido\GraphQL\Parser\Parser; |
30 | 29 | use Youshido\GraphQL\Schema\AbstractSchema; |
@@ -185,6 +185,9 @@ |
||
185 | 185 | } |
186 | 186 | } |
187 | 187 | |
188 | + /** |
|
189 | + * @param \Youshido\GraphQL\Parser\Ast\Interfaces\ValueInterface $argumentValue |
|
190 | + */ |
|
188 | 191 | private function prepareArgumentValue($argumentValue, AbstractType $argumentType, Request $request) |
189 | 192 | { |
190 | 193 | switch ($argumentType->getKind()) { |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | $result = []; |
402 | 402 | foreach ($resolvedValue as $resolvedValueItem) { |
403 | 403 | try { |
404 | - $fakeField->getConfig()->set('resolve', function () use ($resolvedValueItem) { |
|
404 | + $fakeField->getConfig()->set('resolve', function() use ($resolvedValueItem) { |
|
405 | 405 | return $resolvedValueItem; |
406 | 406 | }); |
407 | 407 | |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | } |
452 | 452 | |
453 | 453 | /** @var AbstractUnionType $type */ |
454 | - $type = $field->getType()->getNullableType(); |
|
454 | + $type = $field->getType()->getNullableType(); |
|
455 | 455 | $resolveInfo = new ResolveInfo( |
456 | 456 | $field, |
457 | 457 | $ast instanceof AstQuery ? $ast->getFields() : [], |
@@ -223,6 +223,9 @@ discard block |
||
223 | 223 | return $this; |
224 | 224 | } |
225 | 225 | |
226 | + /** |
|
227 | + * @param string $name |
|
228 | + */ |
|
226 | 229 | public function getVariable($name) |
227 | 230 | { |
228 | 231 | return $this->hasVariable($name) ? $this->variables[$name] : null; |
@@ -266,7 +269,7 @@ discard block |
||
266 | 269 | } |
267 | 270 | |
268 | 271 | /** |
269 | - * @return array|VariableReference[] |
|
272 | + * @return VariableReference[] |
|
270 | 273 | */ |
271 | 274 | public function getVariableReferences() |
272 | 275 | { |
@@ -219,11 +219,15 @@ |
||
219 | 219 | $this->variables = $variables; |
220 | 220 | foreach ($this->variableReferences as $reference) { |
221 | 221 | /** invalid request with no variable */ |
222 | - if (!$reference->getVariable()) continue; |
|
222 | + if (!$reference->getVariable()) { |
|
223 | + continue; |
|
224 | + } |
|
223 | 225 | $variableName = $reference->getVariable()->getName(); |
224 | 226 | |
225 | 227 | /** no variable was set at the time */ |
226 | - if (!array_key_exists($variableName, $variables)) continue; |
|
228 | + if (!array_key_exists($variableName, $variables)) { |
|
229 | + continue; |
|
230 | + } |
|
227 | 231 | |
228 | 232 | $reference->getVariable()->setValue($variables[$variableName]); |
229 | 233 | $reference->setValue($variables[$variableName]); |
@@ -8,14 +8,12 @@ |
||
8 | 8 | namespace Youshido\GraphQL\Execution; |
9 | 9 | |
10 | 10 | use Youshido\GraphQL\Exception\Parser\InvalidRequestException; |
11 | -use Youshido\GraphQL\Parser\Ast\ArgumentValue\Literal; |
|
12 | 11 | use Youshido\GraphQL\Parser\Ast\ArgumentValue\Variable; |
13 | 12 | use Youshido\GraphQL\Parser\Ast\ArgumentValue\VariableReference; |
14 | 13 | use Youshido\GraphQL\Parser\Ast\Fragment; |
15 | 14 | use Youshido\GraphQL\Parser\Ast\FragmentReference; |
16 | 15 | use Youshido\GraphQL\Parser\Ast\Mutation; |
17 | 16 | use Youshido\GraphQL\Parser\Ast\Query; |
18 | -use Youshido\GraphQL\Parser\Location; |
|
19 | 17 | |
20 | 18 | class Request |
21 | 19 | { |
@@ -40,7 +40,7 @@ |
||
40 | 40 | ] |
41 | 41 | ] |
42 | 42 | ]), |
43 | - 'resolve' => function ($source, array $args, ResolveInfo $info) { |
|
43 | + 'resolve' => function($source, array $args, ResolveInfo $info) { |
|
44 | 44 | $internalArgs = [ |
45 | 45 | 'comment_id' => 200 |
46 | 46 | ]; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | ['id' => 2, 'name' => 'Alex'], |
32 | 32 | ['id' => 3, 'name' => 'Mike'], |
33 | 33 | ]; |
34 | - $posts = []; |
|
34 | + $posts = []; |
|
35 | 35 | for ($i = 0; $i < 10; $i++) { |
36 | 36 | $posts[] = [ |
37 | 37 | 'id' => $i + 1, |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | 'fields' => [ |
68 | 68 | 'posts' => [ |
69 | 69 | 'type' => new ListType($postType), |
70 | - 'resolve' => function ($source, $args, $info) { |
|
70 | + 'resolve' => function($source, $args, $info) { |
|
71 | 71 | return $this->getDataForPosts(); |
72 | 72 | } |
73 | 73 | ] |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
41 | - * @param $cursor string |
|
41 | + * @param string|null $cursor string |
|
42 | 42 | * |
43 | - * @return int|null |
|
43 | + * @return string|null |
|
44 | 44 | * @deprecated Use cursorToKey instead. |
45 | 45 | */ |
46 | 46 | public static function cursorToOffset($cursor) |
@@ -94,6 +94,10 @@ discard block |
||
94 | 94 | return self::connectionFromArraySlice($data, $args, 0, count($data)); |
95 | 95 | } |
96 | 96 | |
97 | + /** |
|
98 | + * @param integer $sliceStart |
|
99 | + * @param integer $arrayLength |
|
100 | + */ |
|
97 | 101 | public static function connectionFromArraySlice(array $data, array $args, $sliceStart, $arrayLength) |
98 | 102 | { |
99 | 103 | $after = isset($args['after']) ? $args['after'] : null; |
@@ -139,6 +143,10 @@ discard block |
||
139 | 143 | ]; |
140 | 144 | } |
141 | 145 | |
146 | + /** |
|
147 | + * @param string $object |
|
148 | + * @param integer $index |
|
149 | + */ |
|
142 | 150 | public static function edgeForObjectWithIndex($object, $index) |
143 | 151 | { |
144 | 152 | return [ |
@@ -29,12 +29,12 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public static function offsetToCursor($offset) |
31 | 31 | { |
32 | - return self::keyToCursor($offset); |
|
32 | + return self::keyToCursor($offset); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public static function keyToCursor($key) |
36 | 36 | { |
37 | - return base64_encode(self::PREFIX . $key); |
|
37 | + return base64_encode(self::PREFIX . $key); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -48,30 +48,30 @@ discard block |
||
48 | 48 | return self::cursorToKey($cursor); |
49 | 49 | } |
50 | 50 | |
51 | - /** |
|
52 | - * Converts a cursor to its array key. |
|
53 | - * |
|
54 | - * @param $cursor |
|
55 | - * @return null|string |
|
56 | - */ |
|
51 | + /** |
|
52 | + * Converts a cursor to its array key. |
|
53 | + * |
|
54 | + * @param $cursor |
|
55 | + * @return null|string |
|
56 | + */ |
|
57 | 57 | public static function cursorToKey($cursor) { |
58 | - if ($decoded = base64_decode($cursor)) { |
|
58 | + if ($decoded = base64_decode($cursor)) { |
|
59 | 59 | return substr($decoded, strlen(self::PREFIX)); |
60 | - } |
|
61 | - return null; |
|
60 | + } |
|
61 | + return null; |
|
62 | 62 | } |
63 | 63 | |
64 | - /** |
|
65 | - * Converts a cursor to an array offset. |
|
66 | - * |
|
67 | - * @param $cursor |
|
68 | - * The cursor string. |
|
69 | - * @param $default |
|
70 | - * The default value, in case the cursor is not given. |
|
71 | - * @param array $array |
|
72 | - * The array to use in counting the offset. If empty, assumed to be an indexed array. |
|
73 | - * @return int|null |
|
74 | - */ |
|
64 | + /** |
|
65 | + * Converts a cursor to an array offset. |
|
66 | + * |
|
67 | + * @param $cursor |
|
68 | + * The cursor string. |
|
69 | + * @param $default |
|
70 | + * The default value, in case the cursor is not given. |
|
71 | + * @param array $array |
|
72 | + * The array to use in counting the offset. If empty, assumed to be an indexed array. |
|
73 | + * @return int|null |
|
74 | + */ |
|
75 | 75 | public static function cursorToOffsetWithDefault($cursor, $default, $array = []) |
76 | 76 | { |
77 | 77 | if (!is_string($cursor)) { |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | |
81 | 81 | $key = self::cursorToKey($cursor); |
82 | 82 | if (empty($array)) { |
83 | - $offset = $key; |
|
83 | + $offset = $key; |
|
84 | 84 | } |
85 | 85 | else { |
86 | - $offset = array_search($key, array_keys($array)); |
|
86 | + $offset = array_search($key, array_keys($array)); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | return is_null($offset) ? $default : (int) $offset; |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | if (!is_array($data)) return null; |
19 | 19 | |
20 | 20 | $index = array_search($object, $data); |
21 | - return $index === false ? null : (string) self::keyToCursor($index); |
|
21 | + return $index === false ? null : (string)self::keyToCursor($index); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | public static function keyToCursor($key) |
36 | 36 | { |
37 | - return base64_encode(self::PREFIX . $key); |
|
37 | + return base64_encode(self::PREFIX.$key); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $offset = array_search($key, array_keys($array)); |
87 | 87 | } |
88 | 88 | |
89 | - return is_null($offset) ? $default : (int) $offset; |
|
89 | + return is_null($offset) ? $default : (int)$offset; |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | public static function connectionFromArray(array $data, array $args = []) |
@@ -15,7 +15,9 @@ discard block |
||
15 | 15 | |
16 | 16 | public static function cursorForObjectInConnection($data, $object) |
17 | 17 | { |
18 | - if (!is_array($data)) return null; |
|
18 | + if (!is_array($data)) { |
|
19 | + return null; |
|
20 | + } |
|
19 | 21 | |
20 | 22 | $index = array_search($object, $data); |
21 | 23 | return $index === false ? null : (string) self::keyToCursor($index); |
@@ -81,8 +83,7 @@ discard block |
||
81 | 83 | $key = self::cursorToKey($cursor); |
82 | 84 | if (empty($array)) { |
83 | 85 | $offset = $key; |
84 | - } |
|
85 | - else { |
|
86 | + } else { |
|
86 | 87 | $offset = array_search($key, array_keys($array)); |
87 | 88 | } |
88 | 89 |