bug #955 Update for Twig 2.7: Template -> TemplateWrapper (bobdenotter)

javiereguiluz · javiereguiluz · commit b005cec67e6f · 2019-04-04T14:36:17.000+02:00
This PR was squashed before being merged into the master branch (closes #955). Discussion ---------- Update for Twig 2.7: `Template` -> `TemplateWrapper` Since Twig 2.7, `$twig->resolveTemplate($template)` doesn't return `Twig\Template` but `Twig\TemplateWrapper`. This PR simply updates the typehints accordingly. Commits ------- a6bc991 Update for Twig 2.7: `Template` -> `TemplateWrapper`
diff --git a/composer.lock b/composer.lock
diff --git a/src/Twig/SourceCodeExtension.php b/src/Twig/SourceCodeExtension.php
@@ -13,7 +13,7 @@
 
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
-use Twig\Template;
+use Twig\TemplateWrapper;
 use Twig\TwigFunction;
 
 /**
@@ -92,7 +92,7 @@ private function getCallableReflector(callable $callable): \ReflectionFunctionAb
         return new \ReflectionFunction($callable);
     }
 
-    private function getTemplateSource(Template $template): array
+    private function getTemplateSource(TemplateWrapper $template): array
     {
         $templateSource = $template->getSourceContext();
 
diff --git a/symfony.lock b/symfony.lock
@@ -290,9 +290,15 @@
     "symfony/polyfill-ctype": {
         "version": "1.9-dev"
     },
+    "symfony/polyfill-iconv": {
+        "version": "v1.10.0"
+    },
     "symfony/polyfill-intl-icu": {
         "version": "1.9-dev"
     },
+    "symfony/polyfill-intl-idn": {
+        "version": "v1.10.0"
+    },
     "symfony/polyfill-mbstring": {
         "version": "1.9-dev"
     },

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Twig\Environment;`
`15`	`15`	`use Twig\Extension\AbstractExtension;`
`16`		`-use Twig\Template;`
	`16`	`+use Twig\TemplateWrapper;`
`17`	`17`	`use Twig\TwigFunction;`
`18`	`18`
`19`	`19`	`/**`
`@@ -92,7 +92,7 @@ private function getCallableReflector(callable $callable): \ReflectionFunctionAb`
`92`	`92`	`return new \ReflectionFunction($callable);`
`93`	`93`	`}`
`94`	`94`
`95`		`- private function getTemplateSource(Template $template): array`
	`95`	`+ private function getTemplateSource(TemplateWrapper $template): array`
`96`	`96`	`{`
`97`	`97`	`$templateSource = $template->getSourceContext();`
`98`	`98`