bug #33273 Removed calls to Twig\Environment::loadTemplate() (derrabus)

fabpot · fabpot · commit c9c3d667de2b · 2019-08-21T13:50:41.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- Removed calls to Twig\Environment::loadTemplate() | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A This PR prepares #33039. Twig 3 does not have the `loadTemplate()` anymore, so this PR replaces calls to that method. Commits ------- ea9e375 Removed calls to Twig\Environment::loadTemplate().
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -154,7 +154,7 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)
     {
         if (!$theme instanceof Template) {
             /* @var Template $theme */
-            $theme = $this->environment->loadTemplate($theme);
+            $theme = $this->environment->load($theme)->unwrap();
         }
 
         if (null === $this->template) {
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -15,8 +15,10 @@
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\Translation\Loader\ArrayLoader;
 use Symfony\Component\Translation\Translator;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader as TwigArrayLoader;
+use Twig\TemplateWrapper;
 
 class TranslationExtensionTest extends TestCase
 {
@@ -269,7 +271,7 @@ public function testDefaultTranslationDomainWithNamedArguments()
         $this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([])));
     }
 
-    protected function getTemplate($template, $translator = null)
+    private function getTemplate($template, TranslatorInterface $translator = null): TemplateWrapper
     {
         if (null === $translator) {
             $translator = new Translator('en');
@@ -283,6 +285,6 @@ protected function getTemplate($template, $translator = null)
         $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new TranslationExtension($translator));
 
-        return $twig->loadTemplate('index');
+        return $twig->load('index');
     }
 }
diff --git a/src/Symfony/Bridge/Twig/TwigEngine.php b/src/Symfony/Bridge/Twig/TwigEngine.php
@@ -126,7 +126,7 @@ protected function load($name)
         }
 
         try {
-            return $this->environment->loadTemplate((string) $name);
+            return $this->environment->load((string) $name)->unwrap();
         } catch (LoaderError $e) {
             throw new \InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
         }
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
@@ -73,7 +73,7 @@ public function warmUp($cacheDir)
 
         foreach ($templates as $template) {
             try {
-                $twig->loadTemplate($template);
+                $twig->load($template);
             } catch (Error $e) {
                 // problem during compilation, give up
             }
diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
@@ -46,7 +46,7 @@ public function warmUp($cacheDir)
 
         foreach ($this->iterator as $template) {
             try {
-                $this->twig->loadTemplate($template);
+                $this->twig->load($template);
             } catch (Error $e) {
                 // problem during compilation, give up
                 // might be a syntax error or a non-Twig template
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@@ -103,10 +103,6 @@ protected function mockTwigEnvironment()
     {
         $this->twigEnvironment = $this->getMockBuilder('Twig\Environment')->disableOriginalConstructor()->getMock();
 
-        $this->twigEnvironment->expects($this->any())
-            ->method('loadTemplate')
-            ->willReturn('loadedTemplate');
-
         if (interface_exists('Twig\Loader\SourceContextLoaderInterface')) {
             $loader = $this->getMockBuilder('Twig\Loader\SourceContextLoaderInterface')->getMock();
         } else {

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ protected function loadResourcesFromTheme($cacheKey, &$theme)`
`154`	`154`	`{`
`155`	`155`	`if (!$theme instanceof Template) {`
`156`	`156`	`/* @var Template $theme */`
`157`		`- $theme = $this->environment->loadTemplate($theme);`
	`157`	`+ $theme = $this->environment->load($theme)->unwrap();`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if (null === $this->template) {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,10 @@`
`15`	`15`	`use Symfony\Bridge\Twig\Extension\TranslationExtension;`
`16`	`16`	`use Symfony\Component\Translation\Loader\ArrayLoader;`
`17`	`17`	`use Symfony\Component\Translation\Translator;`
	`18`	`+use Symfony\Contracts\Translation\TranslatorInterface;`
`18`	`19`	`use Twig\Environment;`
`19`	`20`	`use Twig\Loader\ArrayLoader as TwigArrayLoader;`
	`21`	`+use Twig\TemplateWrapper;`
`20`	`22`
`21`	`23`	`class TranslationExtensionTest extends TestCase`
`22`	`24`	`{`
`@@ -269,7 +271,7 @@ public function testDefaultTranslationDomainWithNamedArguments()`
`269`	`271`	`$this->assertEquals('foo (custom)foo (foo)foo (custom)foo (custom)foo (fr)foo (custom)foo (fr)', trim($template->render([])));`
`270`	`272`	`}`
`271`	`273`
`272`		`- protected function getTemplate($template, $translator = null)`
	`274`	`+ private function getTemplate($template, TranslatorInterface $translator = null): TemplateWrapper`
`273`	`275`	`{`
`274`	`276`	`if (null === $translator) {`
`275`	`277`	`$translator = new Translator('en');`
`@@ -283,6 +285,6 @@ protected function getTemplate($template, $translator = null)`
`283`	`285`	`$twig = new Environment($loader, ['debug' => true, 'cache' => false]);`
`284`	`286`	`$twig->addExtension(new TranslationExtension($translator));`
`285`	`287`
`286`		`- return $twig->loadTemplate('index');`
	`288`	`+ return $twig->load('index');`
`287`	`289`	`}`
`288`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected function load($name)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`try {`
`129`		`- return $this->environment->loadTemplate((string) $name);`
	`129`	`+ return $this->environment->load((string) $name)->unwrap();`
`130`	`130`	`} catch (LoaderError $e) {`
`131`	`131`	`throw new \InvalidArgumentException($e->getMessage(), $e->getCode(), $e);`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function warmUp($cacheDir)`
`73`	`73`
`74`	`74`	`foreach ($templates as $template) {`
`75`	`75`	`try {`
`76`		`- $twig->loadTemplate($template);`
	`76`	`+ $twig->load($template);`
`77`	`77`	`} catch (Error $e) {`
`78`	`78`	`// problem during compilation, give up`
`79`	`79`	`}`