Skip to content

Commit 96174bd

Browse files
Merge branch '7.4' into 8.0
* 7.4: [HttpKernel][Security] Refactor: use `getAttributes` with argument mark getRequiredOptions()/getDefaultOption() of UniqueEntity as deprecated do not install ext-zstd on PHP 8.5 [DoctrineBridge] Prevent idle connection listener from running on subrequests optimize `in_array` calls [Routing] Add test to validate that default value is allowed to not match requirement [DependencyInjection] Fix proxying services defined with an abstract class and a factory fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
2 parents a2dafdc + 119bcf1 commit 96174bd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/OptionsResolverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ public function testNormalizerCanAccessOtherOptions()
14051405
$this->resolver->setDefault('norm', 'baz');
14061406

14071407
$this->resolver->setNormalizer('norm', function (Options $options) {
1408-
/* @var TestCase $test */
1408+
/** @var TestCase $test */
14091409
Assert::assertSame('bar', $options['default']);
14101410

14111411
return 'normalized';
@@ -1423,7 +1423,7 @@ public function testNormalizerCanAccessLazyOptions()
14231423
$this->resolver->setDefault('norm', 'baz');
14241424

14251425
$this->resolver->setNormalizer('norm', function (Options $options) {
1426-
/* @var TestCase $test */
1426+
/** @var TestCase $test */
14271427
Assert::assertEquals('bar', $options['lazy']);
14281428

14291429
return 'normalized';

0 commit comments

Comments
 (0)