Completed
Pull Request — master (#44)
by Daniel
06:29
created
src/Type/TypeFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@
 block discarded – undo
35 35
             if (empty(self::$objectsHash[$type])) {
36 36
                 $name = ucfirst($type);
37 37
 
38
-                $className                = 'Youshido\GraphQL\Type\Scalar\\' . $name . 'Type';
38
+                $className                = 'Youshido\GraphQL\Type\Scalar\\'.$name.'Type';
39 39
                 self::$objectsHash[$type] = new $className();
40 40
             }
41 41
 
42 42
             return self::$objectsHash[$type];
43 43
         } else {
44
-            throw new ConfigurationException('Configuration problem with type ' . $type);
44
+            throw new ConfigurationException('Configuration problem with type '.$type);
45 45
         }
46 46
     }
47 47
 
Please login to merge, or discard this patch.
Tests/Library/Type/ScalarExtendTypeTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,13 +27,13 @@
 block discarded – undo
27 27
                 'title' => new StringType(),
28 28
             ]
29 29
         ]);
30
-        $processor  = new Processor(new Schema([
30
+        $processor = new Processor(new Schema([
31 31
                 'query' => new ObjectType([
32 32
                     'name'   => 'RootQueryType',
33 33
                     'fields' => [
34 34
                         'latestReport' => [
35 35
                             'type'    => $reportType,
36
-                            'resolve' => function () {
36
+                            'resolve' => function() {
37 37
                                 return [
38 38
                                     'title' => 'Accident #1',
39 39
                                     'time'  => '13:30:12',
Please login to merge, or discard this patch.
src/Execution/Processor.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,9 @@
 block discarded – undo
168 168
         $value = [];
169 169
 
170 170
         if ($fieldType->getKind() == TypeMap::KIND_LIST) {
171
-            if (!$this->resolveValidator->hasArrayAccess($resolvedValue)) return null;
171
+            if (!$this->resolveValidator->hasArrayAccess($resolvedValue)) {
172
+                return null;
173
+            }
172 174
             foreach ($resolvedValue as $resolvedValueItem) {
173 175
                 $value[] = [];
174 176
                 $index   = count($value) - 1;
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,6 @@
 block discarded – undo
27 27
 use Youshido\GraphQL\Schema\AbstractSchema;
28 28
 use Youshido\GraphQL\Type\AbstractType;
29 29
 use Youshido\GraphQL\Type\Object\AbstractObjectType;
30
-use Youshido\GraphQL\Type\Scalar\AbstractScalarType;
31 30
 use Youshido\GraphQL\Type\TypeInterface;
32 31
 use Youshido\GraphQL\Type\TypeMap;
33 32
 use Youshido\GraphQL\Type\TypeService;
Please login to merge, or discard this patch.
Doc Comments   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     }
112 112
 
113 113
     /**
114
-     * @param Query|Field        $query
114
+     * @param Query        $query
115 115
      * @param AbstractObjectType $currentLevelSchema
116 116
      * @return array|bool|mixed
117 117
      */
@@ -260,6 +260,9 @@  discard block
 block discarded – undo
260 260
         }
261 261
     }
262 262
 
263
+    /**
264
+     * @param AbstractField $field
265
+     */
263 266
     protected function createResolveInfo($field, $fields) {
264 267
         return new ResolveInfo($field, $fields, $this->executionContext);
265 268
     }
@@ -322,7 +325,7 @@  discard block
 block discarded – undo
322 325
     }
323 326
 
324 327
     /**
325
-     * @param $query         Query|FragmentInterface
328
+     * @param Query $query         Query|FragmentInterface
326 329
      * @param $queryType     AbstractObjectType|TypeInterface|Field|AbstractType
327 330
      * @param $resolvedValue mixed
328 331
      * @param $value         array
@@ -494,7 +497,7 @@  discard block
 block discarded – undo
494 497
      * Fragments (anonymous and named), and Fields.  The core of the function is simple: recurse until we hit the base
495 498
      * case of a Field and yield that back up to the visitor up in `doVisit`.
496 499
      *
497
-     * @param Query|Field|FragmentInterface $queryNode
500
+     * @param Query $queryNode
498 501
      * @param AbstractField                 $currentLevelAST
499 502
      *
500 503
      * @return \Generator
Please login to merge, or discard this patch.
src/Execution/Visitor/AbstractQueryVisitor.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -29,38 +29,38 @@
 block discarded – undo
29 29
 
30 30
 abstract class AbstractQueryVisitor {
31 31
 
32
-  /**
33
-   * @var int initial value of $this->memo
34
-   */
35
-  protected $initialValue = 0;
32
+    /**
33
+     * @var int initial value of $this->memo
34
+     */
35
+    protected $initialValue = 0;
36 36
 
37
-  /**
38
-   * @var mixed the accumulator
39
-   */
40
-  protected $memo;
37
+    /**
38
+     * @var mixed the accumulator
39
+     */
40
+    protected $memo;
41 41
 
42
-  /**
43
-   * AbstractQueryVisitor constructor.
44
-   */
45
-  public function __construct() {
42
+    /**
43
+     * AbstractQueryVisitor constructor.
44
+     */
45
+    public function __construct() {
46 46
     $this->memo = $this->initialValue;
47
-  }
47
+    }
48 48
 
49
-  /**
50
-   * @return mixed getter for the memo, in case callers want to inspect it after a process run
51
-   */
52
-  public function getMemo() {
49
+    /**
50
+     * @return mixed getter for the memo, in case callers want to inspect it after a process run
51
+     */
52
+    public function getMemo() {
53 53
     return $this->memo;
54
-  }
54
+    }
55 55
 
56
-  /**
57
-   * Visit a query node.  See class docstring.
58
-   *
59
-   * @param array       $args
60
-   * @param FieldConfig $fieldConfig
61
-   * @param int         $childScore
62
-   *
63
-   * @return int|null
64
-   */
65
-  abstract public function visit(array $args, FieldConfig $fieldConfig, $childScore = 0);
56
+    /**
57
+     * Visit a query node.  See class docstring.
58
+     *
59
+     * @param array       $args
60
+     * @param FieldConfig $fieldConfig
61
+     * @param int         $childScore
62
+     *
63
+     * @return int|null
64
+     */
65
+    abstract public function visit(array $args, FieldConfig $fieldConfig, $childScore = 0);
66 66
 }
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
Tests/Performance/LoadTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
             $authors = [];
44 44
             while (count($authors) < rand(1, 4)) {
45 45
                 $authors[] = [
46
-                    'name' => 'Author ' . substr(md5(time()), 0, 4)
46
+                    'name' => 'Author '.substr(md5(time()), 0, 4)
47 47
                 ];
48 48
             }
49 49
             $data[] = [
50 50
                 'id'      => $i,
51
-                'title'   => 'Title of ' . $i,
51
+                'title'   => 'Title of '.$i,
52 52
                 'authors' => $authors,
53 53
             ];
54 54
         }
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 //        return true;
70 70
         $p->processPayload('{ posts { id, title, authors { name } } }');
71 71
         $res = $p->getResponseData();
72
-        echo "Count: " . count($res['data']['posts']) . "\n";
72
+        echo "Count: ".count($res['data']['posts'])."\n";
73 73
         printf("Test Time: %04f\n", microtime(true) - $time);
74 74
 //        $p->getResponseData();
75 75
     }
Please login to merge, or discard this patch.
Tests/Library/Type/InputObjectTypeTest.php 2 patches
Unused Use Statements   -7 removed lines patch added patch discarded remove patch
@@ -9,13 +9,7 @@  discard block
 block discarded – undo
9 9
 namespace Youshido\Tests\Library\Type;
10 10
 
11 11
 
12
-use Youshido\GraphQL\Execution\Context\ExecutionContext;
13 12
 use Youshido\GraphQL\Execution\Processor;
14
-use Youshido\GraphQL\Execution\Request;
15
-use Youshido\GraphQL\Field\Field;
16
-use Youshido\GraphQL\Parser\Ast\Argument;
17
-use Youshido\GraphQL\Parser\Ast\ArgumentValue\Literal;
18
-use Youshido\GraphQL\Parser\Ast\Query;
19 13
 use Youshido\GraphQL\Schema\Schema;
20 14
 use Youshido\GraphQL\Type\InputObject\InputObjectType;
21 15
 use Youshido\GraphQL\Type\ListType\ListType;
@@ -24,7 +18,6 @@  discard block
 block discarded – undo
24 18
 use Youshido\GraphQL\Type\Scalar\BooleanType;
25 19
 use Youshido\GraphQL\Type\Scalar\StringType;
26 20
 use Youshido\GraphQL\Type\TypeMap;
27
-use Youshido\GraphQL\Validator\ResolveValidator\ResolveValidator;
28 21
 use Youshido\Tests\DataProvider\TestInputObjectType;
29 22
 
30 23
 class InputObjectTypeTest extends \PHPUnit_Framework_TestCase
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                 'fields' => [
61 61
                     'empty' => [
62 62
                         'type'    => new StringType(),
63
-                        'resolve' => function () {
63
+                        'resolve' => function() {
64 64
                             return null;
65 65
                         }
66 66
                     ]
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
                             ]))
80 80
                         ],
81 81
                         'type'    => new BooleanType(),
82
-                        'resolve' => function ($object, $args) {
82
+                        'resolve' => function($object, $args) {
83 83
                             return true;
84 84
                         }
85 85
                     ]
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
                 'fields' => [
101 101
                     'empty' => [
102 102
                         'type'    => new StringType(),
103
-                        'resolve' => function () { }
103
+                        'resolve' => function() { }
104 104
                     ],
105 105
                 ]
106 106
             ]),
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                                 ]
123 123
                             ])
124 124
                         ],
