Skip to content

Commit 7dcee7f

Browse files
author
Jeremiah VALERIE
committed
Merge branch 'master' into remove-addDefaultFallBackToTypeLoader
2 parents a3d6d67 + 18a0fa0 commit 7dcee7f

File tree

266 files changed

+701
-478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+701
-478
lines changed

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ phpunit.xml
55
/bin
66
composer.lock
77
composer.phar
8-
.php_cs.cache
9-
.php_cs
10-
.phpunit.result.cache
8+
/.php-cs-fixer.php
9+
/*.cache
1110

1211
phpbench.phar
1312
phpbench.phar.*

‎.php_cs.dist‎ renamed to ‎.php-cs-fixer.dist.php‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,34 @@
66
->in([__DIR__.'/src', __DIR__.'/tests'])
77
;
88

9-
return PhpCsFixer\Config::create()
9+
return (new PhpCsFixer\Config())
1010
->setRules(
1111
[
1212
'@Symfony' => true,
13-
'@PHP74Migration' => true,
14-
'@PHP74Migration:risky' => true,
13+
'@PHP80Migration' => true,
14+
'@PHP80Migration:risky' => true,
1515
'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
16-
'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
16+
'general_phpdoc_annotation_remove' => [
17+
'annotations' => [
18+
'author',
19+
'category',
20+
'copyright',
21+
'created',
22+
'license',
23+
'package',
24+
'since',
25+
'subpackage',
26+
'version',
27+
],
28+
],
1729
'fully_qualified_strict_types' => true,
1830
'single_line_throw' => false,
1931
'phpdoc_to_comment' => false,
2032
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
2133
'global_namespace_import' => ['import_functions' => true, 'import_classes' => true, 'import_constants' => true],
2234
'phpdoc_summary' => false,
23-
'hash_to_slash_comment' => false,
2435
'single_line_comment_style' => false,
25-
'phpdoc_no_alias_tag' => ['type' => 'var'],
36+
'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
2637
'no_mixed_echo_print' => ['use' => 'echo'],
2738
]
2839
)

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ It also supports:
1818
Browse your version documentation:
1919

2020
* [1.0 (DEV)](https://github.com/overblog/GraphQLBundle/blob/master/README.md)
21-
* [0.14 (DEV)](https://github.com/overblog/GraphQLBundle/blob/0.14/README.md)
21+
* [0.14 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.14/README.md)
2222
* [0.13 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.13/README.md)
23-
* [0.12 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.12/README.md)
24-
* [0.11 (STABLE)](https://github.com/overblog/GraphQLBundle/blob/0.11/README.md)
23+
* [0.12 (DEPRECATE)](https://github.com/overblog/GraphQLBundle/blob/0.12/README.md)
24+
* [0.11 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.11/README.md)
2525
* [0.10 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.10/README.md)
2626
* [0.9 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.9/README.md)
2727
* [0.8 (OBSOLETE)](https://github.com/overblog/GraphQLBundle/blob/0.8/README.md)

‎UPGRADE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ UPGRADE FROM 0.14 to 1.0
1111
* Removed deprecated `values` from `Enum`
1212
* Removed deprecated `resolver_maps` configuration option
1313
* Removed `request_files` from context, use `request` object instead
14+
* All classes are now final. If you need an extension point, try to use composition,
15+
implementing the interface or raise an issue.
1416

1517
UPGRADE FROM 0.13 to 0.14
1618
=========================

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"ext-json": "*",
3434
"murtukov/php-code-generator": "^0.1.5",
3535
"phpdocumentor/reflection-docblock": "^5.2",
36-
"psr/log": "^1.0",
36+
"psr/log": "^1.0 || ^2.0 || ^3.0",
3737
"symfony/config": "^5.3.7 || ^6.0",
3838
"symfony/dependency-injection": "^5.3.7 || ^6.0",
3939
"symfony/event-dispatcher": "^5.3 || ^6.0",
@@ -91,7 +91,7 @@
9191
"static-analysis": [
9292
"phpstan analyse --ansi --memory-limit=1G"
9393
],
94-
"install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.7/php-cs-fixer.phar -O php-cs-fixer.phar",
94+
"install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.3.2/php-cs-fixer.phar -O php-cs-fixer.phar",
9595
"fix-cs": [
9696
"@install-cs",
9797
"@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"

‎docs/index.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ Versions requirements
1010

1111
| Version | PHP | Symfony | Support |
1212
| --------------------------------------------------------------: | ---------: | ---------------: | -------------: |
13-
| [`1.0`](https://github.com/overblog/GraphQLBundle/tree/master) | `>= 7.4` | `>= 4.4` | DEV |
13+
| [`1.0`](https://github.com/overblog/GraphQLBundle/tree/master) | `>= 8.0` | `>= 5.3.7` | DEV |
14+
| [`0.14`](https://github.com/overblog/GraphQLBundle/tree/0.14) | `>= 7.4` | `>= 4.4.30` | Active support |
1415
| [`0.13`](https://github.com/overblog/GraphQLBundle/tree/0.13) | `>= 7.2` | `>= 4.3` | Active support |
15-
| [`0.12`](https://github.com/overblog/GraphQLBundle/tree/0.12) | `>= 7.1` | `>= 3.4, <4.4` | Active support |
16-
| [`0.11`](https://github.com/overblog/GraphQLBundle/tree/0.11) | `>= 5.6` | `>= 3.1, <=4.3` | Active support |
16+
| [`0.12`](https://github.com/overblog/GraphQLBundle/tree/0.12) | `>= 7.1` | `>= 3.4, <4.4` | Security |
17+
| [`0.11`](https://github.com/overblog/GraphQLBundle/tree/0.11) | `>= 5.6` | `>= 3.1, <=4.3` | End of life |
1718
| [`0.10`](https://github.com/overblog/GraphQLBundle/tree/0.10) | `>= 5.5.9` | `>= 2.8, <= 3.1` | End of life |
1819
| [`0.9`](https://github.com/overblog/GraphQLBundle/tree/0.9) | `>= 5.5.9` | `>= 2.8, <= 3.1` | End of life |
1920
| [`0.8`](https://github.com/overblog/GraphQLBundle/tree/0.8) | `>= 5.4 ` | `>= 2.7, <= 3.1` | End of life |

‎phpstan-baseline.neon‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,11 @@ parameters:
270270
count: 1
271271
path: src/Validator/Mapping/PropertyMetadata.php
272272

273+
-
274+
message: "#^Method Overblog\\\\GraphQLBundle\\\\Tests\\\\Config\\\\Parser\\\\fixtures\\\\annotations\\\\Invalid\\\\InvalidPrivateMethod\\:\\:gql\\(\\) is unused\\.$#"
275+
count: 1
276+
path: tests/Config/Parser/fixtures/annotations/Invalid/InvalidPrivateMethod.php
277+
273278
-
274279
message: "#^Access to an undefined property GraphQL\\\\Language\\\\AST\\\\Node\\:\\:\\$value\\.$#"
275280
count: 1

‎src/CacheWarmer/CompileCacheWarmer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Overblog\GraphQLBundle\Generator\TypeGenerator;
88
use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
99

10-
class CompileCacheWarmer implements CacheWarmerInterface
10+
final class CompileCacheWarmer implements CacheWarmerInterface
1111
{
1212
private TypeGenerator $typeGenerator;
1313
private bool $compiled;

‎src/Command/DebugCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use function sprintf;
2121
use function ucfirst;
2222

23-
class DebugCommand extends Command
23+
final class DebugCommand extends Command
2424
{
2525
private static array $categories = ['type', 'mutation', 'query'];
2626

‎src/Config/CustomScalarTypeDefinition.php‎

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

77
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
88

9-
class CustomScalarTypeDefinition extends TypeDefinition
9+
final class CustomScalarTypeDefinition extends TypeDefinition
1010
{
1111
public function getDefinition(): ArrayNodeDefinition
1212
{

0 commit comments

Comments
 (0)