Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -45,7 +45,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"
Expand All @@ -62,23 +62,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
Expand Down
7 changes: 6 additions & 1 deletion tests/Command/GeocodeCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, []);
}

Expand Down
4 changes: 1 addition & 3 deletions tests/Validator/Constraint/AddressValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down