Merge pull request #1008 from mcg-web/support-symfony-6-and-stable-graphql-php

Support Symfony 6 and stable GraphQL PHP

Author: mcg-web

.appveyor.yml

@@ -11,10 +11,10 @@ init:
 
 install:
     - ps: Set-Service wuauserv -StartupType Manual
-    - cinst -y php --version=7.4
+    - cinst -y php --version=8.0
     - cinst -y composer
     - refreshenv
-    - cd c:\tools\php74
+    - cd c:\tools\php80
     - copy php.ini-production php.ini /Y
     - echo date.timezone="UTC" >> php.ini
     - echo extension_dir=ext >> php.ini

.github/workflows/ci.yml

@@ -17,25 +17,23 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.4'
           - '8.0'
           - '8.1'
         symfony-version:
-          - '4.4.*'
-          - '5.3.*'
           - '5.4.*'
+          - '6.0.*'
         dependencies:
           - 'lowest'
           - 'highest'
         remove-dependencies: [ '' ]
         coverage: [ 'none' ]
         include:
           - php-version: '8.0'
-            symfony-version: '5.3.*'
+            symfony-version: '5.4.*'
             dependencies: 'lowest'
             remove-dependencies: '--dev symfony/validator doctrine/orm doctrine/annotations'
           - php-version: '8.0'
-            symfony-version: '5.3.*'
+            symfony-version: '5.4.*'
             dependencies: 'lowest'
             coverage: "pcov"
     steps:
@@ -89,7 +87,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           tools: flex
-          php-version: "7.4"
+          php-version: "8.0"
 
       - name: "Install dependencies"
         uses: ramsey/[email protected]
@@ -107,7 +105,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "7.4"
+          php-version: "8.0"
 
       - name: "Install dependencies"
         uses: ramsey/[email protected]

.gitignore

@@ -5,9 +5,8 @@ phpunit.xml
 /bin
 composer.lock
 composer.phar
