Skip to content

feat: allow symfony 8 #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norkunas merged 2 commits into from
Dec 22, 2025
Merged

feat: allow symfony 8 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d231c7
feat: allow symfony 8
Chris8934 Dec 22, 2025
9f2452a
feat: allow symfony 8
Chris8934 Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,22 @@ jobs:
fail-fast: false
matrix:
php: [ '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
sf_version: [ '6.4.*', '7.3.*', '7.4.*' ]
sf_version: [ '6.4.*', '7.3.*', '7.4.*', '8.0.*' ]
exclude:
- php: '8.0'
sf_version: '6.4.*'
- php: '8.0'
sf_version: '7.3.*'
- php: '8.1'
sf_version: '7.3.*'
- php: '8.0'
sf_version: '8.0.*'
- php: '8.1'
sf_version: '8.0.*'
- php: '8.2'
sf_version: '8.0.*'
- php: '8.3'
sf_version: '8.0.*'
- php: '8.0'
sf_version: '7.4.*'
- php: '8.1'
Expand Down
20 changes: 10 additions & 10 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"php": "^8.1",
"geocoder-php/plugin": "^1.5",
"php-http/discovery": "^1.14",
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
"symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
"symfony/console": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/options-resolver": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"willdurand/geocoder": "^4.6|^5.0"
},
"require-dev": {
Expand Down Expand Up @@ -60,13 +60,13 @@
"phpstan/phpstan": "^1.9.2",
"psr/http-client": "^1.0",
"psr/simple-cache": "^1.0 || ^2.0",
"symfony/cache": "^5.4 || ^6.4 || ^7.0",
"symfony/config": "^5.4 || ^6.4 || ^7.0",
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
"symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0",
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
"symfony/var-exporter": "^5.4 || ^6.4 || ^7.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0"
"symfony/cache": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/http-client": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/phpunit-bridge": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/validator": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/var-exporter": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
},
"autoload": {
"psr-4": {
Expand Down
5 changes: 1 addition & 4 deletions src/Command/GeocodeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ public function __construct(ProviderAggregator $geocoder)
parent::__construct();
}

/**
* @return void
*/
protected function configure()
protected function configure(): void
{
$this
->addArgument('address', InputArgument::REQUIRED, 'The address')
Expand Down
4 changes: 1 addition & 3 deletions src/Validator/Constraint/AddressValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@ public function __construct(Provider $addressGeocoder)

/**
* @param mixed $value
*
* @return void
*/
public function validate($value, Constraint $constraint)
public function validate($value, Constraint $constraint): void
{
if (!$constraint instanceof Address) {
throw new UnexpectedTypeException($constraint, Address::class);
Expand Down
12 changes: 6 additions & 6 deletions tests/Functional/BundleInitializationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function testInitBundle(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}
}]);

Expand All @@ -72,7 +72,7 @@ public function testBundleWithOneProviderConfiguration(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/simple.yml');
Expand All @@ -92,7 +92,7 @@ public function testBundleWithCachedProvider(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/cache.yml');
Expand All @@ -114,7 +114,7 @@ public function testCacheLifetimeCanBeNull(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/cache_without_lifetime.yml');
Expand Down Expand Up @@ -144,7 +144,7 @@ public function testBundleWithPluginsYml(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/service_plugin.yml');
Expand All @@ -166,7 +166,7 @@ public function testBundleHasRegisteredDumpers(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}
}]);

Expand Down
12 changes: 6 additions & 6 deletions tests/Functional/GeocoderListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function testPersistForProperty(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down Expand Up @@ -148,7 +148,7 @@ public function testPersistForGetter(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down Expand Up @@ -188,7 +188,7 @@ public function testPersistForStringableGetter(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down Expand Up @@ -228,7 +228,7 @@ public function testPersistForInvalidGetter(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down Expand Up @@ -261,7 +261,7 @@ public function testPersistForEmptyProperty(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down Expand Up @@ -294,7 +294,7 @@ public function testDoesNotGeocodeIfAddressNotChanged(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/listener.yml');
Expand Down
4 changes: 2 additions & 2 deletions tests/Functional/PluginInteractionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/cache_symfony.yml');
Expand All @@ -85,7 +85,7 @@ public function testCachePluginUsesIpFromFakeIpPlugin(): void
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/cache_symfony.yml');
Expand Down
2 changes: 1 addition & 1 deletion tests/Functional/ProviderFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function testProviderConfiguration(string $class, array $serviceNames): v
$kernel->addTestConfig(__DIR__.'/config/framework.yml');

if ($kernel::VERSION_ID >= 60000) {
$kernel->addTestConfig(__DIR__.'/config/framework_sf6.yml');
$kernel->addTestConfig(__DIR__.'/config/framework_sf'.$kernel::MAJOR_VERSION.'.yml');
}

$kernel->addTestConfig(__DIR__.'/config/provider/'.strtolower(substr($class, strrpos($class, '\\') + 1)).'.yml');
Expand Down
5 changes: 5 additions & 0 deletions tests/Functional/config/framework_sf7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
framework:
annotations: false
handle_all_throwables: true
php_errors:
log: true
4 changes: 4 additions & 0 deletions tests/Functional/config/framework_sf8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
framework:
handle_all_throwables: true
php_errors:
log: true