[DependencyInjection][Routing] Access environment in PHP config

Author: Nyholm

CHANGELOG.md

@@ -10,11 +10,12 @@ CHANGELOG
  * Add `#[AsTaggedItem]` attribute for defining the index and priority of classes found in tagged iterators/locators
  * Add autoconfigurable attributes
  * Add support for autowiring tagged iterators and locators via attributes on PHP 8
- * Add support for per-env configuration in loaders
+ * Add support for per-env configuration in XML and Yaml loaders
  * Add `ContainerBuilder::willBeAvailable()` to help with conditional configuration
  * Add support an integer return value for default_index_method
  * Add `env()` and `EnvConfigurator` in the PHP-DSL
  * Add support for `ConfigBuilder` in the `PhpFileLoader`
+ * Add `ContainerConfigurator::env()` to get the current environment
 
 5.2.0
 -----

Loader/Configurator/ContainerConfigurator.php

@@ -74,20 +74,11 @@ final public function services(): ServicesConfigurator
     }
 
     /**
-     * @return static
+     * Get the current environment to be able to write conditional configuration.
      */
-    final public function when(string $env): self
+    final public function env(): ?string
     {
-        if ($env === $this->env) {
-            return clone $this;
-        }
-
-        $instanceof = $this->instanceof;
-        $clone = clone $this;
-        $clone->container = new ContainerBuilder(clone $this->container->getParameterBag());
-        $clone->instanceof = &$instanceof;
-
-        return $clone;
+        return $this->env;
     }
 
     /**

Tests/Fixtures/config/when-env.php

@@ -144,15 +144,6 @@ public function testStack()
         $this->assertEquals($expected, $container->get('stack_d'));
     }
 
-    public function testWhenEnv()
-    {
-        $container = new ContainerBuilder();
-        $loader = new PhpFileLoader($container, new FileLocator(realpath(__DIR__.'/../Fixtures').'/config'), 'some-env');
-        $loader->load('when-env.php');
-
-        $this->assertSame(['foo' => 234, 'bar' => 345], $container->getParameterBag()->all());
-    }
-
     public function testEnvConfigurator()
     {
         $container = new ContainerBuilder();