Skip to content

Commit 119bcf1

Browse files
Merge branch '7.2' into 7.3
* 7.2: [DoctrineBridge] Prevent idle connection listener from running on subrequests [Routing] Add test to validate that default value is allowed to not match requirement 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 afb9a80 + b48517d commit 119bcf1

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
@@ -1443,7 +1443,7 @@ public function testNormalizerCanAccessOtherOptions()
14431443
$this->resolver->setDefault('norm', 'baz');
14441444

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

14491449
return 'normalized';
@@ -1461,7 +1461,7 @@ public function testNormalizerCanAccessLazyOptions()
14611461
$this->resolver->setDefault('norm', 'baz');
14621462

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

14671467
return 'normalized';

0 commit comments

Comments
 (0)