Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6867475

Browse filesBrowse files
[DI] fix tracking of changes to vendor/ dirs
1 parent 60dac0c commit 6867475
Copy full SHA for 6867475

File tree

3 files changed

+8
-10
lines changed
Filter options

3 files changed

+8
-10
lines changed

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,14 +1655,14 @@ private function getExpressionLanguage(): ExpressionLanguage
16551655
private function inVendors(string $path): bool
16561656
{
16571657
if (null === $this->vendors) {
1658-
$resource = new ComposerResource();
1659-
$this->vendors = $resource->getVendors();
1660-
$this->addResource($resource);
1658+
$this->vendors = (new ComposerResource())->getVendors();
16611659
}
16621660
$path = realpath($path) ?: $path;
16631661

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

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+4-6Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

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

930929
$resources = $container->getResources();
931930

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

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

959958
$resources = $container->getResources();
960959

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

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

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

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

10411039
public function testExtension()

‎src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/GlobFileLoaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testLoadAddsTheGlobResourceToTheContainer()
3232
$loader = new GlobFileLoaderWithoutImport($container = new ContainerBuilder(), new FileLocator());
3333
$loader->load(__DIR__.'/../Fixtures/config/*');
3434

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.