From c58fa84054dbdee3978d2528302690c24c80c0c3 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 6 Mar 2019 22:07:14 +0100
Subject: [PATCH] fixed some issues

---
 src/Error/LoaderError.php              | 2 +-
 src/Node/Expression/CallExpression.php | 2 +-
 src/Template.php                       | 6 +++---
 src/Util/TemplateDirIterator.php       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Error/LoaderError.php b/src/Error/LoaderError.php
index 2f6a3edfc..ac45ee78c 100644
--- a/src/Error/LoaderError.php
+++ b/src/Error/LoaderError.php
@@ -31,7 +31,7 @@ class LoaderError extends Error
         \Exception::__construct('', 0, $previous);
 
         $this->appendMessage($message);
-        $this->setTemplateLine(false);
+        $this->setTemplateLine(-2);
     }
 }
 
diff --git a/src/Node/Expression/CallExpression.php b/src/Node/Expression/CallExpression.php
index 0a052e659..7b9609065 100644
--- a/src/Node/Expression/CallExpression.php
+++ b/src/Node/Expression/CallExpression.php
@@ -277,7 +277,7 @@ abstract class CallExpression extends AbstractExpression
                 return [null, []];
             }
             $r = new \ReflectionMethod($callable[0], $callable[1]);
-        } elseif (\is_object($callable) && !$callable instanceof Closure) {
+        } elseif (\is_object($callable) && !$callable instanceof \Closure) {
             $r = new \ReflectionObject($callable);
             $r = $r->getMethod('__invoke');
             $callable = [$callable, '__invoke'];
diff --git a/src/Template.php b/src/Template.php
index 084a6f4c7..00001a959 100644
--- a/src/Template.php
+++ b/src/Template.php
@@ -226,7 +226,7 @@ abstract class Template implements \Twig_TemplateInterface
 
                 // this is mostly useful for \Twig\Error\LoaderError exceptions
                 // see \Twig\Error\LoaderError
-                if (false === $e->getTemplateLine()) {
+                if (-2 === $e->getTemplateLine()) {
                     $e->setTemplateLine(-1);
                     $e->guess();
                 }
@@ -371,7 +371,7 @@ abstract class Template implements \Twig_TemplateInterface
                 $e->setSourceContext($templateName ? new Source('', $templateName) : $this->getSourceContext());
             }
 
-            if ($e->getTemplateLine()) {
+            if ($e->getTemplateLine() > 0) {
                 throw $e;
             }
 
@@ -439,7 +439,7 @@ abstract class Template implements \Twig_TemplateInterface
 
             // this is mostly useful for \Twig\Error\LoaderError exceptions
             // see \Twig\Error\LoaderError
-            if (false === $e->getTemplateLine()) {
+            if (-2 === $e->getTemplateLine()) {
                 $e->setTemplateLine(-1);
                 $e->guess();
             }
diff --git a/src/Util/TemplateDirIterator.php b/src/Util/TemplateDirIterator.php
index 01f60ece9..1ab0dac59 100644
--- a/src/Util/TemplateDirIterator.php
+++ b/src/Util/TemplateDirIterator.php
@@ -14,7 +14,7 @@ namespace Twig\Util;
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class TemplateDirIterator extends IteratorIterator
+class TemplateDirIterator extends \IteratorIterator
 {
     public function current()
     {