Add support for PHP 8.4

theofidry · Jan 12, 2025 · b89ccbf · b89ccbf
1 parent fe47c6d
commit b89ccbf
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,11 +17,16 @@ jobs:
             matrix:
                 php:
                     - '8.2'
+                    - '8.3'
+                include:
+                    - php: '8.4'
+                      env:
+                        PHP_CS_FIXER_IGNORE_ENV: '1'
                 dependencies: ['highest']
             fail-fast: false
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
@@ -32,6 +37,8 @@ jobs:
 
             -   name: Run PHP-CS-Fixer fix
                 run: php-cs-fixer fix --dry-run --diff --ansi
+                env:
+                    PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.env.PHP_CS_FIXER_IGNORE_ENV }}
 
     phpunit:
         name: PHPUnit (PHP ${{ matrix.php }}) Symfony ${{ matrix.symfony }}
@@ -40,11 +47,18 @@ jobs:
             matrix:
                 php:
                     - '8.2'
+                    - '8.3'
+                include:
+                    - php: '8.4'
+                      env:
+                          SYMFONY_DEPRECATIONS_HELPER: 'weak'
                 dependencies: ['highest', 'lowest']
                 symfony:
                     - 'unchanged'
                     - '6.4.*'
                     - '7.*.*'
+                env:
+                    - SYMFONY_DEPRECATIONS_HELPER: 'max[direct]=0'
             fail-fast: false
 
         services:
@@ -59,7 +73,7 @@ jobs:
                     MYSQL_ROOT_PASSWORD: password
         steps:
             -   name: Checkout
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Configure Symfony version
                 if: matrix.symfony != 'unchanged'
@@ -72,7 +86,7 @@ jobs:
                     tools: composer, flex
 
             -   name: Install Composer dependencies (${{ matrix.dependencies }})
-                uses: ramsey/composer-install@v1
+                uses: ramsey/composer-install@v3
                 with:
                     dependency-versions: ${{ matrix.dependencies }}
                     composer-options: "--prefer-dist"
@@ -85,6 +99,8 @@ jobs:
 
             -   name: Run tests
                 run: vendor/bin/phpunit --verbose --stop-on-failure
+                env:
+                    SYMFONY_DEPRECATIONS_HELPER: ${{ matrix.env.SYMFONY_DEPRECATIONS_HELPER }}
 
     # This is a "trick", a meta task which does not change, and we can use in
     # the protected branch rules as opposed to the individual tests which

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -70,6 +70,7 @@
         'no_short_bool_cast' => true,
         'no_spaces_around_offset' => true,
         'no_unused_imports' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
         'ordered_imports' => true,
         'phpdoc_order' => true,
         'phpdoc_scalar' => true,

diff --git a/fixtures/DataFixtures/Loader/FakeLoader.php b/fixtures/DataFixtures/Loader/FakeLoader.php
@@ -22,7 +22,7 @@ class FakeLoader implements DataFixturesLoaderInterface
 {
     use NotCallableTrait;
 
-    public function load(array $fixturesFiles, array $parameters = [], array $objects = [], PurgeMode $purgeMode = null): array
+    public function load(array $fixturesFiles, array $parameters = [], array $objects = [], ?PurgeMode $purgeMode = null): array
     {
         $this->__call(__METHOD__, func_get_args());
     }

diff --git a/src/Alice/FileLocator/KernelFileLocator.php b/src/Alice/FileLocator/KernelFileLocator.php
@@ -30,7 +30,7 @@ public function __construct(FileLocatorInterface $decoratedFileLocator, KernelIn
         $this->kernel = $kernel;
     }
 
-    public function locate(string $name, string $currentPath = null): string
+    public function locate(string $name, ?string $currentPath = null): string
     {
         if ('@' === $name[0]) {
             return $this->kernel->locateResource($name);

diff --git a/src/Alice/Generator/Instantiator/Chainable/InstantiatedReferenceInstantiator.php b/src/Alice/Generator/Instantiator/Chainable/InstantiatedReferenceInstantiator.php
@@ -33,7 +33,7 @@ final class InstantiatedReferenceInstantiator implements ChainableInstantiatorIn
 
     private ?ContainerInterface $container = null;
 
-    public function setContainer(ContainerInterface $container = null): void
+    public function setContainer(?ContainerInterface $container = null): void
     {
         $this->container = $container;
     }

diff --git a/src/Console/Command/Doctrine/DoctrineOrmLoadDataFixturesCommand.php b/src/Console/Command/Doctrine/DoctrineOrmLoadDataFixturesCommand.php
@@ -88,7 +88,7 @@ protected function configure(): void
         ;
     }
 
-    public function setApplication(ConsoleApplication $application = null): void
+    public function setApplication(?ConsoleApplication $application = null): void
     {
         if (null !== $application
             && !($application instanceof FrameworkBundleConsoleApplication)

diff --git a/src/Exception/Resolver/BundleNotFoundException.php b/src/Exception/Resolver/BundleNotFoundException.php
@@ -25,7 +25,7 @@ final class BundleNotFoundException extends RuntimeException
     /**
      * @param BundleInterface[] $bundles
      */
-    public static function create(string $bundle, array $bundles, int $code = 0, Throwable $previous = null): self
+    public static function create(string $bundle, array $bundles, int $code = 0, ?Throwable $previous = null): self
     {
         return new self(
             sprintf(

diff --git a/src/Loader/DoctrineOrmLoader.php b/src/Loader/DoctrineOrmLoader.php
@@ -48,7 +48,7 @@ public function __construct(
         FixtureLocatorInterface $fixtureLocator,
         LoaderInterface $purgeLoader,
         LoaderInterface $appendLoader,
-        LoggerInterface $logger = null
+        ?LoggerInterface $logger = null
     ) {
         $this->bundleResolver = $bundleResolver;
         $this->fixtureLocator = $fixtureLocator;