Use EnvParameterException

dunglas · dunglas · commit b456b2b04df2 · 2017-10-25T09:18:49.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckDefinitionValidityPass.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\EnvParameterException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
 /**
@@ -78,14 +79,14 @@ public function process(ContainerBuilder $container)
 
             $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
             if (null !== $usedEnvs) {
-                throw new RuntimeException(sprintf('A service name ("%s") cannot contain dynamic values.', $resolvedId));
+                throw new EnvParameterException(sprintf('A service name ("%s") cannot contain dynamic values.', $resolvedId));
             }
         }
 
         foreach ($container->getAliases() as $id => $alias) {
             $resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);
             if (null !== $usedEnvs) {
-                throw new RuntimeException(sprintf('An alias name ("%s") cannot contain dynamic values.', $resolvedId));
+                throw new EnvParameterException(sprintf('An alias name ("%s") cannot contain dynamic values.', $resolvedId));
             }
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckDefinitionValidityPassTest.php
@@ -77,7 +77,7 @@ public function testInvalidTags()
     }
 
     /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException
      */
     public function testDynamicServiceName()
     {
@@ -89,7 +89,7 @@ public function testDynamicServiceName()
     }
 
     /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException
      */
     public function testDynamicAliasName()
     {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Compiler;`
`13`	`13`
`14`	`14`	`use Symfony\Component\DependencyInjection\ContainerBuilder;`
	`15`	`+use Symfony\Component\DependencyInjection\Exception\EnvParameterException;`
`15`	`16`	`use Symfony\Component\DependencyInjection\Exception\RuntimeException;`
`16`	`17`
`17`	`18`	`/**`
`@@ -78,14 +79,14 @@ public function process(ContainerBuilder $container)`
`78`	`79`
`79`	`80`	`$resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);`
`80`	`81`	`if (null !== $usedEnvs) {`
`81`		`- throw new RuntimeException(sprintf('A service name ("%s") cannot contain dynamic values.', $resolvedId));`
	`82`	`+ throw new EnvParameterException(sprintf('A service name ("%s") cannot contain dynamic values.', $resolvedId));`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`foreach ($container->getAliases() as $id => $alias) {`
`86`	`87`	`$resolvedId = $container->resolveEnvPlaceholders($id, null, $usedEnvs);`
`87`	`88`	`if (null !== $usedEnvs) {`
`88`		`- throw new RuntimeException(sprintf('An alias name ("%s") cannot contain dynamic values.', $resolvedId));`
	`89`	`+ throw new EnvParameterException(sprintf('An alias name ("%s") cannot contain dynamic values.', $resolvedId));`
`89`	`90`	`}`
`90`	`91`	`}`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function testInvalidTags()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
`80`		`- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException`
	`80`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException`
`81`	`81`	`*/`
`82`	`82`	`public function testDynamicServiceName()`
`83`	`83`	`{`
`@@ -89,7 +89,7 @@ public function testDynamicServiceName()`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`92`		`- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException`
	`92`	`+ * @expectedException \Symfony\Component\DependencyInjection\Exception\EnvParameterException`
`93`	`93`	`*/`
`94`	`94`	`public function testDynamicAliasName()`
`95`	`95`	`{`