Commit b005cec
committed
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`
File tree
3 files changed
+166
-36
lines changed- src/Twig
3 files changed
+166
-36
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
92 | 92 | | |
93 | 93 | | |
94 | 94 | | |
95 | | - | |
| 95 | + | |
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
293 | 296 | | |
294 | 297 | | |
295 | 298 | | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
296 | 302 | | |
297 | 303 | | |
298 | 304 | | |
| |||
0 commit comments