Skip to content

Commit 1ee26c4

Browse files
xabbuhxabbuh
committed
run tests using PHPUnit 11.5
1 parent 9a9537a commit 1ee26c4

File tree

2 files changed

+64
-89
lines changed

2 files changed

+64
-89
lines changed

‎Tests/OptionsResolverTest.php‎

Lines changed: 56 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
namespace Symfony\Component\OptionsResolver\Tests;
1313

1414
use PHPUnit\Framework\Assert;
15+
use PHPUnit\Framework\Attributes\Group;
16+
use PHPUnit\Framework\Attributes\IgnoreDeprecations;
1517
use PHPUnit\Framework\TestCase;
16-
use Symfony\Bridge\PhpUnit\ExpectUserDeprecationMessageTrait;
1718
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
1819
use Symfony\Component\OptionsResolver\Exception\AccessException;
1920
use Symfony\Component\OptionsResolver\Exception\InvalidArgumentException;
@@ -27,8 +28,6 @@
2728

2829
class OptionsResolverTest extends TestCase
2930
{
30-
use ExpectUserDeprecationMessageTrait;
31-
3231
private OptionsResolver $resolver;
3332

3433
protected function setUp(): void
@@ -1094,9 +1093,8 @@ public function testFailIfSetAllowedValuesFromLazyOption()
10941093
$this->resolver->resolve();
10951094
}
10961095

1097-
/**
1098-
* @group legacy
1099-
*/
1096+
#[IgnoreDeprecations]
1097+
#[Group('legacy')]
11001098
public function testLegacyResolveFailsIfInvalidValueFromNestedOption()
11011099
{
11021100
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -1113,9 +1111,8 @@ public function testLegacyResolveFailsIfInvalidValueFromNestedOption()
11131111
$this->resolver->resolve(['foo' => ['bar' => 'invalid value']]);
11141112
}
11151113

1116-
/**
1117-
* @group legacy
1118-
*/
1114+
#[IgnoreDeprecations]
1115+
#[Group('legacy')]
11191116
public function testLegacyResolveFailsIfInvalidTypeFromNestedOption()
11201117
{
11211118
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -1443,7 +1440,6 @@ public function testNormalizerCanAccessOtherOptions()
14431440
$this->resolver->setDefault('norm', 'baz');
14441441

14451442
$this->resolver->setNormalizer('norm', function (Options $options) {
1446-
/** @var TestCase $test */
14471443
Assert::assertSame('bar', $options['default']);
14481444

14491445
return 'normalized';
@@ -1461,7 +1457,6 @@ public function testNormalizerCanAccessLazyOptions()
14611457
$this->resolver->setDefault('norm', 'baz');
14621458

14631459
$this->resolver->setNormalizer('norm', function (Options $options) {
1464-
/** @var TestCase $test */
14651460
Assert::assertEquals('bar', $options['lazy']);
14661461

14671462
return 'normalized';
@@ -2250,9 +2245,8 @@ public function testNestedArrayException5()
22502245
]);
22512246
}
22522247

2253-
/**
2254-
* @group legacy
2255-
*/
2248+
#[IgnoreDeprecations]
2249+
#[Group('legacy')]
22562250
public function testLegacyIsNestedOption()
22572251
{
22582252
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2265,9 +2259,8 @@ public function testLegacyIsNestedOption()
22652259
$this->assertTrue($this->resolver->isNested('database'));
22662260
}
22672261

2268-
/**
2269-
* @group legacy
2270-
*/
2262+
#[IgnoreDeprecations]
2263+
#[Group('legacy')]
22712264
public function testLegacyFailsIfUndefinedNestedOption()
22722265
{
22732266
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2287,9 +2280,8 @@ public function testLegacyFailsIfUndefinedNestedOption()
22872280
]);
22882281
}
22892282

2290-
/**
2291-
* @group legacy
2292-
*/
2283+
#[IgnoreDeprecations]
2284+
#[Group('legacy')]
22932285
public function testLegacyFailsIfMissingRequiredNestedOption()
22942286
{
22952287
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2309,9 +2301,8 @@ public function testLegacyFailsIfMissingRequiredNestedOption()
23092301
]);
23102302
}
23112303

2312-
/**
2313-
* @group legacy
2314-
*/
2304+
#[IgnoreDeprecations]
2305+
#[Group('legacy')]
23152306
public function testLegacyFailsIfInvalidTypeNestedOption()
23162307
{
23172308
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2333,9 +2324,8 @@ public function testLegacyFailsIfInvalidTypeNestedOption()
23332324
]);
23342325
}
23352326

2336-
/**
2337-
* @group legacy
2338-
*/
2327+
#[IgnoreDeprecations]
2328+
#[Group('legacy')]
23392329
public function testLegacyFailsIfNotArrayIsGivenForNestedOptions()
23402330
{
23412331
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2355,9 +2345,8 @@ public function testLegacyFailsIfNotArrayIsGivenForNestedOptions()
23552345
]);
23562346
}
23572347

