Merge pull request #367 from Chris53897/patch-1

ci: add tests for PHP 8.5

Author: norkunas

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
           tools: flex
 
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Install Composer dependencies"
         uses: "ramsey/composer-install@v3"
@@ -44,7 +44,7 @@ jobs:
           tools: flex, cs2pr
 
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Install Composer dependencies"
         uses: "ramsey/composer-install@v3"
@@ -61,23 +61,23 @@ jobs:
       max-parallel: 10
       fail-fast: false
       matrix:
-        php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
-        sf_version: [ '6.4.*', '7.2.*', '7.3.*' ]
+        php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
+        sf_version: [ '6.4.*', '7.3.*', '7.4.*' ]
         exclude:
           - php: '8.0'
             sf_version: '6.4.*'
-          - php: '8.0'
-            sf_version: '7.2.*'
-          - php: '8.1'
-            sf_version: '7.2.*'
           - php: '8.0'
             sf_version: '7.3.*'
           - php: '8.1'
             sf_version: '7.3.*'
+          - php: '8.0'
+            sf_version: '7.4.*'
+          - php: '8.1'
+            sf_version: '7.4.*'
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2

tests/Command/GeocodeCommandTest.php

@@ -66,7 +66,12 @@ public function testExecute(): void
             ->willReturn([]);
 
         $app = new Application($kernel);
-        $app->add((new GeocodeCommand($geocoder))->setName('geocoder:geocode'));
+        if (method_exists($app, 'addCommand')) {
+            // since Symfony 8
+            $app->addCommand((new GeocodeCommand($geocoder))->setName('geocoder:geocode'));
+        } else {
+            $app->add(new GeocodeCommand($geocoder));
+        }
 
         $command = $app->find('geocoder:geocode');
 

tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php

@@ -33,7 +33,9 @@ protected function tearDown(): void
     {
         $reflection = new \ReflectionObject($this->compilerPass);
         $prop = $reflection->getProperty('factoryServiceIds');
-        $prop->setAccessible(true);
+        if (PHP_VERSION_ID < 80100) {
+            $prop->setAccessible(true);
+        }
         $prop->setValue(null, []);
     }
 

tests/Validator/Constraint/AddressValidatorTest.php

@@ -78,9 +78,7 @@ public function testInvalidAddress(): void
     {
         $address = 'Bifrost, Nine Realms';
 
-        $constraint = new Address([
-            'message' => 'myMessage {{ address }}',
-        ]);
+        $constraint = new Address(message: 'myMessage {{ address }}');
 
         $this->validator->validate($address, $constraint);