125
-                        'resolve' => function () { return 'success message'; }
125
+                        'resolve' => function() { return 'success message'; }
126 126
                     ]
127 127
                 ]
128 128
             ])
Please login to merge, or discard this patch.
src/Type/ListType/AbstractListType.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         $isValid = is_null($value) || is_array($value) || (is_object($value) && in_array('IteratorAggregate', class_implements($value)));
36 36
         $itemType = $this->config->get('itemType');
37 37
         if ($isValid && $itemType->isInputType()) {
38
-            foreach($value as $item) {
38
+            foreach ($value as $item) {
39 39
                 $isValid = $itemType->isValidValue($item);
40 40
                 if (!$isValid) return false;
41 41
             }
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,9 @@
 block discarded – undo
37 37
         if ($isValid && $itemType->isInputType()) {
38 38
             foreach($value as $item) {
39 39
                 $isValid = $itemType->isValidValue($item);
40
-                if (!$isValid) return false;
40
+                if (!$isValid) {
41
+                    return false;
42
+                }
41 43
             }
42 44
         }
43 45
         return $isValid;
Please login to merge, or discard this patch.
src/Introspection/QueryType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         if ($value && $value->getKind() == TypeMap::KIND_ENUM) {
59 59
             $data = [];
60 60
             foreach ($value->getValues() as $enumValue) {
61
-                if(!$args['includeDeprecated'] && (isset($enumValue['isDeprecated']) && $enumValue['isDeprecated'])) {
61
+                if (!$args['includeDeprecated'] && (isset($enumValue['isDeprecated']) && $enumValue['isDeprecated'])) {
62 62
                     continue;
63 63
                 }
64 64
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         }
92 92
 
93 93
         /** @var AbstractObjectType $value */
94
-        return array_filter($value->getConfig()->getFields(), function ($field) use ($args) {
94
+        return array_filter($value->getConfig()->getFields(), function($field) use ($args) {
95 95
             /** @var $field Field */
96 96
             if (in_array($field->getName(), ['__type', '__schema']) || (!$args['includeDeprecated'] && $field->isDeprecated())) {
97 97
                 return false;
Please login to merge, or discard this patch.
Tests/Schema/ProcessorTest.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -95,14 +95,14 @@  discard block
 block discarded – undo
95 95
                 'fields' => [
96 96
                     'list' => [
97 97
                         'type'    => new ListType(new StringType()),
98
-                        'resolve' => function () {
98
+                        'resolve' => function() {
99 99
                             return null;
100 100
                         }
101 101
                     ]
102 102
                 ]
103 103
             ])
104 104
         ]));
105
-        $data      = $processor->processPayload(' { list }')->getResponseData();
105
+        $data = $processor->processPayload(' { list }')->getResponseData();
106 106
         $this->assertEquals(['data' => ['list' => null]], $data);
107 107
     }
108 108
 
@@ -115,20 +115,20 @@  discard block
 block discarded – undo
115 115
                 'fields' => [
116 116
                     'list' => [
117 117
                         'type'    => new ListType(new StringType()),
118
-                        'resolve' => function () {
118
+                        'resolve' => function() {
119 119
                             return null;
120 120
                         }
121 121
                     ]
122 122
                 ]
123 123
             ])
124 124
         ]));
