Skip to content

Commit 7058dde

Browse files
committed
make test case classes compatible with PHPUnit 10+
1 parent 2b0994e commit 7058dde

File tree

10 files changed

+29
-7
lines changed

10 files changed

+29
-7
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
3.6
5+
---
6+
7+
* Make `HttpClientTestCase` and `TranslatorTest` compatible with PHPUnit 10+
8+
49
3.5
510
---
611

Cache/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"minimum-stability": "dev",
2626
"extra": {
2727
"branch-alias": {
28-
"dev-main": "3.5-dev"
28+
"dev-main": "3.6-dev"
2929
},
3030
"thanks": {
3131
"name": "symfony/contracts",

Deprecation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"minimum-stability": "dev",
2626
"extra": {
2727
"branch-alias": {
28-
"dev-main": "3.5-dev"
28+
"dev-main": "3.6-dev"
2929
},
3030
"thanks": {
3131
"name": "symfony/contracts",

EventDispatcher/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"minimum-stability": "dev",
2626
"extra": {
2727
"branch-alias": {
28-
"dev-main": "3.5-dev"
28+
"dev-main": "3.6-dev"
2929
},
3030
"thanks": {
3131
"name": "symfony/contracts",

HttpClient/Test/HttpClientTestCase.php

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

1212
namespace Symfony\Contracts\HttpClient\Test;
1313

14+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
1617
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
@@ -1013,6 +1014,7 @@ public function testNoProxy()
10131014
/**
10141015
* @requires extension zlib
10151016
*/
1017+
#[RequiresPhpExtension('zlib')]
10161018
public function testAutoEncodingRequest()
10171019
{
10181020
$client = $this->getHttpClient(__FUNCTION__);
@@ -1086,6 +1088,7 @@ public function testInformationalResponseStream()
10861088
/**
10871089
* @requires extension zlib
10881090
*/
1091+
#[RequiresPhpExtension('zlib')]
10891092
public function testUserlandEncodingRequest()
10901093
{
10911094
$client = $this->getHttpClient(__FUNCTION__);
@@ -1108,6 +1111,7 @@ public function testUserlandEncodingRequest()
11081111
/**
11091112
* @requires extension zlib
11101113
*/
1114+
#[RequiresPhpExtension('zlib')]
11111115
public function testGzipBroken()
11121116
{
11131117
$client = $this->getHttpClient(__FUNCTION__);

HttpClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"minimum-stability": "dev",
2828
"extra": {
2929
"branch-alias": {
30-
"dev-main": "3.5-dev"
30+
"dev-main": "3.6-dev"
3131
},
3232
"thanks": {
3333
"name": "symfony/contracts",

Service/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"minimum-stability": "dev",
3333
"extra": {
3434
"branch-alias": {
35-
"dev-main": "3.5-dev"
35+
"dev-main": "3.6-dev"
3636
},
3737
"thanks": {
3838
"name": "symfony/contracts",

Translation/Test/TranslatorTest.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
namespace Symfony\Contracts\Translation\Test;
1313

14+
use PHPUnit\Framework\Attributes\DataProvider;
15+
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
1416
use PHPUnit\Framework\TestCase;
1517
use Symfony\Contracts\Translation\TranslatorInterface;
1618
use Symfony\Contracts\Translation\TranslatorTrait;
@@ -53,6 +55,7 @@ public function getTranslator(): TranslatorInterface
5355
/**
5456
* @dataProvider getTransTests
5557
*/
58+
#[DataProvider('getTransTests')]
5659
public function testTrans($expected, $id, $parameters)
5760
{
5861
$translator = $this->getTranslator();
@@ -63,6 +66,7 @@ public function testTrans($expected, $id, $parameters)
6366
/**
6467
* @dataProvider getTransChoiceTests
6568
*/
69+
#[DataProvider('getTransChoiceTests')]
6670
public function testTransChoiceWithExplicitLocale($expected, $id, $number)
6771
{
6872
$translator = $this->getTranslator();
@@ -75,6 +79,8 @@ public function testTransChoiceWithExplicitLocale($expected, $id, $number)
7579
*
7680
* @dataProvider getTransChoiceTests
7781
*/
82+
#[DataProvider('getTransChoiceTests')]
83+
#[RequiresPhpExtension('intl')]
7884
public function testTransChoiceWithDefaultLocale($expected, $id, $number)
7985
{
8086
$translator = $this->getTranslator();
@@ -85,6 +91,7 @@ public function testTransChoiceWithDefaultLocale($expected, $id, $number)
8591
/**
8692
* @dataProvider getTransChoiceTests
8793
*/
94+
#[DataProvider('getTransChoiceTests')]
8895
public function testTransChoiceWithEnUsPosix($expected, $id, $number)
8996
{
9097
$translator = $this->getTranslator();
@@ -103,6 +110,7 @@ public function testGetSetLocale()
103110
/**
104111
* @requires extension intl
105112
*/
113+
#[RequiresPhpExtension('intl')]
106114
public function testGetLocaleReturnsDefaultLocaleIfNotSet()
107115
{
108116
$translator = $this->getTranslator();
@@ -139,6 +147,7 @@ public static function getTransChoiceTests()
139147
/**
140148
* @dataProvider getInterval
141149
*/
150+
#[DataProvider('getInterval')]
142151
public function testInterval($expected, $number, $interval)
143152
{
144153
$translator = $this->getTranslator();
@@ -164,6 +173,7 @@ public static function getInterval()
164173
/**
165174
* @dataProvider getChooseTests
166175
*/
176+
#[DataProvider('getChooseTests')]
167177
public function testChoose($expected, $id, $number, $locale = null)
168178
{
169179
$translator = $this->getTranslator();
@@ -181,6 +191,7 @@ public function testReturnMessageIfExactlyOneStandardRuleIsGiven()
181191
/**
182192
* @dataProvider getNonMatchingMessages
183193
*/
194+
#[DataProvider('getNonMatchingMessages')]
184195
public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
185196
{
186197
$translator = $this->getTranslator();
@@ -296,6 +307,7 @@ public static function getChooseTests()
296307
/**
297308
* @dataProvider failingLangcodes
298309
*/
310+
#[DataProvider('failingLangcodes')]
299311
public function testFailedLangcodes($nplural, $langCodes)
300312
{
301313
$matrix = $this->generateTestData($langCodes);
@@ -305,6 +317,7 @@ public function testFailedLangcodes($nplural, $langCodes)
305317
/**
306318
* @dataProvider successLangcodes
307319
*/
320+
#[DataProvider('successLangcodes')]
308321
public function testLangcodes($nplural, $langCodes)
309322
{
310323
$matrix = $this->generateTestData($langCodes);

Translation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"minimum-stability": "dev",
2828
"extra": {
2929
"branch-alias": {
30-
"dev-main": "3.5-dev"
30+
"dev-main": "3.6-dev"
3131
},
3232
"thanks": {
3333
"name": "symfony/contracts",

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"minimum-stability": "dev",
4646
"extra": {
4747
"branch-alias": {
48-
"dev-main": "3.5-dev"
48+
"dev-main": "3.6-dev"
4949
}
5050
}
5151
}

0 commit comments

Comments
 (0)