2358-
/**
2359-
* @group legacy
2360-
*/
2348+
#[IgnoreDeprecations]
2349+
#[Group('legacy')]
23612350
public function testLegacyResolveNestedOptionsWithoutDefault()
23622351
{
23632352
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2376,9 +2365,8 @@ public function testLegacyResolveNestedOptionsWithoutDefault()
23762365
$this->assertSame($expectedOptions, $actualOptions);
23772366
}
23782367

2379-
/**
2380-
* @group legacy
2381-
*/
2368+
#[IgnoreDeprecations]
2369+
#[Group('legacy')]
23822370
public function testLegacyResolveNestedOptionsWithDefault()
23832371
{
23842372
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2403,9 +2391,8 @@ public function testLegacyResolveNestedOptionsWithDefault()
24032391
$this->assertSame($expectedOptions, $actualOptions);
24042392
}
24052393

2406-
/**
2407-
* @group legacy
2408-
*/
2394+
#[IgnoreDeprecations]
2395+
#[Group('legacy')]
24092396
public function testLegacyResolveMultipleNestedOptions()
24102397
{
24112398
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2447,9 +2434,8 @@ public function testLegacyResolveMultipleNestedOptions()
24472434
$this->assertSame($expectedOptions, $actualOptions);
24482435
}
24492436

2450-
/**
2451-
* @group legacy
2452-
*/
2437+
#[IgnoreDeprecations]
2438+
#[Group('legacy')]
24532439
public function testLegacyResolveLazyOptionUsingNestedOption()
24542440
{
24552441
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2468,9 +2454,8 @@ public function testLegacyResolveLazyOptionUsingNestedOption()
24682454
$this->assertSame($expectedOptions, $actualOptions);
24692455
}
24702456

2471-
/**
2472-
* @group legacy
2473-
*/
2457+
#[IgnoreDeprecations]
2458+
#[Group('legacy')]
24742459
public function testLegacyNormalizeNestedOptionValue()
24752460
{
24762461
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2499,9 +2484,8 @@ public function testLegacyNormalizeNestedOptionValue()
24992484
$this->assertSame($expectedOptions, $actualOptions);
25002485
}
25012486

2502-
/**
2503-
* @group legacy
2504-
*/
2487+
#[IgnoreDeprecations]
2488+
#[Group('legacy')]
25052489
public function testOverwrittenNestedOptionNotEvaluatedIfLazyDefault()
25062490
{
25072491
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2515,9 +2499,8 @@ public function testOverwrittenNestedOptionNotEvaluatedIfLazyDefault()
25152499
$this->assertSame(['foo' => 'lazy'], $this->resolver->resolve());
25162500
}
25172501

2518-
/**
2519-
* @group legacy
2520-
*/
2502+
#[IgnoreDeprecations]
2503+
#[Group('legacy')]
25212504
public function testOverwrittenNestedOptionNotEvaluatedIfScalarDefault()
25222505
{
25232506
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2531,9 +2514,8 @@ public function testOverwrittenNestedOptionNotEvaluatedIfScalarDefault()
25312514
$this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
25322515
}
25332516

2534-
/**
2535-
* @group legacy
2536-
*/
2517+
#[IgnoreDeprecations]
2518+
#[Group('legacy')]
25372519
public function testOverwrittenLazyOptionNotEvaluatedIfNestedOption()
25382520
{
25392521
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2549,9 +2531,8 @@ public function testOverwrittenLazyOptionNotEvaluatedIfNestedOption()
25492531
$this->assertSame(['foo' => ['bar' => 'baz']], $this->resolver->resolve());
25502532
}
25512533

2552-
/**
2553-
* @group legacy
2554-
*/
2534+
#[IgnoreDeprecations]
2535+
#[Group('legacy')]
25552536
public function testLegacyResolveAllNestedOptionDefinitions()
25562537
{
25572538
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2571,9 +2552,8 @@ public function testLegacyResolveAllNestedOptionDefinitions()
25712552
$this->assertSame(['foo' => ['ping' => 'pong', 'bar' => 'baz']], $this->resolver->resolve());
25722553
}
25732554

2574-
/**
2575-
* @group legacy
2576-
*/
2555+
#[IgnoreDeprecations]
2556+
#[Group('legacy')]
25772557
public function testLegacyNormalizeNestedValue()
25782558
{
25792559
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2591,9 +2571,8 @@ public function testLegacyNormalizeNestedValue()
25912571
$this->assertSame(['foo' => ['bar' => 'baz']], $this->resolver->resolve());
25922572
}
25932573

2594-
/**
2595-
* @group legacy
2596-
*/
2574+
#[IgnoreDeprecations]
2575+
#[Group('legacy')]
25972576
public function testLegacyFailsIfCyclicDependencyBetweenSameNestedOption()
25982577
{
25992578
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2607,9 +2586,8 @@ public function testLegacyFailsIfCyclicDependencyBetweenSameNestedOption()
26072586
$this->resolver->resolve();
26082587
}
26092588

