Skip to content

Commit 8b5bbab

Browse files
committed
BREAKING upgrade to webonyx/graphql-php 15 #9900
1 parent c5c7e6b commit 8b5bbab

32 files changed

+95
-134
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"cakephp/chronos": "^2.4",
4747
"doctrine/dbal": "^3.6",
4848
"doctrine/migrations": "^3.6",
49-
"ecodev/graphql-doctrine": "^8.1",
49+
"ecodev/graphql-doctrine": "^9.0",
5050
"imagine/imagine": "^1.3",
5151
"laminas/laminas-diactoros": "^3.1",
5252
"laminas/laminas-log": "^2.16",

composer.lock

Lines changed: 42 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpstan.neon.dist

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ parameters:
66
checkMissingIterableValueType: false
77
checkGenericClassInNonGenericObjectType: false
88
ignoreErrors:
9-
- '~^Method Ecodev\\Felix\\Api\\Server\:\:execute\(\) should return array\<GraphQL\\Executor\\ExecutionResult\>\|GraphQL\\Executor\\ExecutionResult but returns array\<GraphQL\\Executor\\ExecutionResult\>\|GraphQL\\Executor\\ExecutionResult\|GraphQL\\Executor\\Promise\\Promise\.$~'
9+
- '~^Method Ecodev\\Felix\\Api\\Server\:\:execute\(\) should return array\<GraphQL\\Executor\\ExecutionResult\>\|GraphQL\\Executor\\ExecutionResult but returns array\<int, GraphQL\\Executor\\ExecutionResult\>\|GraphQL\\Executor\\ExecutionResult\|GraphQL\\Executor\\Promise\\Promise\.$~'
1010
- '~^Cannot call method getInstance\(\) on Laminas\\Permissions\\Acl\\Resource\\ResourceInterface\|null\.$~'
1111
- '~^Parameter \#1 \$object of static method Ecodev\\Felix\\Utility\:\:getShortClassName\(\) expects class\-string\|object, string given\.$~'
12-
- '~^Parameter #1 \$wrappedType of static method GraphQL\\Type\\Definition\\Type\:\:nonNull\(\) expects \(callable\(\)\: mixed\)\|GraphQL\\Type\\Definition\\NullableType, GraphQL\\Type\\Definition\\LeafType given\.$~'
1312
- '~^Property EcodevTests\\Felix\\Blog\\Model\\.*\:\:\$.* is never read, only written\.$~'
1413
- '~^Property EcodevTests\\Felix\\Blog\\Model\\.*\:\:\$.* is unused\.$~'
1514
- '~^Cannot cast mixed to int\.$~'
1615
- '~^Cannot cast mixed to string\.$~'
17-
- '~^Parameter \#1 \$wrappedType of static method GraphQL\\Type\\Definition\\Type\:\:nonNull\(\) expects \(callable\(\)\: mixed\)\|GraphQL\\Type\\Definition\\NullableType, GraphQL\\Type\\Definition\\Type given\.$~'
16+
- '~^Parameter \#1 \$type of static method GraphQL\\Type\\Definition\\Type\:\:nonNull\(\) expects~'
1817

1918
includes:
2019
- phpstan-baseline.neon

src/Api/Exception.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
*/
1212
class Exception extends \Exception implements ClientAware
1313
{
14-
public function getCategory(): string
15-
{
16-
return 'Permissions';
17-
}
18-
1914
public function isClientSafe(): bool
2015
{
2116
return true;

src/Api/Scalar/CHFType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
final class CHFType extends AbstractMoneyType
1010
{
11-
/**
12-
* @var string
13-
*/
14-
public $description = 'A CHF money amount.';
11+
public ?string $description = 'A CHF money amount.';
1512

1613
/**
1714
* @param numeric-string $value

src/Api/Scalar/ChronosType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515

1616
final class ChronosType extends ScalarType
1717
{
18-
/**
19-
* @var string
20-
*/
21-
public $description = 'A date with time and timezone.';
18+
public ?string $description = 'A date with time and timezone.';
2219

2320
/**
2421
* Serializes an internal value to include in a response.

src/Api/Scalar/ColorType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
final class ColorType extends AbstractStringBasedType
88
{
9-
/**
10-
* @var string
11-
*/
12-
public $description = 'A color expressed in hexadecimal CSS notation (eg: `#AA00FF`) or an empty string `""`.';
9+
public ?string $description = 'A color expressed in hexadecimal CSS notation (eg: `#AA00FF`) or an empty string `""`.';
1310

1411
/**
1512
* Validate a color in hexadecimal CSS notation.

src/Api/Scalar/DateType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414

1515
final class DateType extends ScalarType
1616
{
17-
/**
18-
* @var string
19-
*/
20-
public $description = 'A date without time, nor timezone.';
17+
public ?string $description = 'A date without time, nor timezone.';
2118

2219
/**
2320
* Serializes an internal value to include in a response.

src/Api/Scalar/EURType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88

99
final class EURType extends AbstractMoneyType
1010
{
11-
/**
12-
* @var string
13-
*/
14-
public $description = 'An EUR money amount.';
11+
public ?string $description = 'An EUR money amount.';
1512

1613
/**
1714
* @param numeric-string $value

src/Api/Scalar/LoginType.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66

77
class LoginType extends AbstractStringBasedType
88
{
9-
/**
10-
* @var string
11-
*/
12-
public $description = 'A user login is a non-empty string containing only letters, digits, `.`, `_` and `-`.';
9+
public ?string $description = 'A user login is a non-empty string containing only letters, digits, `.`, `_` and `-`.';
1310

1411
/**
1512
* Validate a login.

0 commit comments

Comments
 (0)