[DI] use filter_var() instead of XmlUtils::phpize() in EnvVarProcessor

nicolas-grekas · nicolas-grekas · commit fbf4e8e68aec · 2018-10-31T12:40:33.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection;
 
-use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
 
@@ -90,19 +89,19 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('bool' === $prefix) {
-            return (bool) self::phpize($env);
+            return (bool) (filter_var($env, FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT));
         }
 
         if ('int' === $prefix) {
-            if (!is_numeric($env = self::phpize($env))) {
+            if (false === $env = filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));
             }
 
             return (int) $env;
         }
 
         if ('float' === $prefix) {
-            if (!is_numeric($env = self::phpize($env))) {
+            if (false === $env = filter_var($env, FILTER_VALIDATE_FLOAT)) {
                 throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));
             }
 
@@ -151,13 +150,4 @@ public function getEnv($prefix, $name, \Closure $getEnv)
 
         throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));
     }
-
-    private static function phpize($value)
-    {
-        if (!class_exists(XmlUtils::class)) {
-            throw new RuntimeException('The Symfony Config component is required to cast env vars to "bool", "int" or "float".');
-        }
-
-        return XmlUtils::phpize($value);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection;`
`13`	`13`
`14`		`-use Symfony\Component\Config\Util\XmlUtils;`
`15`	`14`	`use Symfony\Component\DependencyInjection\Exception\EnvNotFoundException;`
`16`	`15`	`use Symfony\Component\DependencyInjection\Exception\RuntimeException;`
`17`	`16`
`@@ -90,19 +89,19 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`if ('bool' === $prefix) {`
`93`		`- return (bool) self::phpize($env);`
	`92`	`+ return (bool) (filter_var($env, FILTER_VALIDATE_BOOLEAN) ?: filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT));`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`if ('int' === $prefix) {`
`97`		`- if (!is_numeric($env = self::phpize($env))) {`
	`96`	`+ if (false === $env = filter_var($env, FILTER_VALIDATE_INT) ?: filter_var($env, FILTER_VALIDATE_FLOAT)) {`
`98`	`97`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to int.', $name));`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`return (int) $env;`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`if ('float' === $prefix) {`
`105`		`- if (!is_numeric($env = self::phpize($env))) {`
	`104`	`+ if (false === $env = filter_var($env, FILTER_VALIDATE_FLOAT)) {`
`106`	`105`	`throw new RuntimeException(sprintf('Non-numeric env var "%s" cannot be cast to float.', $name));`
`107`	`106`	`}`
`108`	`107`
`@@ -151,13 +150,4 @@ public function getEnv($prefix, $name, \Closure $getEnv)`
`151`	`150`
`152`	`151`	`throw new RuntimeException(sprintf('Unsupported env var prefix "%s".', $prefix));`
`153`	`152`	`}`
`154`		`-`
`155`		`- private static function phpize($value)`
`156`		`- {`
`157`		`- if (!class_exists(XmlUtils::class)) {`
`158`		`- throw new RuntimeException('The Symfony Config component is required to cast env vars to "bool", "int" or "float".');`
`159`		`- }`
`160`		`-`
`161`		`- return XmlUtils::phpize($value);`
`162`		`- }`
`163`	`153`	`}`