125
-        $data      = $processor->processPayload(' { __schema { subscriptionType { name } } }')->getResponseData();
125
+        $data = $processor->processPayload(' { __schema { subscriptionType { name } } }')->getResponseData();
126 126
         $this->assertEquals(['data' => ['__schema' => ['subscriptionType' => null]]], $data);
127 127
     }
128 128
 
129 129
     public function testSchemaOperations()
130 130
     {
131
-        $schema    = new Schema([
131
+        $schema = new Schema([
132 132
             'query' => new ObjectType([
133 133
                 'name'   => 'RootQuery',
134 134
                 'fields' => [
@@ -141,13 +141,13 @@  discard block
 block discarded – undo
141 141
                                     'args'    => [
142 142
                                         'shorten' => new BooleanType()
143 143
                                     ],
144
-                                    'resolve' => function ($value, $args) {
144
+                                    'resolve' => function($value, $args) {
145 145
                                         return empty($args['shorten']) ? $value['firstName'] : $value['firstName'];
146 146
                                     }
147 147
                                 ],
148 148
                                 'id_alias'  => [
149 149
                                     'type'    => new IdType(),
150
-                                    'resolve' => function ($value) {
150
+                                    'resolve' => function($value) {
151 151
                                         return $value['id'];
152 152
                                     }
153 153
                                 ],
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
                                 'code'      => new StringType(),
156 156
                             ]
157 157
                         ]),
158
-                        'resolve' => function ($value, $args) {
158
+                        'resolve' => function($value, $args) {
159 159
                             $data = ['id' => '123', 'firstName' => 'John', 'code' => '007'];
160 160
                             if (!empty($args['upper'])) {
161 161
                                 foreach ($data as $key => $value) {
@@ -174,19 +174,19 @@  discard block
 block discarded – undo
174 174
                     ],
175 175
                     'randomUser'        => [
176 176
                         'type'    => new TestObjectType(),
177
-                        'resolve' => function () {
177
+                        'resolve' => function() {
178 178
                             return ['invalidField' => 'John'];
179 179
                         }
180 180
                     ],
181 181
                     'invalidValueQuery' => [
182 182
                         'type'    => new TestObjectType(),
183
-                        'resolve' => function () {
183
+                        'resolve' => function() {
184 184
                             return 'stringValue';
185 185
                         }
186 186
                     ],
187 187
                     'labels'            => [
188 188
                         'type'    => new ListType(new StringType()),
189
-                        'resolve' => function () {
189
+                        'resolve' => function() {
190 190
                             return ['one', 'two'];
191 191
                         }
192 192
                     ]
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
             ->addField(new Field([
218 218
                 'name'    => 'increaseCounter',
219 219
                 'type'    => new IntType(),
220
-                'resolve' => function ($value, $args, ResolveInfo $info) {
220
+                'resolve' => function($value, $args, ResolveInfo $info) {
221 221
                     return $this->_counter += $args['amount'];
222 222
                 },
223 223
                 'args'    => [
@@ -229,13 +229,13 @@  discard block
 block discarded – undo
229 229
             ]))->addField(new Field([
230 230
                 'name'    => 'invalidResolveTypeMutation',
231 231
                 'type'    => new NonNullType(new IntType()),
232
-                'resolve' => function () {
232
+                'resolve' => function() {
233 233
                     return null;
234 234
                 }
235 235
             ]))->addField(new Field([
236 236
                 'name'    => 'interfacedMutation',
237 237
                 'type'    => new TestInterfaceType(),
238
-                'resolve' => function () {
238
+                'resolve' => function() {
239 239
                     return ['name' => 'John'];
240 240
                 }
241 241
             ]));
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
                             ]))
297 297
                         ],
298 298
                         'type'    => new StringType(),
299
-                        'resolve' => function ($value, $args) {
299
+                        'resolve' => function($value, $args) {
300 300
                             return $args['argument1'];
301 301
                         }
302 302
                     ]
@@ -329,43 +329,43 @@  discard block
 block discarded – undo
329 329
                 'fields' => [
330 330
                     'listQuery'                 => [
331 331
                         'type'    => new ListType(new TestEnumType()),
332
-                        'resolve' => function () {
332
+                        'resolve' => function() {
333 333
                             return 'invalid list';
334 334
                         }
335 335
                     ],
336 336
                     'listEnumQuery'             => [
337 337
                         'type'    => new ListType(new TestEnumType()),
338
-                        'resolve' => function () {
338
+                        'resolve' => function() {
339 339
                             return ['invalid enum'];
340 340
                         }
341 341
                     ],
342 342
                     'invalidEnumQuery'          => [
343 343
                         'type'    => new TestEnumType(),
344
-                        'resolve' => function () {
344
+                        'resolve' => function() {
345 345
                             return 'invalid enum';
346 346
                         }
347 347
                     ],
348 348
                     'enumQuery'                 => [
349 349
                         'type'    => new TestEnumType(),
350
-                        'resolve' => function () {
350
+                        'resolve' => function() {
351 351
                             return 1;
352 352
                         }
353 353
                     ],
354 354
                     'invalidNonNullQuery'       => [
355 355
                         'type'    => new NonNullType(new IntType()),
356
-                        'resolve' => function () {
356
+                        'resolve' => function() {
357 357
                             return null;
358 358
                         }
359 359
                     ],
360 360
                     'invalidNonNullInsideQuery' => [
361 361
                         'type'    => new NonNullType(new IntType()),
362
-                        'resolve' => function () {
362
+                        'resolve' => function() {
363 363
                             return 'hello';
364 364
                         }
365 365
                     ],
366 366
                     'objectQuery'               => [
367 367
                         'type'    => new TestObjectType(),
368
-                        'resolve' => function () {
368
+                        'resolve' => function() {
369 369
                             return ['name' => 'John'];
370 370
                         }
371 371
                     ],
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
                                 'enum'   => new TestEnumType(),
378 378
                             ],
379 379
                         ]),
380
-                        'resolve' => function () {
380
+                        'resolve' => function() {
381 381
                             return [
382 382
                                 'object' => [
383 383
                                     'name' => 'John'
@@ -446,10 +446,10 @@  discard block
 block discarded – undo
446 446
             ]
447 447
         ]);
448 448
 
449
-        $union        = new UnionType([
449
+        $union = new UnionType([
450 450
             'name'        => 'TestUnion',
451 451
             'types'       => [$object1, $object2],
452
-            'resolveType' => function ($object) use ($object1, $object2) {
452
+            'resolveType' => function($object) use ($object1, $object2) {
453 453
                 if (isset($object['id'])) {
454 454
                     return $object1;
455 455
                 }
@@ -460,11 +460,11 @@  discard block
 block discarded – undo
460 460
         $invalidUnion = new UnionType([
461 461
             'name'        => 'TestUnion',
462 462
             'types'       => [$object1, $object2],
463
-            'resolveType' => function ($object) use ($object3) {
463
+            'resolveType' => function($object) use ($object3) {
464 464
                 return $object3;
465 465
             }
466 466
         ]);
467
-        $processor    = new Processor(new Schema([
467
+        $processor = new Processor(new Schema([
468 468
             'query' => new ObjectType([
469 469
                 'name'   => 'RootQuery',
470 470
                 'fields' => [
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
                             'type' => ['type' => 'string']
475 475
                         ],
476 476
                         'cost'    => 10,
477
-                        'resolve' => function ($value, $args) {
477
+                        'resolve' => function($value, $args) {
478 478
                             if ($args['type'] == 'object1') {
479 479
                                 return [
480 480
                                     'id' => 43
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
                     ],
489 489
                     'invalidUnion' => [
490 490
                         'type'    => $invalidUnion,
491
-                        'resolve' => function () {
491
+                        'resolve' => function() {
492 492
                             return ['name' => 'name resolved'];
493 493
                         }
494 494
                     ],
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 
534 534
     public function testComplexityReducer()
535 535
     {
536
-        $schema    = new Schema(
536
+        $schema = new Schema(
537 537
             [
538 538
                 'query' => new ObjectType(
539 539
                     [
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
                                                 'args'    => [
550 550
                                                     'shorten' => new BooleanType()
551 551
                                                 ],
552
-                                                'resolve' => function ($value, $args) {
552
+                                                'resolve' => function($value, $args) {
553 553
                                                     return empty($args['shorten']) ? $value : $value;
554 554
                                                 }
555 555
                                             ],
@@ -558,19 +558,19 @@  discard block
 block discarded – undo
558 558
                                             'likes'     => [
559 559
                                                 'type'    => new IntType(),
560 560
                                                 'cost'    => 10,
561
-                                                'resolve' => function () {
561
+                                                'resolve' => function() {
562 562
                                                     return 42;
563 563
                                                 }
564 564
                                             ]
565 565
                                         ]
566 566
                                     ]
567 567
                                 ),
568
-                                'cost'    => function ($args, $context, $childCost) {
568
+                                'cost'    => function($args, $context, $childCost) {
569 569
                                     $argsCost = isset($args['cost']) ? $args['cost'] : 1;
570 570
 
571 571
                                     return 1 + $argsCost * $childCost;
572 572
                                 },
573
-                                'resolve' => function ($value, $args) {
573
+                                'resolve' => function($value, $args) {
574 574
                                     $data = ['firstName' => 'John', 'code' => '007'];
575 575
 
576 576
                                     return $data;
Please login to merge, or discard this patch.