Skip to content

Commit cfb3361

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 a839550 + 4ed8624 commit cfb3361

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/DataCollector/LoggerDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function testCollectWithUnexpectedFormat()
3333

3434
$c = new LoggerDataCollector($logger, __DIR__.'/');
3535
$c->lateCollect();
36-
$compilerLogs = $c->getCompilerLogs()->getValue('message');
36+
$compilerLogs = $c->getCompilerLogs()->getValue(true);
3737

3838
$this->assertSame([
3939
['message' => 'Removed service "Psr\Container\ContainerInterface"; reason: private alias.'],

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ public function testAutowireAttribute()
510510
$this->assertInstanceOf(\stdClass::class, $locator->get('serviceAsValue'));
511511
$this->assertInstanceOf(\stdClass::class, $locator->get('expressionAsValue'));
512512
$this->assertSame('bar', $locator->get('rawValue'));
513-
$this->stringContains('Symfony_Component_HttpKernel_Tests_Fixtures_Suit_APP_SUIT', $locator->get('suit'));
513+
$this->assertStringContainsString('Symfony_Component_HttpKernel_Tests_Fixtures_Suit_APP_SUIT', $locator->get('suit'));
514514
$this->assertSame('@bar', $locator->get('escapedRawValue'));
515515
$this->assertSame('foo', $locator->get('customAutowire'));
516516
$this->assertInstanceOf(FooInterface::class, $autowireCallable = $locator->get('autowireCallable'));

0 commit comments

Comments
 (0)