Skip to content

Commit 8c91766

Browse files
Merge pull request #661 from alexislefebvre/chore-test-with-symfony-8
chore: support Symfony ^8.0
2 parents 5f9b8eb + 71061f5 commit 8c91766

File tree

3 files changed

+28
-13
lines changed

3 files changed

+28
-13
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ jobs:
5454
- php-version: 8.5
5555
symfony-version: "^7.0"
5656
phpunit-version: "^12.0"
57+
- php-version: 8.4
58+
symfony-version: "^8.0"
59+
phpunit-version: "^12.0"
60+
- php-version: 8.5
61+
symfony-version: "^8.0"
62+
phpunit-version: "^12.0"
5763

5864
steps:
5965
- name: Checkout

composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
"require": {
1818
"php": "^8.0",
1919
"phpunit/phpunit": "^9.6 || ^10.0 || ^11.0 || ^12.0",
20-
"symfony/browser-kit": "^5.4 || ^6.4 || ^7.0",
21-
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0"
20+
"symfony/browser-kit": "^5.4 || ^6.4 || ^7.0 || ^8.0",
21+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0"
2222
},
2323
"require-dev": {
2424
"ext-json": "*",
2525
"doctrine/annotations": "^1.3 || ^2.0",
26-
"doctrine/doctrine-bundle": "^2.11",
27-
"doctrine/orm": "^2.7",
26+
"doctrine/doctrine-bundle": "^2.11 || ^3.1.0",
27+
"doctrine/orm": "^2.7 || ^3.0",
2828
"monolog/monolog": "^1.25.1 || ^2.0 || ^3.0",
29-
"symfony/css-selector": "^5.4 || ^6.4 || ^7.0",
30-
"symfony/doctrine-bridge": "^5.4 || ^6.4 || ^7.0",
31-
"symfony/form": "^5.4 || ^6.4 || ^7.0",
32-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
33-
"symfony/monolog-bundle": "^3.4",
34-
"symfony/security-bundle": "^5.4 || ^6.4 || ^7.0",
35-
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0",
36-
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
37-
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
29+
"symfony/css-selector": "^5.4 || ^6.4 || ^7.0 || ^8.0",
30+
"symfony/doctrine-bridge": "^5.4 || ^6.4 || ^7.0 || ^8.0",
31+
"symfony/form": "^5.4 || ^6.4 || ^7.0 || ^8.0",
32+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0 || ^8.0",
33+
"symfony/monolog-bundle": "^3.4 || ^4.0",
34+
"symfony/security-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
35+
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0 || ^8.0",
36+
"symfony/validator": "^5.4 || ^6.4 || ^7.0 || ^8.0",
37+
"symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0",
3838
"twig/twig": "^2.0 || ^3.8"
3939
},
4040
"conflict": {

tests/Traits/LiipAcmeFixturesTrait.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Liip\Acme\Tests\Traits;
1515

16+
use Doctrine\DBAL\Connection;
1617
use Liip\Acme\Tests\App\Entity\User;
1718
use Symfony\Bundle\FrameworkBundle\Console\Application;
1819
use Symfony\Component\Console\Tester\CommandTester;
@@ -62,7 +63,15 @@ private function resetSchema(): void
6263

6364
$manager = $this->getContainer()->get('doctrine')->getManager();
6465

66+
/** @var Connection $connection */
6567
$connection = $manager->getConnection();
68+
69+
// Doctrine DBAL 3.x deprecated query() in favor of executeQuery()
70+
if (method_exists($connection, 'executeQuery')) {
71+
$connection->executeQuery('DELETE FROM liip_user');
72+
73+
return;
74+
}
6675
$connection->query('DELETE FROM liip_user');
6776
}
6877
}

0 commit comments

Comments
 (0)