Skip to content

Commit 82d9f1f

Browse files
simPodsimPod
authored
feat: bump to gql-php v15 (#108)
1 parent 644e0bb commit 82d9f1f

20 files changed

+336
-158
lines changed

‎README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,13 @@ $searchResultType = new UnionType([
257257
use SimPod\GraphQLUtils\Builder\UnionBuilder;
258258

259259
$character = new UnionType(
260-
UnionBuilder::create('SearchResult')
261-
->setTypes([
260+
UnionBuilder::create(
261+
'SearchResult',
262+
[
262263
MyTypes::story(),
263264
MyTypes::user()
264-
])
265+
]
266+
)
265267
->setResolveType(
266268
static function($value) {
267269
if ($value->type === 'story') {

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"require": {
2121
"php": "^8.1",
2222
"thecodingmachine/safe": "^2",
23-
"webonyx/graphql-php": "^14.11.1"
23+
"webonyx/graphql-php": "^15.0"
2424
},
2525
"require-dev": {
2626
"doctrine/coding-standard": "^9.0",

‎psalm-baseline.xml‎

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,56 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.19.0@a2ad69ae4f5ab1f7d225a8dc4e2ec2d9415ed599">
2+
<files psalm-version="4.30.0@d0bc6e25d89f649e4f36a534f330f8bb4643dd69">
3+
<file src="src/Builder/EnumBuilder.php">
4+
<InvalidDocblock occurrences="1">
5+
<code>private array $values = [];</code>
6+
</InvalidDocblock>
7+
</file>
38
<file src="src/Builder/FieldBuilder.php">
4-
<MixedAssignment occurrences="1">
5-
<code>$value['defaultValue']</code>
6-
</MixedAssignment>
9+
<InvalidDocblock occurrences="1">
10+
<code>private array|null $args = null;</code>
11+
</InvalidDocblock>
12+
<InvalidReturnStatement occurrences="1"/>
13+
<InvalidReturnType occurrences="1">
14+
<code>FieldDefinitionConfig</code>
15+
</InvalidReturnType>
16+
<InvalidTypeImport occurrences="3">
17+
<code>FieldDefinitionConfig from FieldDefinition</code>
18+
<code>FieldResolver from Executor</code>
19+
<code>FieldType from FieldDefinition</code>
20+
</InvalidTypeImport>
21+
</file>
22+
<file src="src/Builder/InputFieldBuilder.php">
23+
<InvalidTypeImport occurrences="1">
24+
<code>FieldResolver from Executor</code>
25+
</InvalidTypeImport>
26+
</file>
27+
<file src="src/Builder/InterfaceBuilder.php">
28+
<LessSpecificReturnStatement occurrences="1"/>
29+
<MoreSpecificReturnType occurrences="1">
30+
<code>InterfaceConfig</code>
31+
</MoreSpecificReturnType>
32+
</file>
33+
<file src="src/Builder/ObjectBuilder.php">
34+
<InvalidReturnStatement occurrences="1"/>
35+
<InvalidReturnType occurrences="1">
36+
<code>ObjectConfig</code>
37+
</InvalidReturnType>
38+
<InvalidTypeImport occurrences="1">
39+
<code>FieldDefinitionConfig from FieldDefinition</code>
40+
</InvalidTypeImport>
41+
</file>
42+
<file src="src/Error/FormattedError.php">
43+
<InvalidArrayAssignment occurrences="1">
44+
<code>$arrayError['extensions']</code>
45+
</InvalidArrayAssignment>
46+
<InvalidReturnStatement occurrences="1">
47+
<code>$arrayError</code>
48+
</InvalidReturnStatement>
49+
<InvalidReturnType occurrences="1">
50+
<code>array</code>
51+
</InvalidReturnType>
52+
<MixedArrayAssignment occurrences="1">
53+
<code>$arrayError['extensions']['type']</code>
54+
</MixedArrayAssignment>
755
</file>
856
</files>

‎src/Builder/EnumBuilder.php‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,33 @@
44

55
namespace SimPod\GraphQLUtils\Builder;
66

7+
use GraphQL\Type\Definition\EnumType;
78
use SimPod\GraphQLUtils\Exception\InvalidArgument;
89

910
use function Safe\preg_match;
1011

12+
/**
13+
* @see EnumType
14+
*
15+
* @psalm-import-type EnumValues from EnumType
16+
* @psalm-import-type EnumTypeConfig from EnumType
17+
*/
1118
class EnumBuilder extends TypeBuilder
1219
{
13-
/** @var mixed[][] */
20+
private string|null $name;
21+
22+
/**
23+
* TODO @var (EnumValues&array)|callable(): EnumValues&array
24+
*
25+
* @var EnumValues&array
26+
*/
1427
private array $values = [];
1528

29+
final private function __construct(?string $name)
30+
{
31+
$this->name = $name;
32+
}
33+
1634
/**
1735
* @return static
1836
*/
@@ -49,11 +67,15 @@ public function addValue(
4967
return $this;
5068
}
5169

70+
/**
71+
* @psalm-return EnumTypeConfig
72+
*/
5273
public function build(): array
5374
{
54-
$parameters = parent::build();
55-
$parameters['values'] = $this->values;
56-
57-
return $parameters;
75+
return [
76+
'name' => $this->name,
77+
'description' => $this->description,
78+
'values' => $this->values,
79+
];
5880
}
5981
}

‎src/Builder/FieldBuilder.php‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,53 @@
44

55
namespace SimPod\GraphQLUtils\Builder;
66

7-
use GraphQL\Type\Definition\ResolveInfo;
8-
use GraphQL\Type\Definition\Type;
9-
7+
use GraphQL\Executor\Executor;
8+
use GraphQL\Type\Definition\Argument;
9+
use GraphQL\Type\Definition\FieldDefinition;
10+
11+
/**
12+
* @see Executor
13+
* @see FieldDefinition
14+
* @see Argument
15+
*
16+
* @psalm-import-type FieldResolver from Executor
17+
* @psalm-import-type FieldDefinitionConfig from FieldDefinition
18+
* @psalm-import-type FieldType from FieldDefinition
19+
* @psalm-import-type ArgumentListConfig from Argument
20+
* @psalm-import-type ArgumentType from Argument
21+
*/
1022
class FieldBuilder
1123
{
1224
private string $name;
1325

14-
private Type $type;
26+
/** @psalm-var FieldType */
27+
private mixed $type;
1528

1629
private string|null $description = null;
1730

1831
private string|null $deprecationReason = null;
1932

20-
/** @psalm-var callable(mixed, array<mixed>, mixed, ResolveInfo) : mixed|null */
33+
/** @psalm-var FieldResolver|null */
2134
private $resolve;
2235

23-
/** @psalm-var array<string, array<string, mixed>>|null */
36+
/** @psalm-var (ArgumentListConfig&array)|null */
2437
private array|null $args = null;
2538

26-
final private function __construct(string $name, Type $type)
39+
/**
40+
* @psalm-param FieldType $type
41+
*/
42+
final private function __construct(string $name, $type)
2743
{
2844
$this->name = $name;
2945
$this->type = $type;
3046
}
3147

3248
/**
49+
* @psalm-param FieldType $type
50+
*
3351
* @return static
3452
*/
35-
public static function create(string $name, Type $type): self
53+
public static function create(string $name, $type): self
3654
{
3755
return new static($name, $type);
3856
}
@@ -48,9 +66,11 @@ public function setDescription(string $description): self
4866
}
4967

5068
/**
69+
* @psalm-param ArgumentType $type
70+
*
5171
* @return $this
5272
*/
53-
public function addArgument(string $name, Type $type, ?string $description = null, mixed $defaultValue = null): self
73+
public function addArgument(string $name, $type, ?string $description = null, mixed $defaultValue = null): self
5474
{
5575
if ($this->args === null) {
5676
$this->args = [];
@@ -63,6 +83,7 @@ public function addArgument(string $name, Type $type, ?string $description = nul
6383
}
6484

6585
if ($defaultValue !== null) {
86+
/** @psalm-suppress MixedAssignment */
6687
$value['defaultValue'] = $defaultValue;
6788
}
6889

@@ -72,9 +93,7 @@ public function addArgument(string $name, Type $type, ?string $description = nul
7293
}
7394

7495
/**
75-
* @see ResolveInfo
76-
*
77-
* @param callable(mixed, array<mixed>, mixed, ResolveInfo) : mixed $resolver
96+
* @psalm-param FieldResolver $resolver
7897
*
7998
* @return $this
8099
*/
@@ -96,7 +115,7 @@ public function setDeprecationReason(string $reason): self
96115
}
97116

98117
/**
99-
* @return array<string, mixed>
118+
* @psalm-return FieldDefinitionConfig
100119
*/
101120
public function build(): array
102121
{

‎src/Builder/InputFieldBuilder.php‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,49 @@
44

55
namespace SimPod\GraphQLUtils\Builder;
66

7+
use GraphQL\Executor\Executor;
8+
use GraphQL\Type\Definition\Argument;
9+
use GraphQL\Type\Definition\InputObjectField;
710
use ReflectionProperty;
811

12+
/**
13+
* @see Executor
14+
* @see InputObjectField
15+
* @see Argument
16+
*
17+
* @psalm-import-type FieldResolver from Executor
18+
* @psalm-import-type InputObjectFieldConfig from InputObjectField
19+
* @psalm-import-type ArgumentListConfig from Argument
20+
* @psalm-import-type ArgumentType from Argument
21+
*/
922
class InputFieldBuilder
1023
{
1124
private string $name;
1225

26+
/** @psalm-var ArgumentType */
1327
private mixed $type;
1428

29+
private string|null $deprecationReason = null;
30+
1531
private string|null $description = null;
1632

1733
private mixed $defaultValue;
1834

19-
final private function __construct(string $name, mixed $type)
35+
/**
36+
* @psalm-param ArgumentType $type
37+
*/
38+
final private function __construct(string $name, $type)
2039
{
2140
$this->name = $name;
2241
$this->type = $type;
2342
}
2443

2544
/**
45+
* @psalm-param ArgumentType $type
46+
*
2647
* @return static
2748
*/
28-
public static function create(string $name, mixed $type): self
49+
public static function create(string $name, $type): self
2950
{
3051
return new static($name, $type);
3152
}
@@ -51,12 +72,13 @@ public function setDescription(string $description): self
5172
}
5273

5374
/**
54-
* @psalm-return array<string, mixed>
75+
* @psalm-return InputObjectFieldConfig
5576
*/
5677
public function build(): array
5778
{
5879
$config = [
5980
'name' => $this->name,
81+
'deprecationReason' => $this->deprecationReason,
6082
'description' => $this->description,
6183
'type' => $this->type,
6284
];

‎src/Builder/InputObjectBuilder.php‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,26 @@
44

55
namespace SimPod\GraphQLUtils\Builder;
66

7+
use GraphQL\Type\Definition\InputObjectType;
8+
9+
/**
10+
* @see InputObjectType
11+
*
12+
* @psalm-import-type FieldConfig from InputObjectType
13+
* @psalm-import-type InputObjectConfig from InputObjectType
14+
*/
715
class InputObjectBuilder extends TypeBuilder
816
{
9-
/** @var list<array<string, mixed>>|callable():list<array<string, mixed>> */
17+
private string|null $name;
18+
19+
/** @var callable():array<FieldConfig>|array<FieldConfig> */
1020
private $fields = [];
1121

22+
final private function __construct(?string $name)
23+
{
24+
$this->name = $name;
25+
}
26+
1227
/**
1328
* @return static
1429
*/
@@ -18,7 +33,7 @@ public static function create(string $name): self
1833
}
1934

2035
/**
21-
* @param list<array<string, mixed>>|callable():list<array<string, mixed>> $fields
36+
* @param callable():array<FieldConfig>|array<FieldConfig> $fields
2237
*
2338
* @return $this
2439
*/
@@ -30,7 +45,7 @@ public function setFields(callable|array $fields): self
3045
}
3146

3247
/**
33-
* @psalm-return array<string, mixed>
48+
* @psalm-return InputObjectConfig
3449
*/
3550
public function build(): array
3651
{

0 commit comments

Comments
 (0)