summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-kernel/Fragment
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
committerGreg Roach <fisharebest@webtrees.net>2019-10-10 00:28:20 +0100
commit1413eee0f149cccf7c528e3673d7569a368e4a9b (patch)
tree0f7c151dcd9d1bbc1694e9d0aade1cdae5cc54e2 /vendor/symfony/http-kernel/Fragment
parent3ecf8b4e3b9edb7773bcf328f4533da4f452929a (diff)
downloadwebtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.gz
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.tar.bz2
webtrees-1413eee0f149cccf7c528e3673d7569a368e4a9b.zip
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-kernel/Fragment')
-rw-r--r--vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php24
1 files changed, 13 insertions, 11 deletions
diff --git a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
index 9915e2c112..5d70c19024 100644
--- a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
+++ b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php
@@ -19,6 +19,7 @@ use Symfony\Component\Templating\EngineInterface;
use Twig\Environment;
use Twig\Error\LoaderError;
use Twig\Loader\ExistsLoaderInterface;
+use Twig\Loader\SourceContextLoaderInterface;
/**
* Implements the Hinclude rendering strategy.
@@ -135,22 +136,23 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer
}
$loader = $this->templating->getLoader();
- if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
- return $loader->exists($template);
- }
- try {
- if (method_exists($loader, 'getSourceContext')) {
- $loader->getSourceContext($template);
- } else {
- $loader->getSource($template);
+ if (1 === Environment::MAJOR_VERSION && !$loader instanceof ExistsLoaderInterface) {
+ try {
+ if ($loader instanceof SourceContextLoaderInterface) {
+ $loader->getSourceContext($template);
+ } else {
+ $loader->getSource($template);
+ }
+
+ return true;
+ } catch (LoaderError $e) {
}
- return true;
- } catch (LoaderError $e) {
+ return false;
}
- return false;
+ return $loader->exists($template);
}
/**