Move ParamConfigurator to Config

Nyholm · Nyholm · commit f8f97b990208 · 2021-04-23T13:55:54.000+02:00
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -22,7 +22,7 @@
 use Symfony\Component\Config\Definition\PrototypedArrayNode;
 use Symfony\Component\Config\Definition\ScalarNode;
 use Symfony\Component\Config\Definition\VariableNode;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ParamConfigurator;
+use Symfony\Component\Config\Loader\ParamConfigurator;
 
 /**
  * Generate ConfigBuilders to help create valid config.
diff --git a/src/Symfony/Component/Config/Loader/ParamConfigurator.php b/src/Symfony/Component/Config/Loader/ParamConfigurator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+namespace Symfony\Component\Config\Loader;
 
 /**
  * Placeholder for a parameter.
diff --git a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php b/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php
@@ -35,11 +35,11 @@ public function fixtureNames()
             yield $name => [$name, $alias];
         }
 
-        // If symfony/dependency-injection:^5.3 is installed
-        if (class_exists(ParamConfigurator::class)) {
-            // Force load ContainerConfigurator to get env() and param()
-            class_exists(ContainerConfigurator::class);
-
+        /*
+         * Force load ContainerConfigurator to make env(), param() etc available
+         * and also check if symfony/dependency-injection is installed
+         */
+        if (class_exists(ContainerConfigurator::class)) {
             yield 'Placeholders' => ['Placeholders', 'placeholders'];
         }
     }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/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;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/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;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/EnvConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/EnvConfigurator.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use Symfony\Component\Config\Loader\ParamConfigurator;
+
 class EnvConfigurator extends ParamConfigurator
 {
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -128,7 +128,7 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont
             }
         }
 
-        // Force load ContainerConfigurator to get env() and param()
+        // Force load ContainerConfigurator to make env(), param() etc available.
         class_exists(ContainerConfigurator::class);
 
         $callback(...$arguments);

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ public function fixtureNames()`
`35`	`35`	`yield $name => [$name, $alias];`
`36`	`36`	`}`
`37`	`37`
`38`		`- // If symfony/dependency-injection:^5.3 is installed`
`39`		`- if (class_exists(ParamConfigurator::class)) {`
`40`		`- // Force load ContainerConfigurator to get env() and param()`
`41`		`- class_exists(ContainerConfigurator::class);`
`42`		`-`
	`38`	`+ /*`
	`39`	`+ * Force load ContainerConfigurator to make env(), param() etc available`
	`40`	`+ * and also check if symfony/dependency-injection is installed`
	`41`	`+ */`
	`42`	`+ if (class_exists(ContainerConfigurator::class)) {`
`43`	`43`	`yield 'Placeholders' => ['Placeholders', 'placeholders'];`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Loader\Configurator;`
`13`	`13`
	`14`	`+use Symfony\Component\Config\Loader\ParamConfigurator;`
	`15`	`+`
`14`	`16`	`class EnvConfigurator extends ParamConfigurator`
`15`	`17`	`{`
`16`	`18`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function executeCallback(callable $callback, ContainerConfigurator $cont`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`- // Force load ContainerConfigurator to get env() and param()`
	`131`	`+ // Force load ContainerConfigurator to make env(), param() etc available.`
`132`	`132`	`class_exists(ContainerConfigurator::class);`
`133`	`133`
`134`	`134`	`$callback(...$arguments);`