diff vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)

--- a/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/vendor/symfony/http-kernel/Fragment/HIncludeFragmentRenderer.php	Fri Feb 23 15:52:07 2018 +0000
@@ -16,6 +16,9 @@
 use Symfony\Component\Templating\EngineInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 use Symfony\Component\HttpKernel\UriSigner;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Loader\ExistsLoaderInterface;
 
 /**
  * Implements the Hinclude rendering strategy.
@@ -32,10 +35,10 @@
     /**
      * Constructor.
      *
-     * @param EngineInterface|\Twig_Environment $templating            An EngineInterface or a \Twig_Environment instance
-     * @param UriSigner                         $signer                A UriSigner instance
-     * @param string                            $globalDefaultTemplate The global default content (it can be a template name or the content)
-     * @param string                            $charset
+     * @param EngineInterface|Environment $templating            An EngineInterface or a Twig instance
+     * @param UriSigner                   $signer                A UriSigner instance
+     * @param string                      $globalDefaultTemplate The global default content (it can be a template name or the content)
+     * @param string                      $charset
      */
     public function __construct($templating = null, UriSigner $signer = null, $globalDefaultTemplate = null, $charset = 'utf-8')
     {
@@ -48,14 +51,14 @@
     /**
      * Sets the templating engine to use to render the default content.
      *
-     * @param EngineInterface|\Twig_Environment|null $templating An EngineInterface or a \Twig_Environment instance
+     * @param EngineInterface|Environment|null $templating An EngineInterface or an Environment instance
      *
      * @throws \InvalidArgumentException
      */
     public function setTemplating($templating)
     {
-        if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof \Twig_Environment) {
-            throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of \Twig_Environment or Symfony\Component\Templating\EngineInterface');
+        if (null !== $templating && !$templating instanceof EngineInterface && !$templating instanceof Environment) {
+            throw new \InvalidArgumentException('The hinclude rendering strategy needs an instance of Twig\Environment or Symfony\Component\Templating\EngineInterface');
         }
 
         $this->templating = $templating;
@@ -136,7 +139,7 @@
         }
 
         $loader = $this->templating->getLoader();
-        if ($loader instanceof \Twig_ExistsLoaderInterface || method_exists($loader, 'exists')) {
+        if ($loader instanceof ExistsLoaderInterface || method_exists($loader, 'exists')) {
             return $loader->exists($template);
         }
 
@@ -148,7 +151,7 @@
             }
 
             return true;
-        } catch (\Twig_Error_Loader $e) {
+        } catch (LoaderError $e) {
         }
 
         return false;