8000 [TwigBundle] remove deprecations · symfony/symfony@d73c722 · GitHub
[go: up one dir, main page]
Skip to content

Commit d73c722

Browse files
TobionTobion
committed
[TwigBundle] remove deprecations
1 parent 1f192f1 commit d73c722

29 files changed

+4
-802
lines changed

‎src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php

Lines changed: 0 additions & 148 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function render(FlattenException $exception): string
6363
}
6464

6565
return $this->twig->render($template, [
66-
'legacy' => false, // to be removed in 5.0
6766
'exception' => $exception,
6867
'status_code' => $exception->getStatusCode(),
6968
'status_text' => $exception->getTitle(),
@@ -73,39 +72,15 @@ public function render(FlattenException $exception): string
7372
private function findTemplate(int $statusCode): ?string
7473
{
7574
$template = sprintf('@Twig/Exception/error%s.html.twig', $statusCode);
76-
if ($this->templateExists($template)) {
75+
if ($this->twig->getLoader()->exists($template)) {
7776
return $template;
7877
}
7978

8079
$template = '@Twig/Exception/error.html.twig';
81-
if ($this->templateExists($template)) {
80+
if ($this->twig->getLoader()->exists($template)) {
8281
return $template;
8382
}
8483

8584
return null;
8685
}
87-
88-
/**
89-
* To be removed in 5.0.
90-
*
91-
* Use instead:
92-
*
93-
* $this->twig->getLoader()->exists($template)
94-
*/
95-
private function templateExists(string $template): bool
96-
{
97-
$loader = $this->twig->getLoader();
98-
if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
99-
return $loader->exists($template);
100-
}
101-
102-
try {
103-
$loader->getSourceContext($template);
104-
105-
return true;
106-
} catch (LoaderError $e) {
107-
}
108-
109-
return false;
110-
}
11186
}

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.css.twig

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.js.twig

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.json.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.xml.twig

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.json.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0