@@ -18,8 +18,8 @@ discard block |
||
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 |
||
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()); |
@@ -25,7 +25,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
171 | 171 | |
172 | 172 | public function testVariable() |
173 | 173 | { |
174 | - $variable = new Variable('id', 'int', false, false, new Location(1,1)); |
|
174 | + $variable = new Variable('id', 'int', false, false, 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 |
||
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 |
||
199 | 199 | */ |
200 | 200 | public function testVariableLogicException() |
201 | 201 | { |
202 | - $variable = new Variable('id', 'int', false, false, new Location(1,1)); |
|
202 | + $variable = new Variable('id', 'int', false, false, new Location(1, 1)); |
|
203 | 203 | $variable->getValue(); |
204 | 204 | } |
205 | 205 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public function testGetValue($actual, $expected) |
16 | 16 | { |
17 | - $var = new Variable('foo', 'bar', false, false, new Location(1,1)); |
|
17 | + $var = new Variable('foo', 'bar', false, false, new Location(1, 1)); |
|
18 | 18 | $var->setValue($actual); |
19 | 19 | $this->assertEquals($var->getValue(), $expected); |
20 | 20 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | */ |
26 | 26 | public function testGetNullValueException() |
27 | 27 | { |
28 | - $var = new Variable('foo', 'bar', false, false, new Location(1,1)); |
|
28 | + $var = new Variable('foo', 'bar', false, false, new Location(1, 1)); |
|
29 | 29 | $var->getValue(); |
30 | 30 | } |
31 | 31 |
@@ -111,7 +111,7 @@ |
||
111 | 111 | new Argument('test2', new VariableReference('test2', $variable2, new Location(1, 1)), new Location(1, 1)), |
112 | 112 | ], [ |
113 | 113 | new Field('test', null, [], new Location(1, 1)) |
114 | - ], new Location(1,1)) |
|
114 | + ], new Location(1, 1)) |
|
115 | 115 | ], |
116 | 116 | 'variables' => [ |
117 | 117 | $variable1, |
@@ -2,14 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Youshido\Tests\Schema; |
4 | 4 | |
5 | -use Youshido\GraphQL\Config\Object\InterfaceTypeConfig; |
|
6 | -use Youshido\GraphQL\Config\Object\ObjectTypeConfig; |
|
7 | 5 | use Youshido\GraphQL\Execution\Processor; |
8 | 6 | use Youshido\GraphQL\Schema\Schema; |
9 | 7 | use Youshido\GraphQL\Type\InterfaceType\AbstractInterfaceType; |
10 | -use Youshido\GraphQL\Type\InterfaceType\InterfaceType; |
|
11 | 8 | use Youshido\GraphQL\Type\ListType\ListType; |
12 | -use Youshido\GraphQL\Type\NonNullType; |
|
13 | 9 | use Youshido\GraphQL\Type\Object\AbstractObjectType; |
14 | 10 | use Youshido\GraphQL\Type\Object\ObjectType; |
15 | 11 | use Youshido\GraphQL\Type\Scalar\IdType; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | 'fields' => [ |
104 | 104 | 'user' => [ |
105 | 105 | 'type' => new UserType(), |
106 | - 'resolve' => function ($args) { |
|
106 | + 'resolve' => function($args) { |
|
107 | 107 | return [ |
108 | 108 | 'id' => 'user-id-1', |
109 | 109 | 'fullName' => 'Alex', |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | 'fields' => [ |
218 | 218 | 'user' => [ |
219 | 219 | 'type' => new UserType(), |
220 | - 'resolve' => function ($args) { |
|
220 | + 'resolve' => function($args) { |
|
221 | 221 | return [ |
222 | 222 | 'id' => 'user-id-1', |
223 | 223 | 'fullName' => 'Alex', |
@@ -48,13 +48,13 @@ discard block |
||
48 | 48 | 'fields' => [ |
49 | 49 | 'nonNullScalar' => [ |
50 | 50 | 'type' => new NonNullType(new IntType()), |
51 | - 'resolve' => function () { |
|
51 | + 'resolve' => function() { |
|
52 | 52 | return null; |
53 | 53 | }, |
54 | 54 | ], |
55 | 55 | 'nonNullList' => [ |
56 | 56 | 'type' => new NonNullType(new ListType(new IntType())), |
57 | - 'resolve' => function () { |
|
57 | + 'resolve' => function() { |
|
58 | 58 | return null; |
59 | 59 | } |
60 | 60 | ], |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | 'name' => new StringType(), |
67 | 67 | ] |
68 | 68 | ])), |
69 | - 'resolve' => function () { |
|
69 | + 'resolve' => function() { |
|
70 | 70 | return [ |
71 | 71 | 'id' => new uid('6cfb044c-9c0a-4ddd-9ef8-a0b940818db3'), |
72 | 72 | 'name' => 'Alex' |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | ], |
76 | 76 | 'nonNullListOfNpnNull' => [ |
77 | 77 | 'type' => new NonNullType(new ListType(new NonNullType(new IntType()))), |
78 | - 'resolve' => function () { |
|
78 | + 'resolve' => function() { |
|
79 | 79 | return [1, null]; |
80 | 80 | } |
81 | 81 | ], |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | 'ids' => new NonNullType(new ListType(new IntType())) |
85 | 85 | ], |
86 | 86 | 'type' => new IntType(), |
87 | - 'resolve' => function () { |
|
87 | + 'resolve' => function() { |
|
88 | 88 | return 1; |
89 | 89 | } |
90 | 90 | ], |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | 'ids' => new NonNullType(new ListType(new NonNullType(new IntType()))) |
94 | 94 | ], |
95 | 95 | 'type' => new IntType(), |
96 | - 'resolve' => function () { |
|
96 | + 'resolve' => function() { |
|
97 | 97 | return 1; |
98 | 98 | } |
99 | 99 | ], |
@@ -23,6 +23,9 @@ discard block |
||
23 | 23 | */ |
24 | 24 | private $typesList; |
25 | 25 | |
26 | + /** |
|
27 | + * @param \Youshido\GraphQL\Schema\AbstractSchema $contextObject |
|
28 | + */ |
|
26 | 29 | public function __construct(array $configData, $contextObject = null, $finalClass = false) |
27 | 30 | { |
28 | 31 | $this->typesList = new SchemaTypesList(); |
@@ -78,7 +81,7 @@ discard block |
||
78 | 81 | } |
79 | 82 | |
80 | 83 | /** |
81 | - * @param $query AbstractObjectType |
|
84 | + * @param ObjectType $query AbstractObjectType |
|
82 | 85 | * |
83 | 86 | * @return SchemaConfig |
84 | 87 | */ |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | protected $isFinal = false; |
28 | 28 | |
29 | - private $nameCache = null; |
|
29 | + private $nameCache = null; |
|
30 | 30 | |
31 | 31 | public function __construct(array $config = []) |
32 | 32 | { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $config['type'] = $this->getType(); |
35 | 35 | $config['name'] = $this->getName(); |
36 | 36 | if (empty($config['name'])) { |
37 | - $config['name'] =$this->getAutoName(); |
|
37 | + $config['name'] = $this->getAutoName(); |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 |
@@ -48,7 +48,9 @@ |
||
48 | 48 | */ |
49 | 49 | public function isValidValue($value) |
50 | 50 | { |
51 | - if (is_null($value)) return true; |
|
51 | + if (is_null($value)) { |
|
52 | + return true; |
|
53 | + } |
|
52 | 54 | foreach ($this->getConfig()->get('values') as $item) { |
53 | 55 | if ($value === $item['name'] || $value === $item['value']) { |
54 | 56 | return true; |