From 6f9cf7dc0d039d8c3de829c7684e28365564d5f7 Mon Sep 17 00:00:00 2001 From: Felipe Martins Date: Wed, 3 May 2017 16:32:28 -0300 Subject: [PATCH 1/3] [DI] Do not throw exception if there is unused env var in config --- .../DependencyInjection/Dumper/PhpDumper.php | 10 ---------- .../Tests/Dumper/PhpDumperTest.php | 13 ------------- 2 files changed, 23 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 28cad05b5952d..8e8e3b03a13a1 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -159,16 +159,6 @@ public function dump(array $options = array()) ; $this->targetDirRegex = null; - $unusedEnvs = array(); - foreach ($this->container->getEnvCounters() as $env => $use) { - if (!$use) { - $unusedEnvs[] = $env; - } - } - if ($unusedEnvs) { - throw new EnvParameterException($unusedEnvs); - } - return $code; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php index c63d5ec18315c..73be8d05735a7 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php @@ -299,19 +299,6 @@ public function testEnvParameter() $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(), '->dump() dumps inline definitions which reference service_container'); } - /** - * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException - * @expectedExceptionMessage Incompatible use of dynamic environment variables "FOO" found in parameters. - */ - public function testUnusedEnvParameter() - { - $container = new ContainerBuilder(); - $container->getParameter('env(FOO)'); - $container->compile(); - $dumper = new PhpDumper($container); - $dumper->dump(); - } - public function testInlinedDefinitionReferencingServiceContainer() { $container = new ContainerBuilder(); From bd27552da98e635f32f8b14d4bd6817fd4e846cc Mon Sep 17 00:00:00 2001 From: Felipe Martins Date: Wed, 3 May 2017 16:36:01 -0300 Subject: [PATCH 2/3] [DI] Mark unused method as deprecated --- src/Symfony/Component/DependencyInjection/ContainerBuilder.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index b2a1d77a6dd9f..9f9cb9204b2f1 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -1080,6 +1080,8 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs /** * Get statistics about env usage. * + * @deprecated unued and must be removed in some next release + * * @return int[] The number of time each env vars has been resolved */ public function getEnvCounters() From 09ac863e2203c5c3bcc72d5e78c026abaaa80ca1 Mon Sep 17 00:00:00 2001 From: Felipe Martins Date: Tue, 16 May 2017 22:11:03 -0300 Subject: [PATCH 3/3] [DI] Fix Typo --- src/Symfony/Component/DependencyInjection/ContainerBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 9f9cb9204b2f1..b76eaea13e772 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -1080,7 +1080,7 @@ public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs /** * Get statistics about env usage. * - * @deprecated unued and must be removed in some next release + * @deprecated unused and must be removed in some next release * * @return int[] The number of time each env vars has been resolved */