Skip to content

Commit 0ff2f5c

Browse files
Merge branch '6.4' into 7.3
* 6.4: use false instead of null to hide the currency symbol [FrameworkBundle] Fix block type from `OK` to `ERROR` when local vault is disabled in `SecretsRemoveCommand` Fix wrong boolean values [Messenger] Fix NoAutoAckStamp handling in Worker::flush()
2 parents 119bcf1 + d28e7e2 commit 0ff2f5c

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Tests/OptionsResolverTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,6 @@ public function testNormalizerCanAccessOtherOptions()
14431443
$this->resolver->setDefault('norm', 'baz');
14441444

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

14491448
return 'normalized';
@@ -1461,8 +1460,7 @@ public function testNormalizerCanAccessLazyOptions()
14611460
$this->resolver->setDefault('norm', 'baz');
14621461

14631462
$this->resolver->setNormalizer('norm', function (Options $options) {
1464-
/** @var TestCase $test */
1465-
Assert::assertEquals('bar', $options['lazy']);
1463+
Assert::assertSame('bar', $options['lazy']);
14661464

14671465
return 'normalized';
14681466
});
@@ -2643,9 +2641,9 @@ public function testResolveOptionsDefinedByOptionConfigurator()
26432641
;
26442642
$introspector = new OptionsResolverIntrospector($this->resolver);
26452643

2646-
$this->assertTrue(true, $this->resolver->isDefined('foo'));
2647-
$this->assertTrue(true, $this->resolver->isDeprecated('foo'));
2648-
$this->assertTrue(true, $this->resolver->hasDefault('foo'));
2644+
$this->assertTrue($this->resolver->isDefined('foo'));
2645+
$this->assertTrue($this->resolver->isDeprecated('foo'));
2646+
$this->assertTrue($this->resolver->hasDefault('foo'));
26492647
$this->assertSame('bar', $introspector->getDefault('foo'));
26502648
$this->assertSame(['string', 'bool'], $introspector->getAllowedTypes('foo'));
26512649
$this->assertSame(['bar', 'zab'], $introspector->getAllowedValues('foo'));

0 commit comments

Comments
 (0)