-
-
Notifications
You must be signed in to change notification settings - Fork 9.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature #54666 [DependencyInjection] Reset env vars when resetting th…
…e container (faizanakram99) This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [DependencyInjection] Reset env vars when resetting the container | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | yes | Deprecations? | no | Issues | Fix #54627 | License | MIT Commits ------- d0f4330 [DependencyInjection] Reset env vars when resetting the container
- Loading branch information
Showing
9 changed files
with
149 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -287,6 +287,8 @@ public function reset(): void | |
continue; | ||
} | ||
} | ||
|
||
$this->envCache = []; | ||
} | ||
|
||
/** | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
src/Symfony/Component/DependencyInjection/StaticEnvVarLoader.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\DependencyInjection; | ||
|
||
class StaticEnvVarLoader implements EnvVarLoaderInterface | ||
{ | ||
private array $envVars; | ||
|
||
public function __construct(private EnvVarLoaderInterface $envVarLoader) | ||
{ | ||
} | ||
|
||
public function loadEnvVars(): array | ||
{ | ||
return $this->envVars ??= $this->envVarLoader->loadEnvVars(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
src/Symfony/Component/DependencyInjection/Tests/StaticEnvVarLoaderTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\DependencyInjection\Tests; | ||
|
||
use PHPUnit\Framework\TestCase; | ||
use Symfony\Component\DependencyInjection\EnvVarLoaderInterface; | ||
use Symfony\Component\DependencyInjection\StaticEnvVarLoader; | ||
|
||
class StaticEnvVarLoaderTest extends TestCase | ||
{ | ||
public function testLoadEnvVarsCachesInnerLoaderEnvVars() | ||
{ | ||
$innerLoader = new class(['FOO' => 'BAR']) implements EnvVarLoaderInterface { | ||
/** @param array<string, string> */ | ||
public function __construct(public array $envVars = []) | ||
{ | ||
} | ||
|
||
public function loadEnvVars(): array | ||
{ | ||
return $this->envVars; | ||
} | ||
}; | ||
|
||
$loader = new StaticEnvVarLoader($innerLoader); | ||
$this->assertSame(['FOO' => 'BAR'], $loader->loadEnvVars()); | ||
|
||
$innerLoader->envVars = ['BAR' => 'BAZ']; | ||
$this->assertSame(['FOO' => 'BAR'], $loader->loadEnvVars()); | ||
} | ||
} |