fix(dependency-injection): reset env vars with kernel.reset

faizanakram99 · faizanakram99 · commit 4c9e1a40c9b6 · 2025-01-10T10:29:52.000+01:00
- fixes #59128
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.php
@@ -195,6 +195,7 @@ class_exists(WorkflowEvents::class) ? WorkflowEvents::ALIASES : []
                 tagged_iterator('container.env_var_loader'),
             ])
             ->tag('container.env_var_processor')
+            ->tag('kernel.reset', ['method' => 'reset'])
 
         ->set('slugger', AsciiSlugger::class)
             ->args([
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -290,6 +290,14 @@ public function reset(): void
         $this->envCache = $this->services = $this->factories = $this->privates = [];
     }
 
+    /**
+     * @internal
+     */
+    public function resetEnvCache(): void
+    {
+        $this->envCache = [];
+    }
+
     /**
      * Gets all service ids.
      *
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -374,5 +374,9 @@ public function reset(): void
     {
         $this->loadedVars = [];
         $this->loaders = $this->originalLoaders;
+
+        if ($this->container instanceof Container) {
+            $this->container->resetEnvCache();
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,14 @@ public function reset(): void`
`290`	`290`	`$this->envCache = $this->services = $this->factories = $this->privates = [];`
`291`	`291`	`}`
`292`	`292`
	`293`	`+ /**`
	`294`	`+ * @internal`
	`295`	`+ */`
	`296`	`+ public function resetEnvCache(): void`
	`297`	`+ {`
	`298`	`+ $this->envCache = [];`
	`299`	`+ }`
	`300`	`+`
`293`	`301`	`/**`
`294`	`302`	`* Gets all service ids.`
`295`	`303`	`*`
Original file line number	Diff line number	Diff line change
`@@ -374,5 +374,9 @@ public function reset(): void`
`374`	`374`	`{`
`375`	`375`	`$this->loadedVars = [];`
`376`	`376`	`$this->loaders = $this->originalLoaders;`
	`377`	`+`
	`378`	`+ if ($this->container instanceof Container) {`
	`379`	`+ $this->container->resetEnvCache();`
	`380`	`+ }`
`377`	`381`	`}`
`378`	`382`	`}`