feat: PHP 8.5 and Symfony 8 support (#333)

Author: kbond

.github/workflows/ci.yml

@@ -12,18 +12,22 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 8.1, 8.2, 8.3 ]
+        php: [ 8.2, 8.3, 8.4, 8.5 ]
         deps: [ highest ]
-        symfony: [ 6.4.*, 7.0.* ]
+        symfony: [ 6.4.*, 7.4.*, 8.0.* ]
         include:
-          - php: 8.1
+          - php: 8.2
             deps: lowest
             symfony: '*'
         exclude:
-          - php: 8.1
-            symfony: 7.0.*
+          - php: 8.2
+            symfony: 8.0.*
+          - php: 8.3
+            symfony: 8.0.*
+          - php: 8.5
+            symfony: 6.4.* # laminas-diagnostics doesn't support PHP 8.5 with Symfony 6.4
     steps:
-      - uses: zenstruck/.github@php-test-symfony
+      - uses: zenstruck/.github/actions/php-test-symfony@main
         with:
           php: ${{ matrix.php }}
           symfony: ${{ matrix.symfony }}

.gitignore

@@ -3,6 +3,7 @@
 /vendor/
 /build/
 /var/
+/config/reference.php
 /.php-cs-fixer.cache
 /.phpunit.result.cache
 /Tests/app/var/cache/

.php-cs-fixer.dist.php

@@ -14,9 +14,6 @@
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,
-        '@PHP80Migration' => true,
-        '@PHP80Migration:risky' => true,
-        '@PHPUnit75Migration:risky' => true,
         //'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
         'multiline_comment_opening_closing' => true,
         'array_syntax' => ['syntax' => 'short'],
@@ -42,10 +39,10 @@
                 'method_private',
             ],
         ],
-        'native_function_invocation' => ['include' => ['@internal']],
+        'native_function_invocation' => ['include' => ['@internal'], 'exclude' => ['apcu_cache_info', 'apcu_sma_info']],
         'explicit_indirect_variable' => true,
         'explicit_string_variable' => true,
-        'escape_implicit_backslashes' => true,
+        'string_implicit_backslashes' => true,
         'mb_str_functions' => true,
         'logical_operators' => true,
         'php_unit_method_casing' => ['case' => 'snake_case'],

composer.json

@@ -21,24 +21,24 @@
     ],
     "require": {
         "php": ">=8.1",
-        "symfony/framework-bundle": "^6.4|^7.0",
-        "symfony/string": "^6.4|^7.0",
+        "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+        "symfony/string": "^6.4|^7.0|^8.0",
         "zenstruck/bytes": "^1.0"
     },
     "require-dev": {
         "colinodell/psr-testlogger": "^1.3",
-        "doctrine/doctrine-bundle": "^2.11",
+        "doctrine/doctrine-bundle": "^2.11|^3.0",
         "laminas/laminas-diagnostics": "^1.25",
-        "matthiasnoback/symfony-dependency-injection-test": "^5.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.1",
         "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": "^9.6.16",
-        "symfony/http-client": "^6.4|^7.0",
-        "symfony/mailer": "^6.4|^7.0",
-        "symfony/messenger": "^6.4|^7.0",
-        "symfony/phpunit-bridge": "^6.4|^7.0",
-        "symfony/process": "^6.4|^7.0",
-        "symfony/routing": "^6.4|^7.0",
-        "symfony/var-dumper": "^6.4|^7.0",
+        "phpunit/phpunit": "^9.6.16|^10.0",
+        "symfony/http-client": "^6.4|^7.0|^8.0",
+        "symfony/mailer": "^6.4|^7.0|^8.0",
+        "symfony/messenger": "^6.4|^7.0|^8.0",
+        "symfony/phpunit-bridge": "^6.4|^7.0|^8.0",
+        "symfony/process": "^6.4|^7.0|^8.0",
+        "symfony/routing": "^6.4|^7.0|^8.0",
+        "symfony/var-dumper": "^6.4|^7.0|^8.0",
         "zenstruck/browser": "^1.8",
         "zenstruck/console-test": "^1.5",
         "zenstruck/mailer-test": "^1.4"

src/Check/Doctrine/DbalConnectionCheck.php

@@ -68,20 +68,20 @@ public static function configInfo(): ?string
 
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->beforeNormalization()
-                ->ifTrue(fn($v) => \is_array($v) && \array_is_list($v))
-                ->then(fn($v) => \array_map(fn() => [], \array_combine($v, $v)))
+                ->ifTrue(static fn($v) => \is_array($v) && \array_is_list($v))
+                ->then(static fn($v) => \array_map(static fn() => [], \array_combine($v, $v)))
             ->end()
             ->beforeNormalization()
-                ->ifString()->then(fn(string $v) => [['name' => $v]])
+                ->ifString()->then(static fn(string $v) => [['name' => $v]])
             ->end()
             ->beforeNormalization()
-                ->ifTrue()->then(fn() => [['name' => self::ALL_CONNECTIONS]])
+                ->ifTrue()->then(static fn() => [['name' => self::ALL_CONNECTIONS]])
             ->end()
             ->beforeNormalization()
-                ->ifTrue(fn($v) => \is_array($v) && isset($v['suite']))
-                ->then(fn($v) => [['name' => self::ALL_CONNECTIONS, ...$v]])
+                ->ifTrue(static fn($v) => \is_array($v) && isset($v['suite']))
+                ->then(static fn($v) => [['name' => self::ALL_CONNECTIONS, ...$v]])
             ->end()
             ->useAttributeAsKey('name')
             ->arrayPrototype()
@@ -129,7 +129,7 @@ public static function process(ContainerBuilder $container): void
             throw new LogicException('Could not determine Doctrine DBAL connections. Is doctrine/doctrine-bundle installed/enabled?');
         }
 
