Skip to content

Commit 1d321c4

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: (34 commits) improve amqp connection issues [Serializer] [ObjectNormalizer] Filter int when using FILTER_BOOL Fix #53778 [PropertyInfo] Add missing test fix tests [Security][Validators] Review translations. [validator] Updated Dutch translation [FrameworkBundle] Fix wiring ConsoleProfilerListener [HttpKernel] Fix link to php doc [Validator] Update sr_Cyrl 120:This value is not a valid slug. [Validator] Update sr_Latn 120:This value is not a valid slug. 6.4 Missing translations for Italian (it) #59419 tests(notifier): avoid failing SNS test with local AWS configuration Fix typo ratio comment chore: PropertyAccess - fix typo in DocBlock [Validator] Missing translations for Brazilian Portuguese (pt_BR) fix(dependency-injection): reset env vars with kernel.reset [Translation][Validator] Review Russian translation (114 - 120) Review validator-related persian translation with id 120 [Scheduler] Clarify description of exclusion time ...
2 parents a475747 + 5ebf7d4 commit 1d321c4

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

Container.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,14 @@ public function reset(): void
291291
$this->envCache = $this->services = $this->factories = $this->privates = [];
292292
}
293293

294+
/**
295+
* @internal
296+
*/
297+
public function resetEnvCache(): void
298+
{
299+
$this->envCache = [];
300+
}
301+
294302
/**
295303
* Gets all service ids.
296304
*

EnvVarProcessor.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,5 +380,9 @@ public function reset(): void
380380
{
381381
$this->loadedVars = [];
382382
$this->loaders = $this->originalLoaders;
383+
384+
if ($this->container instanceof Container) {
385+
$this->container->resetEnvCache();
386+
}
383387
}
384388
}

0 commit comments

Comments
 (0)