Merge branch '5.4' into 6.0

derrabus · derrabus · commit d40a69b5be1c · 2021-12-05T21:36:47.000+01:00
* 5.4:
  Fix TranslationTrait for multiple domains
  Fix parameter types for ProcessHelper::mustRun()
  Fix: Wording
  [SecurityBundle] Fix ambiguous deprecation message on missing provider
  Remove dead code in tests
  Remove return void PHPDoc in test
  Fix merge
diff --git a/Tests/ManagerRegistryTest.php b/Tests/ManagerRegistryTest.php
@@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()
         self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);
     }
 
-    /** @return void */
     private function dumpLazyServiceProjectAsFilesServiceContainer()
     {
         if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther()`
`95`	`95`	`self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue);`
`96`	`96`	`}`
`97`	`97`
`98`		`- /** @return void */`
`99`	`98`	`private function dumpLazyServiceProjectAsFilesServiceContainer()`
`100`	`99`	`{`
`101`	`100`	`if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) {`