fixup

HeahDude · HeahDude · commit 8a2634a471fd · 2022-12-06T09:24:15.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -610,8 +610,10 @@ public function merge(self $container)
         $otherBag = $container->getParameterBag();
         $parameterBag->add($otherBag->all());
 
-        foreach ($otherBag->allDeprecated() as $name => $deprecated) {
-            $parameterBag->deprecate($name, $deprecated['package'], $deprecated['version'], $deprecated['message']);
+        if ($parameterBag instanceof ParameterBag && $otherBag instanceof ParameterBag) {
+            foreach ($otherBag->allDeprecated() as $name => $deprecated) {
+                $parameterBag->deprecate($name, $deprecated['package'], $deprecated['version'], $deprecated['message']);
+            }
         }
 
         if ($this->trackResources) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_deprecated_parameters_as_files.txt
@@ -176,7 +176,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
     return;
 }
 
-require dirname(__DIR__, 5).'/vendor/autoload.php';
+require dirname(__DIR__, %d).'/vendor/autoload.php';
 (require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/getFooService.php';
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {`
`176`	`176`	`return;`
`177`	`177`	`}`
`178`	`178`
`179`		`-require dirname(__DIR__, 5).'/vendor/autoload.php';`
	`179`	`+require dirname(__DIR__, %d).'/vendor/autoload.php';`
`180`	`180`	`(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);`
`181`	`181`	`require __DIR__.'/Container%s/getFooService.php';`
`182`	`182`