canonicalize paths

m-vo · m-vo · commit 8f0bd98f34f7 · 2021-07-09T17:16:57.000+02:00
diff --git a/core-bundle/src/Twig/Loader/ContaoFilesystemLoader.php b/core-bundle/src/Twig/Loader/ContaoFilesystemLoader.php
@@ -224,7 +224,7 @@ public function getDynamicParent(string $shortNameOrIdentifier, string $sourcePa
         }
 
         // Find the next element in the hierarchy or use the first if it cannot be found
-        $index = array_search($sourcePath, array_keys($chain), true);
+        $index = array_search(Path::canonicalize($sourcePath), array_keys($chain), true);
         $next = array_values($chain)[false !== $index ? $index + 1 : 0] ?? null;
 
         if (null === $next) {
diff --git a/core-bundle/src/Twig/Loader/TemplateLocator.php b/core-bundle/src/Twig/Loader/TemplateLocator.php
@@ -77,8 +77,7 @@ public function findResourcesPaths(): array
             $paths[$group] = array_merge(
                 $paths[$group] ?? [],
                 $this->expandSubdirectories($basePath)
-            )
-            ;
+            );
         };
 
         if (is_dir($path = Path::join($this->projectDir, 'contao'))) {
@@ -126,7 +125,7 @@ public function findTemplates(string $path): array
         $templates = [];
 
         foreach ($finder as $file) {
-            $templates[$file->getFilename()] = $file->getPathname();
+            $templates[$file->getFilename()] = Path::canonicalize($file->getPathname());
         }
 
         return $templates;
@@ -150,7 +149,7 @@ private function expandSubdirectories(string $path): array
         ];
 
         foreach ($finder as $item) {
-            $paths[] = $item->getPathname();
+            $paths[] = Path::canonicalize($item->getPathname());
         }
 
         return array_reverse($paths);

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public function getDynamicParent(string $shortNameOrIdentifier, string $sourcePa`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`// Find the next element in the hierarchy or use the first if it cannot be found`
`227`		`- $index = array_search($sourcePath, array_keys($chain), true);`
	`227`	`+ $index = array_search(Path::canonicalize($sourcePath), array_keys($chain), true);`
`228`	`228`	`$next = array_values($chain)[false !== $index ? $index + 1 : 0] ?? null;`
`229`	`229`
`230`	`230`	`if (null === $next) {`