Skip to content

Commit 409fb33

Browse files
committed
[Translator] Drop Symfony PHPUnit Bridge in favor of PHPUnit >= 11.0
1 parent cd38d59 commit 409fb33

File tree

9 files changed

+31
-26
lines changed

9 files changed

+31
-26
lines changed

src/Translator/.gitignore

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

77
/var

src/Translator/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"symfony/translation": "^6.4|^7.0|^8.0"
3636
},
3737
"require-dev": {
38+
"phpunit/phpunit": "^11.1|^12.0",
3839
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
39-
"symfony/phpunit-bridge": "^7.2|^8.0",
4040
"symfony/var-dumper": "^6.4|^7.0|^8.0",
4141
"symfony/yaml": "^6.4|^7.0|^8.0"
4242
},

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
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"
77
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"/>
1315
<env name="SHELL_VERBOSITY" value="-1"/>
14-
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
1516
</php>
1617

1718
<testsuites>
@@ -20,13 +21,18 @@
2021
</testsuite>
2122
</testsuites>
2223

23-
<coverage>
24+
<source
25+
ignoreSuppressionOfDeprecations="true"
26+
ignoreIndirectDeprecations="true"
27+
restrictNotices="true"
28+
restrictWarnings="true"
29+
>
2430
<include>
25-
<directory>./src</directory>
31+
<directory>src</directory>
2632
</include>
27-
</coverage>
2833

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

src/Translator/tests/Intl/IntlMessageParserTest.php

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

1212
namespace Symfony\UX\Translator\Tests\Intl;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\UX\Translator\Intl\ErrorKind;
1617
use Symfony\UX\Translator\Intl\IntlMessageParser;
@@ -20,9 +21,7 @@
2021

2122
class IntlMessageParserTest extends TestCase
2223
{
23-
/**
24-
* @dataProvider provideParse
25-
*/
24+
#[DataProvider('provideParse')]
2625
public function testIntlMessageParser(string $message, array $expectedAst)
2726
{
2827
$intlMessageParser = new IntlMessageParser($message);

src/Translator/tests/MessageParameters/Extractor/IntlMessageParametersExtractorTest.php

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

1212
namespace Symfony\UX\Translator\Tests\MessageParameters;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\UX\Translator\MessageParameters\Extractor\IntlMessageParametersExtractor;
1617

1718
class IntlMessageParametersExtractorTest extends TestCase
1819
{
19-
/**
20-
* @dataProvider provideExtract
21-
*/
20+
#[DataProvider('provideExtract')]
2221
public function testExtract(string $message, array $expectedParameters)
2322
{
2423
$intlMessageParametersExtractor = new IntlMessageParametersExtractor();

src/Translator/tests/MessageParameters/Extractor/MessageParametersExtractorTest.php

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

1212
namespace Symfony\UX\Translator\Tests\MessageParameters;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\UX\Translator\MessageParameters\Extractor\MessageParametersExtractor;
1617

1718
class MessageParametersExtractorTest extends TestCase
1819
{
19-
/**
20-
* @dataProvider provideExtract
21-
*/
20+
#[DataProvider('provideExtract')]
2221
public function testExtract(string $message, array $expectedParameters)
2322
{
2423
$messageParametersExtractor = new MessageParametersExtractor();

src/Translator/tests/MessageParameters/Printer/TypeScriptMessageParametersPrinterTest.php

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

1212
namespace Symfony\UX\Translator\Tests\Printer;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\UX\Translator\MessageParameters\Printer\TypeScriptMessageParametersPrinter;
1617

1718
class TypeScriptMessageParametersPrinterTest extends TestCase
1819
{
19-
/**
20-
* @dataProvider providePrint
21-
*/
20+
#[DataProvider('providePrint')]
2221
public function testPrint(array $parameters, string $expectedTypeScriptType)
2322
{
2423
$typeScriptMessageParametersPrinter = new TypeScriptMessageParametersPrinter();

src/Translator/tests/UxTranslatorBundleTest.php

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

1212
namespace Symfony\UX\Translator\Tests;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\HttpKernel\Kernel;
1617
use Symfony\UX\Translator\Tests\Kernel\EmptyAppKernel;
@@ -24,9 +25,7 @@ public static function provideKernels()
2425
yield 'framework' => [new FrameworkAppKernel('test', true)];
2526
}
2627

27-
/**
28-
* @dataProvider provideKernels
29-
*/
28+
#[DataProvider('provideKernels')]
3029
public function testBootKernel(Kernel $kernel)
3130
{
3231
$kernel->boot();

src/Translator/tests/bootstrap.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111

1212
use Symfony\Bundle\FrameworkBundle\Console\Application;
1313
use Symfony\Component\Console\Input\StringInput;
14+
use Symfony\Component\ErrorHandler\ErrorHandler;
1415
use Symfony\Component\Filesystem\Filesystem;
1516
use Symfony\UX\Translator\Tests\Kernel\FrameworkAppKernel;
1617

1718
require __DIR__.'/../vendor/autoload.php';
1819

1920
(new Filesystem())->remove(__DIR__.'/../var');
2021

22+
// @see https://github.com/symfony/symfony/issues/53812
23+
ErrorHandler::register(null, false);
24+
2125
$kernel = new FrameworkAppKernel('test', true);
2226
$application = new Application($kernel);
2327

2428
// Trigger Symfony Translator and UX Translator cache warmers
25-
$application->run(new StringInput('cache:clear'));
29+
// $application->run(new StringInput('cache:clear'));

0 commit comments

Comments
 (0)