Skip to content

Commit e6b79cc

Browse files
committed
[Notify] Drop Symfony PHPUnit Bridge in favor of PHPUnit >= 11.0
1 parent 387c82b commit e6b79cc

File tree

5 files changed

+36
-13
lines changed

5 files changed

+36
-13
lines changed

src/Notify/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/vendor/
33
/composer.lock
44
/phpunit.xml
5-
/.phpunit.result.cache
5+
/.phpunit.cache

src/Notify/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"symfony/twig-bundle": "^6.4|^7.0|^8.0"
3939
},
4040
"require-dev": {
41+
"phpunit/phpunit": "^11.1|^12.0",
4142
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
42-
"symfony/phpunit-bridge": "^7.2|^8.0",
4343
"symfony/var-dumper": "^6.4|^7.0|^8.0"
4444
},
4545
"conflict": {

src/Notify/phpunit.xml.dist renamed to src/Notify/phpunit.dist.xml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
33
<phpunit
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="vendor/bin/.phpunit/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
66
colors="true"
7-
bootstrap="vendor/autoload.php"
7+
bootstrap="tests/bootstrap.php"
8+
failOnDeprecation="true"
89
failOnRisky="true"
910
failOnWarning="true"
11+
cacheDirectory=".phpunit.cache"
1012
>
1113
<php>
1214
<ini name="error_reporting" value="-1"/>
@@ -20,13 +22,18 @@
2022
</testsuite>
2123
</testsuites>
2224

23-
<coverage>
25+
<source
26+
ignoreSuppressionOfDeprecations="true"
27+
ignoreIndirectDeprecations="true"
28+
restrictNotices="true"
29+
restrictWarnings="true"
30+
>
2431
<include>
25-
<directory>./src</directory>
32+
<directory>src</directory>
2633
</include>
27-
</coverage>
2834

29-
<listeners>
30-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
31-
</listeners>
35+
<deprecationTrigger>
36+
<function>trigger_deprecation</function>
37+
</deprecationTrigger>
38+
</source>
3239
</phpunit>

src/Notify/tests/Twig/NotifyRuntimeTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\UX\Notify\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\UX\Notify\Tests\Kernel\TwigAppKernel;
1617
use Symfony\UX\Notify\Twig\NotifyRuntime;
@@ -22,9 +23,7 @@
2223
*/
2324
class NotifyRuntimeTest extends TestCase
2425
{
25-
/**
26-
* @dataProvider streamNotificationsDataProvider
27-
*/
26+
#[DataProvider('streamNotificationsDataProvider')]
2827
public function testStreamNotifications(array $params, string $expected)
2928
{
3029
$kernel = new TwigAppKernel('test', true);

src/Notify/tests/bootstrap.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
use Symfony\Component\ErrorHandler\ErrorHandler;
13+
14+
require __DIR__.'/../vendor/autoload.php';
15+
16+
// @see https://github.com/symfony/symfony/issues/53812
17+
ErrorHandler::register(null, false);

0 commit comments

Comments
 (0)