From 782102d3d7962b6fd188261773dcb3acf6de8f55 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 13 Dec 2016 14:20:26 +0100
Subject: [PATCH] Cleanup

---
 lib/Twig/Error/Loader.php             | 17 +++++++----------
 lib/Twig/Test/IntegrationTestCase.php | 12 +-----------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/lib/Twig/Error/Loader.php b/lib/Twig/Error/Loader.php
index 4010ba38d..dd514e703 100644
--- a/lib/Twig/Error/Loader.php
+++ b/lib/Twig/Error/Loader.php
@@ -24,18 +24,15 @@
  */
 class Twig_Error_Loader extends Twig_Error
 {
-    private $guess = false;
-
     public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
     {
-        parent::__construct($message, false, null, $previous);
-        $this->guess = true;
-    }
-
-    protected function guessTemplateInfo()
-    {
-        if ($this->guess) {
-            parent::guessTemplateInfo();
+        if (PHP_VERSION_ID < 50300) {
+            $this->previous = $previous;
+            Exception::__construct('');
+        } else {
+            Exception::__construct('', 0, $previous);
         }
+        $this->appendMessage($message);
+        $this->setTemplateLine(false);
     }
 }
diff --git a/lib/Twig/Test/IntegrationTestCase.php b/lib/Twig/Test/IntegrationTestCase.php
index cffa3add1..93314ea15 100644
--- a/lib/Twig/Test/IntegrationTestCase.php
+++ b/lib/Twig/Test/IntegrationTestCase.php
@@ -173,12 +173,6 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
                     return;
                 }
 
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateName($file);
-
-                    throw $e;
-                }
-
                 throw new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
             }
 
@@ -191,11 +185,7 @@ abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
                     return;
                 }
 
-                if ($e instanceof Twig_Error_Syntax) {
-                    $e->setTemplateName($file);
-                } else {
-                    $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-                }
+                $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
 
                 $output = trim(sprintf('%s: %s', get_class($e), $e->getMessage()));
             }