Completed
Push — master ( 18f94d...1f865b )
by Alexandr
31:52 queued 28:12
created
src/Parser/Parser.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 
236 236
     protected function findVariable($name)
237 237
     {
238
-        foreach ((array) $this->data['variables'] as $variable) {
238
+        foreach ((array)$this->data['variables'] as $variable) {
239 239
             /** @var $variable Variable */
240 240
             if ($variable->getName() === $name) {
241 241
                 return $variable;
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 
479 479
     protected function matchMulti($types)
480 480
     {
481
-        foreach ((array) $types as $type) {
481
+        foreach ((array)$types as $type) {
482 482
             if ($this->peek()->getType() === $type) {
483 483
                 return true;
484 484
             }
Please login to merge, or discard this patch.
Tests/Schema/ResolveInfoTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 {
22 22
     public function testMethods()
23 23
     {
24
-        $fieldAst         = new FieldAST('name', null, [], [], new Location(1,1));
24
+        $fieldAst         = new FieldAST('name', null, [], [], new Location(1, 1));
25 25
         $field            = new Field(['name' => 'id', 'type' => new IntType()]);
26 26
         $returnType       = new IntType();
27 27
         $executionContext = new ExecutionContext(new TestSchema());
Please login to merge, or discard this patch.
Tests/Library/Validator/RequestValidatorTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                             new Argument('test2', new VariableReference('test2', $variable2, new Location(1, 1)), new Location(1, 1)),
113 113
                         ], [
114 114
                             new Field('test', null, [], [], new Location(1, 1))
115
-                        ], [], new Location(1,1))
115
+                        ], [], new Location(1, 1))
116 116
                     ],
117 117
                     'variables'          => [
118 118
                         $variable1,
Please login to merge, or discard this patch.
Tests/Parser/AstTest.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
     public function testArgument()
27 27
     {
28
-        $argument = new Argument('test', new Literal('test', new Location(1,1)), new Location(1,1));
28
+        $argument = new Argument('test', new Literal('test', new Location(1, 1)), new Location(1, 1));
29 29
 
30 30
         $this->assertNotNull($argument->getValue());
31 31
         $this->assertEquals($argument->getName(), 'test');
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 
40 40
     public function testField()
41 41
     {
42
-        $field = new Field('field', null, [], [], new Location(1,1));
42
+        $field = new Field('field', null, [], [], new Location(1, 1));
43 43
 
44 44
         $this->assertEquals($field->getName(), 'field');
45 45
         $this->assertEmpty($field->getArguments());
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
         $this->assertEquals($field->getAlias(), 'alias');
51 51
         $this->assertEquals($field->getName(), 'alias');
52 52
 
53
-        $field->addArgument(new Argument('argument', new Literal('argument value', new Location(1,1)), new Location(1,1)));
53
+        $field->addArgument(new Argument('argument', new Literal('argument value', new Location(1, 1)), new Location(1, 1)));
54 54
         $this->assertTrue($field->hasArguments());
55 55
         $this->assertEquals(['argument' => 'argument value'], $field->getKeyValueArguments());
56 56
     }
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
     public function testFragment()
59 59
     {
60 60
         $fields = [
61
-            new Field('field', null, [], [], new Location(1,1))
61
+            new Field('field', null, [], [], new Location(1, 1))
62 62
         ];
63 63
 
64
-        $fragment = new Fragment('shipInfo', 'Ship', [], $fields, new Location(1,1));
64
+        $fragment = new Fragment('shipInfo', 'Ship', [], $fields, new Location(1, 1));
65 65
 
66 66
         $this->assertEquals('shipInfo', $fragment->getName());
67 67
         $this->assertEquals('Ship', $fragment->getModel());
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         $this->assertEquals('Boat', $fragment->getModel());
75 75
 
76 76
         $newField = [
77
-            new Field('id', null, [], [], new Location(1,1))
77
+            new Field('id', null, [], [], new Location(1, 1))
78 78
         ];
79 79
         $fragment->setFields($newField);
80 80
         $this->assertEquals($newField, $fragment->getFields());
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
     public function testFragmentReference()
88 88
     {
89
-        $reference = new FragmentReference('shipInfo', new Location(1,1));
89
+        $reference = new FragmentReference('shipInfo', new Location(1, 1));
90 90
 
91 91
         $this->assertEquals('shipInfo', $reference->getName());
92 92
 
@@ -97,10 +97,10 @@  discard block
 block discarded – undo
97 97
     public function testTypedFragmentReference()
98 98
     {
99 99
         $fields = [
100
-            new Field('id', null, [], [], new Location(1,1))
100
+            new Field('id', null, [], [], new Location(1, 1))
101 101
         ];
102 102
 
103
-        $reference = new TypedFragmentReference('Ship', $fields, [], new Location(1,1));
103
+        $reference = new TypedFragmentReference('Ship', $fields, [], new Location(1, 1));
104 104
 
105 105
         $this->assertEquals('Ship', $reference->getTypeName());
106 106
         $this->assertEquals($fields, $reference->getFields());
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
109 109
         $this->assertEquals('BigBoat', $reference->getTypeName());
110 110
 
111 111
         $newFields = [
112
-            new Field('name', null, [], [], new Location(1,1)),
113
-            new Field('id', null, [], [], new Location(1,1))
112
+            new Field('name', null, [], [], new Location(1, 1)),
113
+            new Field('id', null, [], [], new Location(1, 1))
114 114
         ];
115 115
 
116 116
         $reference->setFields($newFields);
@@ -120,14 +120,14 @@  discard block
 block discarded – undo
120 120
     public function testQuery()
121 121
     {
122 122
         $arguments = [
123
-            new Argument('limit', new Literal('10', new Location(1,1)), new Location(1,1))
123
+            new Argument('limit', new Literal('10', new Location(1, 1)), new Location(1, 1))
124 124
         ];
125 125
 
126 126
         $fields = [
127
-            new Field('id', null, [], [], new Location(1,1))
127
+            new Field('id', null, [], [], new Location(1, 1))
128 128
         ];
129 129
 
130
-        $query = new Query('ships', 'lastShips', $arguments, $fields,[], new Location(1,1));
130
+        $query = new Query('ships', 'lastShips', $arguments, $fields, [], new Location(1, 1));
131 131
 
132 132
         $this->assertEquals('ships', $query->getName());
133 133
         $this->assertEquals('lastShips', $query->getAlias());
@@ -147,23 +147,23 @@  discard block
 block discarded – undo
147 147
         $this->assertFalse($query->hasArguments());
148 148
         $this->assertFalse($query->hasFields());
149 149
 
150
-        $query->addArgument(new Argument('offset', new Literal(10, new Location(1,1)), new Location(1,1)));
150
+        $query->addArgument(new Argument('offset', new Literal(10, new Location(1, 1)), new Location(1, 1)));
151 151
         $this->assertTrue($query->hasArguments());
152 152
     }
153 153
 
154 154
     public function testArgumentValues()
155 155
     {
156
-        $list = new InputList(['a', 'b'], new Location(1,1));
156
+        $list = new InputList(['a', 'b'], new Location(1, 1));
157 157
         $this->assertEquals(['a', 'b'], $list->getValue());
158 158
         $list->setValue(['a']);
159 159
         $this->assertEquals(['a'], $list->getValue());
160 160
 
161
-        $inputObject = new InputObject(['a', 'b'], new Location(1,1));
161
+        $inputObject = new InputObject(['a', 'b'], new Location(1, 1));
162 162
         $this->assertEquals(['a', 'b'], $inputObject->getValue());
163 163
         $inputObject->setValue(['a']);
164 164
         $this->assertEquals(['a'], $inputObject->getValue());
165 165
 
166
-        $literal = new Literal('text', new Location(1,1));
166
+        $literal = new Literal('text', new Location(1, 1));
167 167
         $this->assertEquals('text', $literal->getValue());
168 168
         $literal->setValue('new text');
169 169
         $this->assertEquals('new text', $literal->getValue());
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
     public function testVariable()
173 173
     {
174
-        $variable = new Variable('id', 'int', false, false, true, new Location(1,1));
174
+        $variable = new Variable('id', 'int', false, false, true, new Location(1, 1));
175 175
 
176 176
         $this->assertEquals('id', $variable->getName());
177 177
         $this->assertEquals('int', $variable->getTypeName());
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
         $this->assertTrue($variable->isNullable());
191 191
         $this->assertTrue($variable->isArray());
192 192
 
193
-        $variable->setValue(new Literal('text', new Location(1,1)));
194
-        $this->assertEquals(new Literal('text', new Location(1,1)), $variable->getValue());
193
+        $variable->setValue(new Literal('text', new Location(1, 1)));
194
+        $this->assertEquals(new Literal('text', new Location(1, 1)), $variable->getValue());
195 195
     }
196 196
 
197 197
     /**
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      */
200 200
     public function testVariableLogicException()
201 201
     {
202
-        $variable = new Variable('id', 'int', false, false, true, new Location(1,1));
202
+        $variable = new Variable('id', 'int', false, false, true, new Location(1, 1));
203 203
         $variable->getValue();
204 204
     }
205 205
 }
Please login to merge, or discard this patch.
Tests/Parser/RequestTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 
19 19
     public function testMethods()
20 20
     {
21
-        $fragment1     = new Fragment('fragmentName1', 'test', [], [], new Location(1,1));
22
-        $fragment2     = new Fragment('fragmentName2', 'test', [], [], new Location(1,1));
21
+        $fragment1     = new Fragment('fragmentName1', 'test', [], [], new Location(1, 1));
22
+        $fragment2     = new Fragment('fragmentName2', 'test', [], [], new Location(1, 1));
23 23
         $queriesData   = ['query1', 'query2'];
24 24
         $mutationsData = ['mutation1', 'mutation2'];
25 25
         $fragmentsData = [$fragment1];
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public function testSetVariableParseJson()
55 55
     {
56 56
         $variables = '{"foo": "bar"}';
57
-        $expectedVariableArray = [ 'foo' => 'bar' ];
57
+        $expectedVariableArray = ['foo' => 'bar'];
58 58
 
59 59
         $request = new Request([], $variables);
60 60
         $this->assertEquals($expectedVariableArray, $request->getVariables());
Please login to merge, or discard this patch.
Tests/Parser/VariableTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
      */
15 15
     public function testGetValue($actual, $expected)
16 16
     {
17
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
17
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
18 18
         $var->setValue($actual);
19 19
         $this->assertEquals($var->getValue(), $expected);
20 20
     }
@@ -25,13 +25,13 @@  discard block
 block discarded – undo
25 25
      */
26 26
     public function testGetNullValueException()
27 27
     {
28
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
28
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
29 29
         $var->getValue();
30 30
     }
31 31
 
32 32
     public function testGetValueReturnsDefaultValueIfNoValueSet()
33 33
     {
34
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
34
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
35 35
         $var->setDefaultValue('default-value');
36 36
 
37 37
         $this->assertEquals(
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 
43 43
     public function testGetValueReturnsSetValueEvenWithDefaultValue()
44 44
     {
45
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
45
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
46 46
         $var->setValue('real-value');
47 47
         $var->setDefaultValue('default-value');
48 48
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
     public function testIndicatesDefaultValuePresent()
56 56
     {
57
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
57
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
58 58
         $var->setDefaultValue('default-value');
59 59
 
60 60
         $this->assertTrue(
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
     public function testHasNoDefaultValue()
66 66
     {
67
-        $var = new Variable('foo', 'bar', false, false, true, new Location(1,1));
67
+        $var = new Variable('foo', 'bar', false, false, true, new Location(1, 1));
68 68
 
69 69
         $this->assertFalse(
70 70
             $var->hasDefaultValue()
Please login to merge, or discard this patch.
src/Validator/ResolveValidator/ResolveValidator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
         }
47 47
         
48 48
         if (!(TypeService::isObjectType($objectType) || TypeService::isInputObjectType($objectType)) || !$objectType->hasField($ast->getName())) {
49
-            $availableFieldNames = implode(', ', array_map(function (FieldInterface $field) {
49
+            $availableFieldNames = implode(', ', array_map(function(FieldInterface $field) {
50 50
                 return sprintf('"%s"', $field->getName());
51 51
             }, $objectType->getFields()));
52 52
             throw new ResolveException(sprintf('Field "%s" not found in type "%s". Available fields are: %s', $ast->getName(), $objectType->getNamedType()->getName(), $availableFieldNames), $ast->getLocation());
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     public function assertValidArguments(FieldInterface $field, AstFieldInterface $query, Request $request)
57 57
     {
58
-        $requiredArguments = array_filter($field->getArguments(), function (InputField $argument) {
58
+        $requiredArguments = array_filter($field->getArguments(), function(InputField $argument) {
59 59
             return $argument->getType()->getKind() === TypeMap::KIND_NON_NULL;
60 60
         });
61 61
 
Please login to merge, or discard this patch.
src/Schema/AbstractSchema.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
             $config['mutation'] = new InternalSchemaMutationObject(['name' => $this->getName($config) . 'Mutation']);
31 31
         }
32 32
         if (!array_key_exists('types', $config)) {
33
-          $config['types'] = [];
33
+            $config['types'] = [];
34 34
         }
35 35
 
36 36
         $this->config = new SchemaConfig($config, $this);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
     public function __construct($config = [])
25 25
     {
26 26
         if (!array_key_exists('query', $config)) {
27
-            $config['query'] = new InternalSchemaQueryObject(['name' => $this->getName($config) . 'Query']);
27
+            $config['query'] = new InternalSchemaQueryObject(['name' => $this->getName($config).'Query']);
28 28
         }
29 29
         if (!array_key_exists('mutation', $config)) {
30
-            $config['mutation'] = new InternalSchemaMutationObject(['name' => $this->getName($config) . 'Mutation']);
30
+            $config['mutation'] = new InternalSchemaMutationObject(['name' => $this->getName($config).'Mutation']);
31 31
         }
32 32
         if (!array_key_exists('types', $config)) {
33 33
           $config['types'] = [];
@@ -80,6 +80,6 @@  discard block
 block discarded – undo
80 80
     {
81 81
         $defaultName = 'RootSchema';
82 82
 
83
-        return isset($config["name"])? $config["name"] : $defaultName;
83
+        return isset($config["name"]) ? $config["name"] : $defaultName;
84 84
     }
85 85
 }
Please login to merge, or discard this patch.
src/Execution/Processor.php 3 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -149,6 +149,9 @@  discard block
 block discarded – undo
149 149
         return [$this->getAlias($query) => $value];
150 150
     }
151 151
 
152
+    /**
153
+     * @return AstFieldInterface
154
+     */
152 155
     protected function resolveField(FieldInterface $field, AstFieldInterface $ast, $parentValue = null, $fromObject = false)
153 156
     {
154 157
         try {
@@ -220,6 +223,9 @@  discard block
 block discarded – undo
220 223
         }
221 224
     }
222 225
 
226
+    /**
227
+     * @param \Youshido\GraphQL\Parser\Ast\Interfaces\ValueInterface $argumentValue
228
+     */
223 229
     private function prepareArgumentValue($argumentValue, AbstractType $argumentType, Request $request)
224 230
     {
225 231
         switch ($argumentType->getKind()) {
Please login to merge, or discard this patch.
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -97,21 +97,21 @@  discard block
 block discarded – undo
97 97
 
98 98
             // If the processor found any deferred results, resolve them now.
99 99
             if (!empty($this->data) && (!empty($this->deferredResultsLeaf) || !empty($this->deferredResultsComplex))) {
100
-              try {
101
-                  while ($deferredResolver = array_shift($this->deferredResultsComplex)) {
102
-                      $deferredResolver->resolve();
103
-                  }
104
-
105
-                  // Deferred scalar and enum fields should be resolved last to
106
-                  // pick up as many as possible for a single batch.
107
-                  while ($deferredResolver = array_shift($this->deferredResultsLeaf)) {
108
-                      $deferredResolver->resolve();
109
-                  }
110
-              } catch (\Exception $e) {
111
-                  $this->executionContext->addError($e);
112
-              } finally {
113
-                  $this->data = static::unpackDeferredResults($this->data);
114
-              }
100
+                try {
101
+                    while ($deferredResolver = array_shift($this->deferredResultsComplex)) {
102
+                        $deferredResolver->resolve();
103
+                    }
104
+
105
+                    // Deferred scalar and enum fields should be resolved last to
106
+                    // pick up as many as possible for a single batch.
107
+                    while ($deferredResolver = array_shift($this->deferredResultsLeaf)) {
108
+                        $deferredResolver->resolve();
109
+                    }
110
+                } catch (\Exception $e) {
111
+                    $this->executionContext->addError($e);
112
+                } finally {
113
+                    $this->data = static::unpackDeferredResults($this->data);
114
+                }
115 115
             }
116 116
 
117 117
         } catch (\Exception $e) {
@@ -445,9 +445,9 @@  discard block
 block discarded – undo
445 445
             }
446 446
 
447 447
             $fakeField = new Field([
448
-              'name' => $field->getName(),
449
-              'type' => $itemType,
450
-              'args' => $field->getArguments(),
448
+                'name' => $field->getName(),
449
+                'type' => $itemType,
450
+                'args' => $field->getArguments(),
451 451
             ]);
452 452
 
453 453
             $result = [];
@@ -547,9 +547,9 @@  discard block
 block discarded – undo
547 547
             }
548 548
 
549 549
             $fakeField = new Field([
550
-              'name' => $field->getName(),
551
-              'type' => $resolvedType,
552
-              'args' => $field->getArguments(),
550
+                'name' => $field->getName(),
551
+                'type' => $resolvedType,
552
+                'args' => $field->getArguments(),
553 553
             ]);
554 554
 
555 555
             return $this->resolveObject($fakeField, $ast, $resolvedValue, true);
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
      */
394 394
     protected function deferredResolve($resolvedValue, FieldInterface $field, callable $callback) {
395 395
         if ($resolvedValue instanceof DeferredResolverInterface) {
396
-            $deferredResult = new DeferredResult($resolvedValue, function ($resolvedValue) use ($field, $callback) {
396
+            $deferredResult = new DeferredResult($resolvedValue, function($resolvedValue) use ($field, $callback) {
397 397
                 // Allow nested deferred resolvers.
398 398
                 return $this->deferredResolve($resolvedValue, $field, $callback);
399 399
             });
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
         /** @var AstQuery $ast */
432 432
         $resolvedValue = $this->doResolve($field, $ast, $parentValue);
433 433
 
434
-        return $this->deferredResolve($resolvedValue, $field, function ($resolvedValue) use ($field, $ast, $parentValue) {
434
+        return $this->deferredResolve($resolvedValue, $field, function($resolvedValue) use ($field, $ast, $parentValue) {
435 435
             $this->resolveValidator->assertValidResolvedValueForField($field, $resolvedValue);
436 436
 
437 437
             if (null === $resolvedValue) {
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
             $result = [];
457 457
             foreach ($resolvedValue as $resolvedValueItem) {
458 458
                 try {
459
-                    $fakeField->getConfig()->set('resolve', function () use ($resolvedValueItem) {
459
+                    $fakeField->getConfig()->set('resolve', function() use ($resolvedValueItem) {
460 460
                         return $resolvedValueItem;
461 461
                     });
462 462
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
             $resolvedValue = $this->doResolve($field, $ast, $parentValue);
503 503
         }
504 504
 
505
-        return $this->deferredResolve($resolvedValue, $field, function ($resolvedValue) use ($field, $ast, $parentValue) {
505
+        return $this->deferredResolve($resolvedValue, $field, function($resolvedValue) use ($field, $ast, $parentValue) {
506 506
             $this->resolveValidator->assertValidResolvedValueForField($field, $resolvedValue);
507 507
 
508 508
             if (null === $resolvedValue) {
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
     {
524 524
         /** @var AstQuery $ast */
525 525
         $resolvedValue = $this->doResolve($field, $ast, $parentValue);
526
-        return $this->deferredResolve($resolvedValue, $field, function ($resolvedValue) use ($field, $ast, $parentValue) {
526
+        return $this->deferredResolve($resolvedValue, $field, function($resolvedValue) use ($field, $ast, $parentValue) {
527 527
             $this->resolveValidator->assertValidResolvedValueForField($field, $resolvedValue);
528 528
 
529 529
             if (null === $resolvedValue) {
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
             }
532 532
 
533 533
             /** @var AbstractUnionType $type */
534
-            $type         = $field->getType()->getNullableType();
534
+            $type = $field->getType()->getNullableType();
535 535
             $resolveInfo = new ResolveInfo(
536 536
                 $field,
537 537
                 $ast instanceof AstQuery ? $ast->getFields() : [],
Please login to merge, or discard this patch.