Merge branch '3.x' into 4.x

* 3.x:
  Move some tests

tests/ErrorTest.php

@@ -17,6 +17,7 @@
 use Twig\Compiler;
 use Twig\Environment;
 use Twig\Error\Error;
+use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
 use Twig\Loader\ArrayLoader;
@@ -414,6 +415,44 @@ public static function getErroredTemplates()
             ],
         ];
     }
+
+    public function testErrorFromArrayLoader()
+    {
+        $templates = [
+            'index.twig' => '{% include "include.twig" %}',
+            'include.twig' => $include = <<<EOF
+
+
+
+            {% extends 'invalid.twig' %}
+            EOF,
+        ];
+        $twig = new Environment(new ArrayLoader($templates), ['debug' => true, 'cache' => false]);
+        try {
+            $twig->render('index.twig');
+            $this->fail('Expected LoaderError to be thrown');
+        } catch (LoaderError $e) {
+            $this->assertSame('Template "invalid.twig" is not defined.', $e->getRawMessage());
+            $this->assertSame(4, $e->getTemplateLine());
+            $this->assertSame('include.twig', $e->getSourceContext()->getName());
+            $this->assertSame($include, $e->getSourceContext()->getCode());
+        }
+    }
+
+    public function testErrorFromFilesystemLoader()
+    {
+        $twig = new Environment(new FilesystemLoader([$dir = __DIR__.'/Fixtures/errors/extends']), ['debug' => true, 'cache' => false]);
+        $include = file_get_contents($dir.'/include.twig');
+        try {
+            $twig->render('index.twig');
+            $this->fail('Expected LoaderError to be thrown');
+        } catch (LoaderError $e) {
+            $this->assertStringContainsString('Unable to find template "invalid.twig"', $e->getRawMessage());
+            $this->assertSame(4, $e->getTemplateLine());
+            $this->assertSame('include.twig', $e->getSourceContext()->getName());
+            $this->assertSame($include, $e->getSourceContext()->getCode());
+        }
+    }
 }
 
 class ErrorTest_Foo

tests/Fixtures/errors/extends/include.twig

@@ -0,0 +1,4 @@
+
+
+
+{% extends 'invalid.twig' %}

tests/Fixtures/errors/extends/index.twig

@@ -0,0 +1 @@
+{% include "include.twig" %}