fix(dumper): check for existence before trigerring deprecation

HeahDude · HeahDude · commit 1e4f1859aa55 · 2022-09-29T21:37:48.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1555,14 +1555,15 @@ private function addDefaultParametersMethod(): string
 
     public function getParameter(string $name): array|bool|string|int|float|\UnitEnum|null
     {
-        __trigger_deprecation__
         if (isset($this->buildParameters[$name])) {
+            __trigger_deprecation__
             return $this->buildParameters[$name];
         }
 
         if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
             throw new ParameterNotFoundException($name);
         }
+        __trigger_deprecation__
         if (isset($this->loadedDynamicParameters[$name])) {
             return $this->loadedDynamicParameters[$name] ? $this->dynamicParameters[$name] : $this->getDynamicParameter($name);
         }
@@ -1602,14 +1603,14 @@ public function getParameterBag(): ParameterBagInterface
 
 EOF;
         if ($this->container->getParameterBag()->allDeprecated()) {
-            $code = str_replace("        __trigger_deprecation__", <<<'EOF'
-    if (isset($this->deprecatedParameters[$name])) {
-        $deprecated = $this->deprecatedParameters[$name];
-        trigger_deprecation($deprecated['package'], $deprecated['version'], sprintf($deprecated['message'], $name));
-    }
+            $code = preg_replace("/( +)__trigger_deprecation__/m", <<<'EOF'
+$1if (isset($this->deprecatedParameters[$name])) {
+$1    $deprecated = $this->deprecatedParameters[$name];
+$1    trigger_deprecation($deprecated['package'], $deprecated['version'], sprintf($deprecated['message'], $name));
+$1}
 EOF, $code);
         } else {
-            $code = str_replace("        __trigger_deprecation__\n", '', $code);
+            $code = preg_replace("/ +__trigger_deprecation__\n/m", '', $code);
         }
         if (!$this->asFiles) {
             $code = preg_replace('/^.*buildParameters.*\n.*\n.*\n\n?/m', '', $code);
