[DependencyInjection] Fix XmlFileLoader not respecting when env for services

Author: Bradley Zeggelaar

src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

@@ -123,7 +123,7 @@ private function parseImports(\DOMDocument $xml, string $file, ?\DOMNode $root =
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (false === $imports = $xpath->query('.//container:imports/container:import', $root)) {
+        if (false === $imports = $xpath->query('./container:imports/container:import', $root)) {
             return;
         }
 
@@ -139,14 +139,14 @@ private function parseDefinitions(\DOMDocument $xml, string $file, Definition $d
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (false === $services = $xpath->query('.//container:services/container:service|.//container:services/container:prototype|.//container:services/container:stack', $root)) {
+        if (false === $services = $xpath->query('./container:services/container:service|./container:services/container:prototype|./container:services/container:stack', $root)) {
             return;
         }
         $this->setCurrentDir(\dirname($file));
 
         $this->instanceof = [];
         $this->isLoadingInstanceof = true;
-        $instanceof = $xpath->query('.//container:services/container:instanceof', $root);
+        $instanceof = $xpath->query('./container:services/container:instanceof', $root);
         foreach ($instanceof as $service) {
             $this->setDefinition((string) $service->getAttribute('id'), $this->parseDefinition($service, $file, new Definition()));
         }
@@ -197,7 +197,7 @@ private function getServiceDefaults(\DOMDocument $xml, string $file, ?\DOMNode $
         $xpath = new \DOMXPath($xml);
         $xpath->registerNamespace('container', self::NS);
 
-        if (null === $defaultsNode = $xpath->query('.//container:services/container:defaults', $root)->item(0)) {
+        if (null === $defaultsNode = $xpath->query('./container:services/container:defaults', $root)->item(0)) {
             return new Definition();
         }
 

src/Symfony/Component/DependencyInjection/Tests/Fixtures/RemoteCaller.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+interface RemoteCaller
+{
+}

src/Symfony/Component/DependencyInjection/Tests/Fixtures/RemoteCallerHttp.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class RemoteCallerHttp implements RemoteCaller
+{
+}

src/Symfony/Component/DependencyInjection/Tests/Fixtures/RemoteCallerSocket.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class RemoteCallerSocket implements RemoteCaller
+{
+}

src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/when-env-services.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+    <services>
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCaller"
+                 alias="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerHttp"/>
+
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerHttp"
+                 class="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerHttp"/>
+
+        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerSocket"
+                 class="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerSocket"/>
+    </services>
+
+    <when env="dev">
+        <services>
+            <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCaller"
+                     alias="Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerSocket"/>
+        </services>
+    </when>
+</container>

src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

@@ -44,6 +44,9 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCaller;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerHttp;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\RemoteCallerSocket;
 use Symfony\Component\ExpressionLanguage\Expression;
 
 class XmlFileLoaderTest extends TestCase
@@ -1167,4 +1170,19 @@ public function testWhenEnv()
 
         $this->assertSame(['foo' => 234, 'bar' => 345], $container->getParameterBag()->all());
     }
+
+    public function testLoadServicesWithEnvironment()
+    {
+        $container = new ContainerBuilder();
+
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'), 'prod');
+        $loader->load('when-env-services.xml');
+
+        self::assertInstanceOf(RemoteCallerHttp::class, $container->get(RemoteCaller::class));
+
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'), 'dev');
+        $loader->load('when-env-services.xml');
+
+        self::assertInstanceOf(RemoteCallerSocket::class, $container->get(RemoteCaller::class));
+    }
 }