symfony · nicolas-grekas · Feb 5, 2021 · Feb 4, 2021
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1655,14 +1655,14 @@ private function getExpressionLanguage(): ExpressionLanguage
    private function inVendors(string $path): bool
    {
        if (null === $this->vendors) {
-            $resource = new ComposerResource();
-            $this->vendors = $resource->getVendors();
-            $this->addResource($resource);
+            $this->vendors = (new ComposerResource())->getVendors();
        }
        $path = realpath($path) ?: $path;

        foreach ($this->vendors as $vendor) {
            if (0 === strpos($path, $vendor) && false !== strpbrk(substr($path, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
+                $this->addResource(new FileResource($vendor.'/composer/installed.json'));
+
                return true;
            }
        }

diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -17,7 +17,6 @@

 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface as PsrContainerInterface;
-use Symfony\Component\Config\Resource\ComposerResource;
 use Symfony\Component\Config\Resource\DirectoryResource;
 use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Resource\ResourceInterface;
@@ -929,7 +928,7 @@ public function testAddObjectResource()

        $resources = $container->getResources();

-        $this->assertCount(2, $resources, '2 resources were registered');
+        $this->assertCount(1, $resources);

        /* @var $resource \Symfony\Component\Config\Resource\FileResource */
        $resource = end($resources);
@@ -958,9 +957,9 @@ public function testGetReflectionClass()

        $resources = $container->getResources();

-        $this->assertCount(3, $resources, '3 resources were registered');
+        $this->assertCount(2, $resources);

-        $this->assertSame('reflection.BarClass', (string) $resources[1]);
+        $this->assertSame('reflection.BarClass', (string) $resources[0]);
        $this->assertSame('BarMissingClass', (string) end($resources));
    }

@@ -1021,7 +1020,6 @@ public function testResources()
    public function testFileExists()
    {
        $container = new ContainerBuilder();
-        $A = new ComposerResource();
        $a = new FileResource(__DIR__.'/Fixtures/xml/services1.xml');
        $b = new FileResource(__DIR__.'/Fixtures/xml/services2.xml');
        $c = new DirectoryResource($dir = \dirname($b));
@@ -1035,7 +1033,7 @@ public function testFileExists()
            }
        }

-        $this->assertEquals([$A, $a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
+        $this->assertEquals([$a, $b, $c], $resources, '->getResources() returns an array of resources read for the current configuration');
    }

    public function testExtension()

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
@@ -32,7 +32,7 @@ public function testLoadAddsTheGlobResourceToTheContainer()
        $loader = new GlobFileLoaderWithoutImport($container = new ContainerBuilder(), new FileLocator());
        $loader->load(__DIR__.'/../Fixtures/config/*');

-        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[1]);
+        $this->assertEquals(new GlobResource(__DIR__.'/../Fixtures/config', '/*', false), $container->getResources()[0]);
    }
 }