Bug fix for paths that start with the same string

weaverryan · nicolas-grekas · commit 51b92462b376 · 2023-05-19T08:23:03.000+02:00
diff --git a/src/Symfony/Component/AssetMapper/AssetMapperRepository.php b/src/Symfony/Component/AssetMapper/AssetMapperRepository.php
@@ -76,7 +76,7 @@ public function findLogicalPath(string $filesystemPath): ?string
         }
 
         foreach ($this->getDirectories() as $path => $namespace) {
-            if (!str_starts_with($filesystemPath, $path)) {
+            if (!str_starts_with($filesystemPath, $path.\DIRECTORY_SEPARATOR)) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php b/src/Symfony/Component/AssetMapper/Tests/AssetMapperRepositoryTest.php
@@ -70,6 +70,7 @@ public function testFindWithNamespaces()
     public function testFindLogicalPath()
     {
         $repository = new AssetMapperRepository([
+            'dir' => '',
             'dir1' => 'some_namespace',
             'dir2' => '',
         ], __DIR__.'/fixtures');
diff --git a/src/Symfony/Component/AssetMapper/Tests/fixtures/dir/file9.js b/src/Symfony/Component/AssetMapper/Tests/fixtures/dir/file9.js
@@ -0,0 +1 @@
+console.log('file9.js');

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function findLogicalPath(string $filesystemPath): ?string`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`foreach ($this->getDirectories() as $path => $namespace) {`
`79`		`- if (!str_starts_with($filesystemPath, $path)) {`
	`79`	`+ if (!str_starts_with($filesystemPath, $path.\DIRECTORY_SEPARATOR)) {`
`80`	`80`	`continue;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public function testFindWithNamespaces()`
`70`	`70`	`public function testFindLogicalPath()`
`71`	`71`	`{`
`72`	`72`	`$repository = new AssetMapperRepository([`
	`73`	`+ 'dir' => '',`
`73`	`74`	`'dir1' => 'some_namespace',`
`74`	`75`	`'dir2' => '',`
`75`	`76`	`], __DIR__.'/fixtures');`