-        $config = \array_map(fn() => $config, $container->getParameter('doctrine.connections')); // @phpstan-ignore-line
+        $config = \array_map(static fn() => $config, $container->getParameter('doctrine.connections')); // @phpstan-ignore-line
 
         self::load($config, $container);
     }

src/Check/PercentThresholdCheck.php

@@ -45,7 +45,7 @@ public function __construct(int|string $warningThreshold, int|string $criticalTh
      */
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->canBeEnabled()
             ->children()
                 ->scalarNode('warning')

src/Check/Php/ComposerAuditCheck.php

@@ -80,7 +80,7 @@ public static function configInfo(): ?string
 
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->canBeEnabled()
             ->children()
                 ->scalarNode('path')

src/Check/PingUrlCheck.php

@@ -98,11 +98,11 @@ public static function configInfo(): ?string
 
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->arrayPrototype()
                 ->beforeNormalization()
                     ->ifString()
-                    ->then(fn(string $url) => ['url' => $url])
+                    ->then(static fn(string $url) => ['url' => $url])
                 ->end()
                 ->children()
                     ->scalarNode('url')->isRequired()->cannotBeEmpty()->end()

src/Check/System/DiskUsageCheck.php

@@ -53,24 +53,24 @@ public static function configInfo(): string
 
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->beforeNormalization()
-                ->ifTrue()->then(fn() => [['path' => '/']])
+                ->ifTrue()->then(static fn() => [['path' => '/']])
             ->end()
             ->beforeNormalization()
-                ->ifString()->then(fn(string $v) => [['path' => $v]])
+                ->ifString()->then(static fn(string $v) => [['path' => $v]])
             ->end()
             ->beforeNormalization()
-                ->ifTrue(fn($v) => \is_array($v) && !\array_is_list($v))
-                ->then(function($v) {
+                ->ifTrue(static fn($v) => \is_array($v) && !\array_is_list($v))
+                ->then(static function($v) {
                     $v['path'] ??= '/';
 
                     return [$v];
                 })
             ->end()
             ->arrayPrototype()
                 ->beforeNormalization()
-                    ->ifString()->then(fn(string $v) => ['path' => $v])
+                    ->ifString()->then(static fn(string $v) => ['path' => $v])
                 ->end()
                 ->children()
                     ->scalarNode('path')->isRequired()->cannotBeEmpty()->end()

src/Check/System/FreeDiskSpaceCheck.php

@@ -82,18 +82,16 @@ public static function configInfo(): string
 
     public static function addConfig(ArrayNodeDefinition $node): NodeDefinition
     {
-        return $node // @phpstan-ignore-line
+        return $node
             ->beforeNormalization()
-                ->ifTrue(fn($v) => \is_array($v) && isset($v['warning']))
-                ->then(function($v) {
-                    return [
-                        [
-                            'path' => $v['path'] ?? '/',
-                            'warning' => $v['warning'],
-                            'critical' => $v['critical'] ?? $v['warning'],
-                        ],
-                    ];
-                })
+                ->ifTrue(static fn($v) => \is_array($v) && isset($v['warning']))
+                ->then(static fn($v) => [
+                    [
+                        'path' => $v['path'] ?? '/',
+                        'warning' => $v['warning'],
+                        'critical' => $v['critical'] ?? $v['warning'],
+                    ],
+                ])
             ->end()
             ->arrayPrototype()
                 ->children()