-.php_cs.cache
-.php_cs
-.phpunit.result.cache
+/.php-cs-fixer.php
+/*.cache
 
 phpbench.phar
 phpbench.phar.*

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

@@ -6,26 +6,37 @@
     ->in([__DIR__.'/src', __DIR__.'/tests'])
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules(
         [
             '@Symfony' => true,
-            '@PHP74Migration' => true,
-            '@PHP74Migration:risky' => true,
+            '@PHP80Migration' => true,
+            '@PHP80Migration:risky' => true,
             'ordered_imports' => ['imports_order' => ['class', 'function', 'const']],
-            'general_phpdoc_annotation_remove' => ['author', 'category', 'copyright', 'created', 'license', 'package', 'since', 'subpackage', 'version'],
+            'general_phpdoc_annotation_remove' => [
+                'annotations' => [
+                    'author',
+                    'category',
+                    'copyright',
+                    'created',
+                    'license',
+                    'package',
+                    'since',
+                    'subpackage',
+                    'version',
+                ],
+            ],
             'fully_qualified_strict_types' => true,
             'single_line_throw' => false,
             'phpdoc_to_comment' => false,
             'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
             'global_namespace_import' => ['import_functions' => true, 'import_classes' => true, 'import_constants' => true],
             'phpdoc_summary' => false,
-            'hash_to_slash_comment' => false,
             'single_line_comment_style' => false,
-            'phpdoc_no_alias_tag' => ['type' => 'var'],
+            'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
             'no_mixed_echo_print' => ['use' => 'echo'],
         ]
     )
     ->setFinder($finder)
     ->setUsingCache(true)
-;
+    ;

composer.json

@@ -25,21 +25,21 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
+        "php": "^8.0",
         "ext-json": "*",
         "murtukov/php-code-generator": "^0.1.5",
         "phpdocumentor/reflection-docblock": "^5.2",
         "phpdocumentor/type-resolver": ">1.4.0,<1.6.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
-        "symfony/config": "^4.4.30 || ^5.3.7",
-        "symfony/dependency-injection": "^4.4.30 || ^5.3.7",
-        "symfony/event-dispatcher": "^4.4 || ^5.3",
-        "symfony/expression-language": "^4.4 || ^5.3",
-        "symfony/framework-bundle": "^4.4.30 || ^5.3.7",
-        "symfony/http-foundation": "^4.4.30 || ^5.3.7",
-        "symfony/http-kernel": "^4.4 || ^5.3",
-        "symfony/options-resolver": "^4.4 || ^5.3",
-        "symfony/property-access": "^4.4 || ^5.3",
+        "symfony/config": "^5.4 || ^6.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/expression-language": "^5.4 || ^6.0",
+        "symfony/framework-bundle": "^5.4 || ^6.0",
+        "symfony/http-foundation": "^5.4 || ^6.0",
+        "symfony/http-kernel": "^5.4 || ^6.0",
+        "symfony/options-resolver": "^5.4 || ^6.0",
+        "symfony/property-access": "^5.4 || ^6.0",
         "webonyx/graphql-php": ">=14.5"
     },
     "suggest": {
@@ -58,36 +58,36 @@
         "phpstan/phpstan-symfony": "^0.12.6",
         "phpunit/phpunit": "^9.5.10",
         "react/promise": "^2.5",
-        "symfony/asset": "^4.4 || ^5.3",
-        "symfony/browser-kit": "^4.4 || ^5.3",
-        "symfony/css-selector": "^4.4 || ^5.3",
-        "symfony/console": "^4.4.30 || ^5.3",
-        "symfony/dom-crawler": "^4.4.30 || ^5.3.7",
-        "symfony/finder": "^4.4.30 || ^5.3.7",
+        "symfony/asset": "^5.4 || ^6.0",
+        "symfony/browser-kit": "^5.4 || ^6.0",
+        "symfony/css-selector": "^5.4 || ^6.0",
+        "symfony/console": "^5.4 || ^6.0",
+        "symfony/dom-crawler": "^5.4 || ^6.0",
+        "symfony/finder": "^5.4 || ^6.0",
         "symfony/monolog-bundle": "^3.7",
         "symfony/phpunit-bridge": "^6.0",
-        "symfony/process": "^4.4.30 || ^5.3.7",
-        "symfony/routing": "^4.4 || ^5.3.7",
-        "symfony/security-bundle": "^4.4 || ^5.3",
-        "symfony/validator": "^4.4.30 || ^5.3.7",
-        "symfony/var-dumper": "^4.4.30 || ^5.3.7",
-        "symfony/yaml": "^4.4 || ^5.3",
+        "symfony/process": "^5.4 || ^6.0",
+        "symfony/routing": "^5.4 || ^6.0",
+        "symfony/security-bundle": "^5.4 || ^6.0",
+        "symfony/validator": "^5.4 || ^6.0",
+        "symfony/var-dumper": "^5.4 || ^6.0",
+        "symfony/yaml": "^5.4 || ^6.0",
         "twig/twig": "^2.10|^3.0"
     },
     "conflict": {
         "react/promise": "<2.8"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.14-dev"
+            "dev-master": "0.15-dev"
         }
     },
     "scripts": {
         "test": "bin/phpunit --color=always --coverage-clover=build/logs/clover.xml",
         "static-analysis": [
             "phpstan analyse --ansi --memory-limit=1G"
         ],
-        "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",
+        "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",
         "fix-cs": [
             "@install-cs",
             "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi"

phpstan-baseline.neon

@@ -486,7 +486,7 @@ parameters:
 			path: tests/Relay/Connection/AbstractConnectionBuilderTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, iterable\\<Overblog\\\\GraphQLBundle\\\\Relay\\\\Connection\\\\EdgeInterface\\> given\\.$#"
+			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, iterable\\<Overblog\\\\GraphQLBundle\\\\Relay\\\\Connection\\\\EdgeInterface\\> given\\.$#"
 			count: 1
 			path: tests/Relay/Connection/AbstractConnectionBuilderTest.php
 

phpunit.xml.dist

@@ -25,7 +25,7 @@
 
     <php>
       <ini name="error_reporting" value="-1" />
-      <env name="SYMFONY_DEPRECATIONS_HELPER" value="999999" />
+      <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=999999" />
       <env name="USE_EXPERIMENTAL_EXECUTOR" value="0" />
     </php>
     <listeners>

src/Config/Parser/MetadataParser/TypeGuesser/DoctrineTypeGuesser.php

@@ -126,7 +126,7 @@ private function getAnnotation(Reflector $reflector, string $annotationClass): ?
      */
     public function fullyQualifiedClassName(string $className, string $namespace): string
     {
-        if (false === strpos($className, '\\') && $namespace) {
+        if (!str_contains($className, '\\') && $namespace) {
             return $namespace.'\\'.$className;
         }
 

src/Definition/Type/CustomScalarType.php

@@ -17,10 +17,10 @@ class CustomScalarType extends BaseCustomScalarType
 {
     public function __construct(array $config = [])
     {
-        $config['name'] = $config['name'] ?? uniqid('CustomScalar');
+        $config['name'] ??= uniqid('CustomScalar');
         parent::__construct($config);
 
-        $this->config['scalarType'] = $this->config['scalarType'] ?? null;
+        $this->config['scalarType'] ??= null;
     }
 
     /**

src/ExpressionLanguage/ExpressionLanguage.php

@@ -11,10 +11,9 @@
 use Symfony\Component\ExpressionLanguage\Token;
 use function array_merge;
 use function strlen;
-use function strpos;
 use function substr;
 
-class ExpressionLanguage extends BaseExpressionLanguage
+final class ExpressionLanguage extends BaseExpressionLanguage
 {
     // TODO (murtukov): make names conditional
     public const KNOWN_NAMES = ['value', 'args', 'context', 'info', 'object', 'validator', 'errors', 'childrenComplexity', 'typeName', 'fieldName'];
@@ -35,10 +34,8 @@ public function getGlobalNames(): array
     /**
      * @param string|Expression $expression
      * @param array             $names
-     *
-     * @return string
      */
-    public function compile($expression, $names = [])
+    public function compile($expression, $names = []): string
     {
         return parent::compile($expression, array_merge($names, $this->globalNames));
     }
@@ -126,7 +123,7 @@ public static function isStringWithTrigger($value): bool
      */
     public static function stringHasTrigger(string $maybeExpression): bool
     {
-        return 0 === strpos($maybeExpression, self::EXPRESSION_TRIGGER);
+        return str_starts_with($maybeExpression, self::EXPRESSION_TRIGGER);
     }
 
     /**