2610-
/**
2611-
* @group legacy
2612-
*/
2589+
#[IgnoreDeprecations]
2590+
#[Group('legacy')]
26132591
public function testLegacyFailsIfCyclicDependencyBetweenNestedOptionAndParentLazyOption()
26142592
{
26152593
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2626,9 +2604,8 @@ public function testLegacyFailsIfCyclicDependencyBetweenNestedOptionAndParentLaz
26262604
$this->resolver->resolve();
26272605
}
26282606

2629-
/**
2630-
* @group legacy
2631-
*/
2607+
#[IgnoreDeprecations]
2608+
#[Group('legacy')]
26322609
public function testLegacyFailsIfCyclicDependencyBetweenNormalizerAndNestedOption()
26332610
{
26342611
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2647,9 +2624,8 @@ public function testLegacyFailsIfCyclicDependencyBetweenNormalizerAndNestedOptio
26472624
$this->resolver->resolve();
26482625
}
26492626

2650-
/**
2651-
* @group legacy
2652-
*/
2627+
#[IgnoreDeprecations]
2628+
#[Group('legacy')]
26532629
public function testLegacyFailsIfCyclicDependencyBetweenNestedOptions()
26542630
{
26552631
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2666,9 +2642,8 @@ public function testLegacyFailsIfCyclicDependencyBetweenNestedOptions()
26662642
$this->resolver->resolve();
26672643
}
26682644

2669-
/**
2670-
* @group legacy
2671-
*/
2645+
#[IgnoreDeprecations]
2646+
#[Group('legacy')]
26722647
public function testLegacyGetAccessToParentOptionFromNestedOption()
26732648
{
26742649
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2700,9 +2675,8 @@ public function testNestedClosureWithoutTypeHint2ndArgumentNotInvoked()
27002675
$this->assertSame(['foo' => $closure], $this->resolver->resolve());
27012676
}
27022677

2703-
/**
2704-
* @group legacy
2705-
*/
2678+
#[IgnoreDeprecations]
2679+
#[Group('legacy')]
27062680
public function testLegacyResolveLazyOptionWithTransitiveDefaultDependency()
27072681
{
27082682
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2729,9 +2703,8 @@ public function testLegacyResolveLazyOptionWithTransitiveDefaultDependency()
27292703
$this->assertSame($expectedOptions, $actualOptions);
27302704
}
27312705

2732-
/**
2733-
* @group legacy
2734-
*/
2706+
#[IgnoreDeprecations]
2707+
#[Group('legacy')]
27352708
public function testLegacyAccessToParentOptionFromNestedNormalizerAndLazyOption()
27362709
{
27372710
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2860,9 +2833,8 @@ public function testInfoOnInvalidValue()
28602833
$this->resolver->resolve(['expires' => new \DateTimeImmutable('-1 hour')]);
28612834
}
28622835

2863-
/**
2864-
* @group legacy
2865-
*/
2836+
#[IgnoreDeprecations]
2837+
#[Group('legacy')]
28662838
public function testLegacyInvalidValueForPrototypeDefinition()
28672839
{
28682840
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2880,9 +2852,8 @@ public function testLegacyInvalidValueForPrototypeDefinition()
28802852
$this->resolver->resolve(['connections' => ['foo']]);
28812853
}
28822854

2883-
/**
2884-
* @group legacy
2885-
*/
2855+
#[IgnoreDeprecations]
2856+
#[Group('legacy')]
28862857
public function testLegacyMissingOptionForPrototypeDefinition()
28872858
{
28882859
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');
@@ -2911,9 +2882,8 @@ public function testAccessExceptionOnPrototypeDefinition()
29112882
$this->resolver->setPrototype(true);
29122883
}
29132884

2914-
/**
2915-
* @group legacy
2916-
*/
2885+
#[IgnoreDeprecations]
2886+
#[Group('legacy')]
29172887
public function testLegacyPrototypeDefinition()
29182888
{
29192889
$this->expectUserDeprecationMessage('Since symfony/options-resolver 7.3: Defining nested options via "Symfony\Component\OptionsResolver\OptionsResolver::setDefault()" is deprecated and will be removed in Symfony 8.0, use "setOptions()" method instead.');

‎phpunit.xml.dist‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.3/phpunit.xsd"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
55
backupGlobals="false"
66
colors="true"
77
bootstrap="vendor/autoload.php"
8+
failOnDeprecation="true"
89
failOnRisky="true"
910
failOnWarning="true"
1011
>
@@ -18,7 +19,7 @@
1819
</testsuite>
1920
</testsuites>
2021

21-
<coverage>
22+
<source ignoreSuppressionOfDeprecations="true">
2223
<include>
2324
<directory>./</directory>
2425
</include>
@@ -27,5 +28,9 @@
2728
<directory>./Tests</directory>
2829
<directory>./vendor</directory>
2930
</exclude>
30-
</coverage>
31+
</source>
32+
33+
<extensions>
34+
<bootstrap class="Symfony\Bridge\PhpUnit\SymfonyExtension" />
35+
</extensions>
3136
</phpunit>

0 commit comments

Comments
 (0)