bug #28376 [TwigBundle] Fixed caching of templates in src/Resources/<BundleName>/views on cache warmup (yceruto)

fabpot · fabpot · commit 2e85ef5259d7 · 2018-09-27T19:44:44.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [TwigBundle] Fixed caching of templates in src/Resources/<BundleName>/views on cache warmup | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Same as #27764, but in this case the convention is wrong. Corrected according to: https://github.com/symfony/symfony/blob/992a174470fd557e1cddccd3a35447209602aea3/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php#L165 Commits ------- 83a75f4 Caching missed templates on cache warmup
diff --git a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php
@@ -57,7 +57,7 @@ public function getIterator()
             $this->templates = array_merge(
                 $this->templates,
                 $this->findTemplatesInDirectory($bundle->getPath().'/Resources/views', $name),
-                $this->findTemplatesInDirectory($this->rootDir.'/'.$bundle->getName().'/views', $name)
+                $this->findTemplatesInDirectory($this->rootDir.'/Resources/'.$bundle->getName().'/views', $name)
             );
         }
 
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig b/src/Symfony/Bundle/TwigBundle/Tests/Fixtures/templates/Resources/BarBundle/views/base.html.twig
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php b/src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
@@ -31,6 +31,7 @@ public function testGetIterator()
         sort($sorted);
         $this->assertEquals(
             array(
+                '@Bar/base.html.twig',
                 '@Bar/index.html.twig',
                 '@Foo/index.html.twig',
                 'layout.html.twig',

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function getIterator()`
`57`	`57`	`$this->templates = array_merge(`
`58`	`58`	`$this->templates,`
`59`	`59`	`$this->findTemplatesInDirectory($bundle->getPath().'/Resources/views', $name),`
`60`		`- $this->findTemplatesInDirectory($this->rootDir.'/'.$bundle->getName().'/views', $name)`
	`60`	`+ $this->findTemplatesInDirectory($this->rootDir.'/Resources/'.$bundle->getName().'/views', $name)`
`61`	`61`	`);`
`62`	`62`	`}`
`63`	`63`