Skip to content

Commit 4baf81e

Browse files
Merge branch '7.4' into 8.0
* 7.4: Use phpunit attribute Remove some implicit bool type juggling [Scheduler] Fix `scheduler.task` tag arguments optionality 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` run tests with PHPUnit 12.1 on PHP >= 8.3 Fix wrong boolean values minor #61328 [FrameworkBundle] Decouple ControllerResolverTest from HttpKernel (nicolas-grekas) [Messenger] Fix NoAutoAckStamp handling in Worker::flush() [DependencyInjection] Dump XML using plain PHP, no DOM needed
2 parents c81524d + e4cfe0b commit 4baf81e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/OptionsResolverTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@ public function testNormalizerCanAccessLazyOptions()
14141414
$this->resolver->setDefault('norm', 'baz');
14151415

14161416
$this->resolver->setNormalizer('norm', function (Options $options) {
1417-
Assert::assertEquals('bar', $options['lazy']);
1417+
Assert::assertSame('bar', $options['lazy']);
14181418

14191419
return 'normalized';
14201420
});
@@ -2242,9 +2242,9 @@ public function testResolveOptionsDefinedByOptionConfigurator()
22422242
;
22432243
$introspector = new OptionsResolverIntrospector($this->resolver);
22442244

2245-
$this->assertTrue(true, $this->resolver->isDefined('foo'));
2246-
$this->assertTrue(true, $this->resolver->isDeprecated('foo'));
2247-
$this->assertTrue(true, $this->resolver->hasDefault('foo'));
2245+
$this->assertTrue($this->resolver->isDefined('foo'));
2246+
$this->assertTrue($this->resolver->isDeprecated('foo'));
2247+
$this->assertTrue($this->resolver->hasDefault('foo'));
22482248
$this->assertSame('bar', $introspector->getDefault('foo'));
22492249
$this->assertSame(['string', 'bool'], $introspector->getAllowedTypes('foo'));
22502250
$this->assertSame(['bar', 'zab'], $introspector->getAllowedValues('foo'));

0 commit comments

Comments
 (0)