From 3080319deaba3aecfeb1925739717cd61ef58b2b Mon Sep 17 00:00:00 2001 From: chris Date: Mon, 3 Nov 2025 17:02:52 +0100 Subject: [PATCH 1/7] ci: add tests for PHP 8.5 Upgrade checkout action from v4 to v5 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78d9e7c..76cd5bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: tools: flex - name: "Checkout code" - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: "Install Composer dependencies" uses: "ramsey/composer-install@v3" @@ -45,7 +45,7 @@ jobs: tools: flex, cs2pr - name: "Checkout code" - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: "Install Composer dependencies" uses: "ramsey/composer-install@v3" @@ -62,7 +62,7 @@ jobs: max-parallel: 10 fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] sf_version: [ '5.4.*', '6.4.*', '7.2.*', '7.3.*' ] exclude: - php: '7.4' @@ -84,7 +84,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: "Setup PHP" uses: shivammathur/setup-php@v2 From b5f70e2cf7f7e2b80d0f0f2f28cfdacb2a3df5ab Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 20 Dec 2025 13:03:40 +0100 Subject: [PATCH 2/7] Upgrade actions/checkout from v5 to v6 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc769c2..bc1767e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: tools: flex - name: "Checkout code" - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: "Install Composer dependencies" uses: "ramsey/composer-install@v3" @@ -45,7 +45,7 @@ jobs: tools: flex, cs2pr - name: "Checkout code" - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: "Install Composer dependencies" uses: "ramsey/composer-install@v3" @@ -78,7 +78,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: "Setup PHP" uses: shivammathur/setup-php@v2 From eee8ea151518f1163c196a79a7f083bc4d119d75 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 13:10:18 +0100 Subject: [PATCH 3/7] ci: add tests for PHP 8.5 --- .../DependencyInjection/Compiler/FactoryValidatorPassTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php b/tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php index 0b7f3f7..b6c43b7 100644 --- a/tests/DependencyInjection/Compiler/FactoryValidatorPassTest.php +++ b/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, []); } From 7ae5a25bcc60a74b0128a1b1470a8f0e92cd6374 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 13:19:27 +0100 Subject: [PATCH 4/7] ci: add tests for PHP 8.5 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc1767e..c025ea2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,18 +63,18 @@ jobs: fail-fast: false matrix: php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ] - sf_version: [ '6.4.*', '7.2.*', '7.3.*' ] + sf_version: [ '6.4.*', '7.3.*', '7.4.*' ] exclude: - php: '8.0' sf_version: '6.4.*' - php: '8.0' - sf_version: '7.2.*' + sf_version: '7.3.*' - php: '8.1' - sf_version: '7.2.*' + sf_version: '7.4.*' - php: '8.0' - sf_version: '7.3.*' + sf_version: '7.4.*' - php: '8.1' - sf_version: '7.3.*' + sf_version: '7.4.*' steps: - name: "Checkout code" From 647f80a40d5008737b0f96ae4d0aca2ed6291792 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 13:20:14 +0100 Subject: [PATCH 5/7] ci: add tests for PHP 8.5 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c025ea2..9e69129 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,7 +70,7 @@ jobs: - php: '8.0' sf_version: '7.3.*' - php: '8.1' - sf_version: '7.4.*' + sf_version: '7.3.*' - php: '8.0' sf_version: '7.4.*' - php: '8.1' From 1b0ca628f7502d79e2f88f9536d4df6993c57041 Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 13:21:58 +0100 Subject: [PATCH 6/7] ci: add tests for PHP 8.5 --- tests/Command/GeocodeCommandTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/Command/GeocodeCommandTest.php b/tests/Command/GeocodeCommandTest.php index 203ef8e..dafb43d 100644 --- a/tests/Command/GeocodeCommandTest.php +++ b/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'); From 2926257d551c0c4c3bc272bfeeb85411ed7a86fc Mon Sep 17 00:00:00 2001 From: Christopher Georg Date: Sat, 20 Dec 2025 13:26:52 +0100 Subject: [PATCH 7/7] ci: add tests for PHP 8.5 --- tests/Validator/Constraint/AddressValidatorTest.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/Validator/Constraint/AddressValidatorTest.php b/tests/Validator/Constraint/AddressValidatorTest.php index be21135..ebf63b0 100644 --- a/tests/Validator/Constraint/AddressValidatorTest.php +++ b/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);