[Config] Builder: Remove typehints and allow for EnvConfigurator

Author: Nyholm

Loader/Configurator/AbstractConfigurator.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Config\Loader\ParamConfigurator;
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Definition;
@@ -83,7 +84,7 @@ public static function processValue($value, $allowServices = false)
             return $def;
         }
 
-        if ($value instanceof EnvConfigurator) {
+        if ($value instanceof ParamConfigurator) {
             return (string) $value;
         }
 

Loader/Configurator/ContainerConfigurator.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Config\Loader\ParamConfigurator;
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -96,9 +97,9 @@ final public function withPath(string $path): self
 /**
  * Creates a parameter.
  */
-function param(string $name): string
+function param(string $name): ParamConfigurator
 {
-    return '%'.$name.'%';
+    return new ParamConfigurator($name);
 }
 
 /**

Loader/Configurator/EnvConfigurator.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-class EnvConfigurator
+use Symfony\Component\Config\Loader\ParamConfigurator;
+
+class EnvConfigurator extends ParamConfigurator
 {
     /**
      * @var string[]
@@ -23,10 +25,7 @@ public function __construct(string $name)
         $this->stack = explode(':', $name);
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return '%env('.implode(':', $this->stack).')%';
     }

Loader/PhpFileLoader.php

@@ -128,6 +128,9 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
             }
         }
 
+        // Force load ContainerConfigurator to make env(), param() etc available.
+        class_exists(ContainerConfigurator::class);
+
         $callback(...$arguments);
 
         /** @var ConfigBuilderInterface $configBuilder */