Skip to content

Commit 8ec8cfc

Browse files
KocalKocal
committed
Drop Symfony PHPUnit bridge for PHPUnit
1 parent ab44abf commit 8ec8cfc

File tree

9 files changed

+59
-53
lines changed

9 files changed

+59
-53
lines changed

‎.github/workflows/test-turbo.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ jobs:
2828
with:
2929
working-directory: src/Turbo
3030

31-
- name: Install PHPUnit dependencies
32-
working-directory: src/Turbo
33-
run: vendor/bin/simple-phpunit --version
34-
3531
- name: PHPStan
3632
working-directory: src/Turbo
3733
run: vendor/bin/phpstan analyse --no-progress
@@ -93,8 +89,4 @@ jobs:
9389

9490
- name: Run tests
9591
working-directory: src/Turbo
96-
run: |
97-
[ 'lowest' = '${{ matrix.dependency-version }}' ] && export SYMFONY_DEPRECATIONS_HELPER=weak
98-
vendor/bin/simple-phpunit
99-
env:
100-
SYMFONY_DEPRECATIONS_HELPER: 'max[self]=1'
92+
run: vendor/bin/phpunit

‎.github/workflows/test.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,14 @@ jobs:
124124

125125
- name: ${{ matrix.component }} Tests
126126
working-directory: "src/${{ matrix.component }}"
127-
run: vendor/bin/simple-phpunit
127+
env:
128+
PHP_VERSION: "${{ matrix.php-version }}"
129+
run: |
130+
if [[ "$PHP_VERSION" == "8.1" ]]; then
131+
vendor/bin/simple-phpunit
132+
else
133+
vendor/bin/phpunit
134+
fi
128135
129136
tests-js:
130137
runs-on: ubuntu-latest

‎src/Map/composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@
3636
"symfony/stimulus-bundle": "^2.18.1"
3737
},
3838
"require-dev": {
39+
"phpunit/phpunit": "^12.0",
3940
"symfony/asset-mapper": "^6.4|^7.0",
4041
"symfony/framework-bundle": "^6.4|^7.0",
41-
"symfony/phpunit-bridge": "^6.4|^7.0",
42+
"symfony/phpunit-bridge": "^7.2",
4243
"symfony/twig-bundle": "^6.4|^7.0",
4344
"symfony/ux-twig-component": "^2.18",
4445
"symfony/ux-icons": "^2.18"

‎src/Map/phpunit.xml.dist‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" ?>
22
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
5-
colors="true"
6-
bootstrap="vendor/autoload.php"
7-
failOnRisky="true"
8-
failOnWarning="true"
3+
<phpunit
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
6+
colors="true"
7+
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
10+
displayDetailsOnTestsThatTriggerWarnings="true"
911
>
10-
<coverage processUncoveredFiles="true">
12+
<source>
1113
<include>
12-
<directory suffix=".php">./src</directory>
14+
<directory>./src</directory>
1315
</include>
14-
</coverage>
15-
16+
</source>
17+
1618
<php>
17-
<ini name="error_reporting" value="-1"/>
18-
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
19+
<ini name="error_reporting" value="-1" />
20+
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0" />
1921
</php>
2022

2123
<testsuites>

‎src/Map/src/Bridge/Google/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/ux-map": "^2.19"
2222
},
2323
"require-dev": {
24-
"symfony/phpunit-bridge": "^6.4|^7.0",
24+
"phpunit/phpunit": "^12.0",
2525
"symfony/ux-icons": "^2.18"
2626
},
2727
"autoload": {

‎src/Map/src/Bridge/Google/phpunit.xml.dist‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" ?>
22
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
5-
colors="true"
6-
bootstrap="vendor/autoload.php"
7-
failOnRisky="true"
8-
failOnWarning="true"
3+
<phpunit
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
6+
colors="true"
7+
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
10+
displayDetailsOnTestsThatTriggerWarnings="true"
911
>
10-
<coverage processUncoveredFiles="true">
12+
<source>
1113
<include>
12-
<directory suffix=".php">./src</directory>
14+
<directory>./src</directory>
1315
</include>
14-
</coverage>
15-
16+
</source>
17+
1618
<php>
17-
<ini name="error_reporting" value="-1"/>
18-
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
19+
<ini name="error_reporting" value="-1" />
20+
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0" />
1921
</php>
2022

2123
<testsuites>

‎src/Map/src/Bridge/Leaflet/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/ux-map": "^2.19"
2222
},
2323
"require-dev": {
24-
"symfony/phpunit-bridge": "^6.4|^7.0",
24+
"phpunit/phpunit": "^12.0",
2525
"symfony/ux-icons": "^2.18"
2626
},
2727
"autoload": {

‎src/Map/src/Bridge/Leaflet/phpunit.xml.dist‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="UTF-8" ?>
22
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
3-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
5-
colors="true"
6-
bootstrap="vendor/autoload.php"
7-
failOnRisky="true"
8-
failOnWarning="true"
3+
<phpunit
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
6+
colors="true"
7+
bootstrap="vendor/autoload.php"
8+
failOnRisky="true"
9+
failOnWarning="true"
10+
displayDetailsOnTestsThatTriggerWarnings="true"
911
>
10-
<coverage processUncoveredFiles="true">
12+
<source>
1113
<include>
12-
<directory suffix=".php">./src</directory>
14+
<directory>./src</directory>
1315
</include>
14-
</coverage>
15-
16+
</source>
17+
1618
<php>
17-
<ini name="error_reporting" value="-1"/>
18-
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
19+
<ini name="error_reporting" value="-1" />
20+
<server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0" />
1921
</php>
2022

2123
<testsuites>

‎ux.symfony.com/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"symfony/css-selector": "7.2.*",
7171
"symfony/debug-bundle": "7.2.*",
7272
"symfony/maker-bundle": "^1.61",
73-
"symfony/phpunit-bridge": "7.2.*",
73+
"symfony/phpunit-bridge": "^7.2",
7474
"symfony/stopwatch": "7.2.*",
7575
"symfony/web-profiler-bundle": "7.2.*",
7676
"vincentlanglet/twig-cs-fixer": "3.1.*",

0 commit comments

Comments
 (0)