support different bundle paths

heimrichhannot · Oct 1, 2024 · c4dac36 · c4dac36
1 parent 30ca4bf
commit c4dac36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Filesystem/TwigTemplateLocator.php b/src/Filesystem/TwigTemplateLocator.php
@@ -439,7 +439,7 @@ protected function generateContaoTwigTemplatePaths(bool $extension = false): arr
             foreach ($bundles as $key => $bundle) {
                 $path = $bundle->getPath();
 
-                foreach (['/templates', '/src/Resources/views',] as $subpath) {
+                foreach (['/templates', '/Resources/views',] as $subpath) {
                     if (!is_dir($dir = rtrim($path, '/').$subpath)) {
                         continue;
                     }

diff --git a/tests/Filesystem/TwigTemplateLocatorTest.php b/tests/Filesystem/TwigTemplateLocatorTest.php
@@ -256,9 +256,12 @@ private function prepareTemplateLoader(array $parameters): array
         $kernel = $this->createMock(Kernel::class);
         $bundles = [];
         $bundleMetaData = [];
-        foreach (['a', 'b'] as $bundle) {
+        $kernelBundles = [
+            'a' => $projectDir . '/vendor/example/a',
+            'b' => $projectDir . '/vendor/example/b/src',
+        ];
+        foreach ($kernelBundles as $bundle => $bundlePath) {
             $currentBundle = $this->createMock(BundleInterface::class);
-            $bundlePath = $projectDir.'/vendor/example/'.$bundle;
             $currentBundle->method('getPath')->willReturn($bundlePath);
             $currentBundle->method('getName')->willReturn($bundle);
             $kernelBundles[$bundle] = $currentBundle;