Skip to content

Commit b48517d

Browse files
Merge branch '6.4' into 7.2
* 6.4: [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 7da8fba + baee573 commit b48517d

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

13701370
$this->resolver->setNormalizer('norm', function (Options $options) {
1371-
/* @var TestCase $test */
1371+
/** @var TestCase $test */
13721372
Assert::assertSame('bar', $options['default']);
13731373

13741374
return 'normalized';
@@ -1386,7 +1386,7 @@ public function testNormalizerCanAccessLazyOptions()
13861386
$this->resolver->setDefault('norm', 'baz');
13871387

13881388
$this->resolver->setNormalizer('norm', function (Options $options) {
1389-
/* @var TestCase $test */
1389+
/** @var TestCase $test */
13901390
Assert::assertEquals('bar', $options['lazy']);
13911391

13921392
return 'normalized';

0 commit comments

Comments
 (0)