@@ -40,6 +40,11 @@

             "Twig\\" : "src/"

         }

     },

+    "autoload-dev": {

+        "psr-4" : {

+            "Twig\\Tests\\" : "test/twig/tests"

+        }

+    },

     "extra": {

         "branch-alias": {

             "dev-master": "1.42-dev"

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -9,7 +11,7 @@

  * file that was distributed with this source code.

  */

-class Twig_Tests_AutoloaderTest extends \PHPUnit\Framework\TestCase

+class AutoloaderTest extends \PHPUnit\Framework\TestCase

 {

     /**

      * @group legacy

@@ -18,7 +20,7 @@ class Twig_Tests_AutoloaderTest extends \PHPUnit\Framework\TestCase

     {

         $this->assertFalse(class_exists('FooBarFoo'), '->autoload() does not try to load classes that does not begin with Twig');

-        $autoloader = new Twig_Autoloader();

+        $autoloader = new \Twig_Autoloader();

         $this->assertNull($autoloader->autoload('Foo'), '->autoload() returns false if it is not able to load a class');

     }

 }

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests\Cache;

+

 /*

  * This file is part of Twig.

  *

@@ -10,10 +12,9 @@

  */

 use Twig\Cache\FilesystemCache;

+use Twig\Tests\FilesystemHelper;

-require_once \dirname(__DIR__).'/FilesystemHelper.php';

-

-class Twig_Tests_Cache_FilesystemTest extends \PHPUnit\Framework\TestCase

+class FilesystemTest extends \PHPUnit\Framework\TestCase

 {

     private $classname;

     private $directory;

@@ -30,7 +31,7 @@ class Twig_Tests_Cache_FilesystemTest extends \PHPUnit\Framework\TestCase

     protected function tearDown()

     {

         if (file_exists($this->directory)) {

-            Twig_Tests_FilesystemHelper::removeDir($this->directory);

+            FilesystemHelper::removeDir($this->directory);

         }

     }

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -12,7 +14,7 @@

 use Twig\Compiler;

 use Twig\Environment;

-class Twig_Tests_CompilerTest extends \PHPUnit\Framework\TestCase

+class CompilerTest extends \PHPUnit\Framework\TestCase

 {

     public function testReprNumericValueWithLocale()

     {

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -11,7 +13,7 @@

 use Twig\RuntimeLoader\ContainerRuntimeLoader;

-class Twig_Tests_ContainerRuntimeLoaderTest extends \PHPUnit\Framework\TestCase

+class ContainerRuntimeLoaderTest extends \PHPUnit\Framework\TestCase

 {

     /**

      * @requires PHP 5.3

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -35,8 +37,8 @@ class CustomExtensionTest extends \PHPUnit\Framework\TestCase

     public function provideInvalidExtensions()

     {

         return [

-            [new InvalidOperatorExtension(new \stdClass()), '"InvalidOperatorExtension::getOperators()" must return an array with operators, got "stdClass".'],

-            [new InvalidOperatorExtension([1, 2, 3]), '"InvalidOperatorExtension::getOperators()" must return an array of 2 elements, got 3.'],

+            [new InvalidOperatorExtension(new \stdClass()), '"Twig\Tests\InvalidOperatorExtension::getOperators()" must return an array with operators, got "stdClass".'],

+            [new InvalidOperatorExtension([1, 2, 3]), '"Twig\Tests\InvalidOperatorExtension::getOperators()" must return an array of 2 elements, got 3.'],

         ];

     }

 }

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -25,9 +27,7 @@ use Twig\TwigFilter;

 use Twig\TwigFunction;

 use Twig\TwigTest;

-require_once __DIR__.'/FilesystemHelper.php';

-

-class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

+class EnvironmentTest extends \PHPUnit\Framework\TestCase

 {

     private $deprecations = [];

@@ -88,7 +88,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     public function testGlobals()

     {

         // to be removed in 2.0

-        $loader = $this->getMockBuilder('Twig_EnvironmentTestLoaderInterface')->getMock();

+        $loader = $this->getMockBuilder('\Twig\Tests\EnvironmentTestLoaderInterface')->getMock();

         //$loader = $this->getMockBuilder(['\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface'])->getMock();

         $loader->expects($this->any())->method('getSourceContext')->willReturn(new Source('', ''));

@@ -211,7 +211,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

         $output = $twig->render('index', ['foo' => 'bar']);

         $this->assertEquals('bar', $output);

-        Twig_Tests_FilesystemHelper::removeDir($dir);

+        FilesystemHelper::removeDir($dir);

     }

     public function testAutoReloadCacheMiss()

@@ -304,15 +304,15 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $ext1 = new Twig_Tests_EnvironmentTest_Extension_DynamicWithDeprecatedName('ext1');

-        $ext2 = new Twig_Tests_EnvironmentTest_Extension_DynamicWithDeprecatedName('ext2');

+        $ext1 = new EnvironmentTest_Extension_DynamicWithDeprecatedName('ext1');

+        $ext2 = new EnvironmentTest_Extension_DynamicWithDeprecatedName('ext2');

         $twig->addExtension($ext1);

         $twig->addExtension($ext2);

         $this->assertTrue($twig->hasExtension('ext1'));

         $this->assertTrue($twig->hasExtension('ext2'));

-        $this->assertTrue($twig->hasExtension('Twig_Tests_EnvironmentTest_Extension_DynamicWithDeprecatedName'));

+        $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest_Extension_DynamicWithDeprecatedName'));

         $this->assertSame($ext1, $twig->getExtension('ext1'));

         $this->assertSame($ext2, $twig->getExtension('ext2'));

@@ -321,12 +321,12 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     public function testHasGetExtensionByClassName()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension($ext = new Twig_Tests_EnvironmentTest_Extension());

-        $this->assertTrue($twig->hasExtension('Twig_Tests_EnvironmentTest_Extension'));

-        $this->assertTrue($twig->hasExtension('\Twig_Tests_EnvironmentTest_Extension'));

+        $twig->addExtension($ext = new EnvironmentTest_Extension());

+        $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest_Extension'));

+        $this->assertTrue($twig->hasExtension('\Twig\Tests\EnvironmentTest_Extension'));

-        $this->assertSame($ext, $twig->getExtension('Twig_Tests_EnvironmentTest_Extension'));

-        $this->assertSame($ext, $twig->getExtension('\Twig_Tests_EnvironmentTest_Extension'));

+        $this->assertSame($ext, $twig->getExtension('Twig\Tests\EnvironmentTest_Extension'));

+        $this->assertSame($ext, $twig->getExtension('\Twig\Tests\EnvironmentTest_Extension'));

         $this->assertTrue($twig->hasExtension('Twig\Tests\EnvironmentTest\Extension'));

         $this->assertSame($ext, $twig->getExtension('Twig\Tests\EnvironmentTest\Extension'));

@@ -335,7 +335,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     public function testAddExtension()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_Extension());

+        $twig->addExtension(new EnvironmentTest_Extension());

         $this->assertArrayHasKey('test', $twig->getTags());

         $this->assertArrayHasKey('foo_filter', $twig->getFilters());

@@ -347,7 +347,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

         $visitors = $twig->getNodeVisitors();

         $found = false;

         foreach ($visitors as $visitor) {

-            if ($visitor instanceof Twig_Tests_EnvironmentTest_NodeVisitor) {

+            if ($visitor instanceof EnvironmentTest_NodeVisitor) {

                 $found = true;

             }

         }

@@ -360,7 +360,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     public function testAddExtensionWithDeprecatedGetGlobals()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_Extension_WithGlobals());

+        $twig->addExtension(new EnvironmentTest_Extension_WithGlobals());

         $this->deprecations = [];

         set_error_handler([$this, 'handleError']);

@@ -368,7 +368,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

         $this->assertArrayHasKey('foo_global', $twig->getGlobals());

         $this->assertCount(1, $this->deprecations);

-        $this->assertContains('Defining the getGlobals() method in the "Twig_Tests_EnvironmentTest_Extension_WithGlobals" extension ', $this->deprecations[0]);

+        $this->assertContains('Defining the getGlobals() method in the "Twig\Tests\EnvironmentTest_Extension_WithGlobals" extension ', $this->deprecations[0]);

         restore_error_handler();

     }

@@ -379,7 +379,7 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

     public function testRemoveExtension()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_Extension_WithDeprecatedName());

+        $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());

         $twig->removeExtension('environment_test');

         $this->assertArrayNotHasKey('test', $twig->getTags());

@@ -399,12 +399,12 @@ class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase

         $extension = eval(<<<EOF

 use Twig\Extension\AbstractExtension;

-class Twig_Tests_EnvironmentTest_ExtensionInEval extends AbstractExtension

+class EnvironmentTest_ExtensionInEval extends AbstractExtension

 {

 }

 EOF

         );

-        $extension = new Twig_Tests_EnvironmentTest_ExtensionInEval();

+        $extension = new \EnvironmentTest_ExtensionInEval();

         $loader = new ArrayLoader(['page' => 'hey']);

@@ -418,7 +418,7 @@ EOF

     public function testInitRuntimeWithAnExtensionUsingInitRuntimeNoDeprecation()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_ExtensionWithoutDeprecationInitRuntime());

+        $twig->addExtension(new EnvironmentTest_ExtensionWithoutDeprecationInitRuntime());

         $twig->initRuntime();

         // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above

@@ -432,7 +432,7 @@ EOF

     public function testInitRuntimeWithAnExtensionUsingInitRuntimeDeprecation()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_ExtensionWithDeprecationInitRuntime());

+        $twig->addExtension(new EnvironmentTest_ExtensionWithDeprecationInitRuntime());

         $this->deprecations = [];

         set_error_handler([$this, 'handleError']);

@@ -440,7 +440,7 @@ EOF

         $twig->initRuntime();

         $this->assertCount(1, $this->deprecations);

-        $this->assertContains('Defining the initRuntime() method in the "Twig_Tests_EnvironmentTest_ExtensionWithDeprecationInitRuntime" extension is deprecated since version 1.23.', $this->deprecations[0]);

+        $this->assertContains('Defining the initRuntime() method in the "Twig\Tests\EnvironmentTest_ExtensionWithDeprecationInitRuntime" extension is deprecated since version 1.23.', $this->deprecations[0]);

         restore_error_handler();

     }

@@ -458,13 +458,13 @@ EOF

     public function testOverrideExtension()

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_ExtensionWithDeprecationInitRuntime());

+        $twig->addExtension(new EnvironmentTest_ExtensionWithDeprecationInitRuntime());

         $this->deprecations = [];

         set_error_handler([$this, 'handleError']);

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_Extension_WithDeprecatedName());

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_Extension_WithDeprecatedName());

+        $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());

+        $twig->addExtension(new EnvironmentTest_Extension_WithDeprecatedName());

         $this->assertCount(1, $this->deprecations);

         $this->assertContains('The possibility to register the same extension twice', $this->deprecations[0]);

@@ -475,7 +475,7 @@ EOF

     public function testAddRuntimeLoader()

     {

         $runtimeLoader = $this->getMockBuilder('\Twig\RuntimeLoader\RuntimeLoaderInterface')->getMock();

-        $runtimeLoader->expects($this->any())->method('load')->willReturn(new Twig_Tests_EnvironmentTest_Runtime());

+        $runtimeLoader->expects($this->any())->method('load')->willReturn(new EnvironmentTest_Runtime());

         $loader = new ArrayLoader([

             'func_array' => '{{ from_runtime_array("foo") }}',

@@ -487,7 +487,7 @@ EOF

         ]);

         $twig = new Environment($loader);

-        $twig->addExtension(new Twig_Tests_EnvironmentTest_ExtensionWithoutRuntime());

+        $twig->addExtension(new EnvironmentTest_ExtensionWithoutRuntime());

         $twig->addRuntimeLoader($runtimeLoader);

         $this->assertEquals('foo', $twig->render('func_array'));

@@ -501,7 +501,7 @@ EOF

     protected function getMockLoader($templateName, $templateContent)

     {

         // to be removed in 2.0

-        $loader = $this->getMockBuilder('Twig_EnvironmentTestLoaderInterface')->getMock();

+        $loader = $this->getMockBuilder('Twig\Tests\EnvironmentTestLoaderInterface')->getMock();

         //$loader = $this->getMockBuilder(['\Twig\Loader\LoaderInterface', '\Twig\Loader\SourceContextLoaderInterface'])->getMock();

         $loader->expects($this->any())

           ->method('getSourceContext')

@@ -516,7 +516,7 @@ EOF

     }

 }

-class Twig_Tests_EnvironmentTest_Extension_WithGlobals extends AbstractExtension

+class EnvironmentTest_Extension_WithGlobals extends AbstractExtension

 {

     public function getGlobals()

     {

@@ -526,19 +526,19 @@ class Twig_Tests_EnvironmentTest_Extension_WithGlobals extends AbstractExtension

     }

 }

-class Twig_Tests_EnvironmentTest_Extension extends AbstractExtension implements GlobalsInterface

+class EnvironmentTest_Extension extends AbstractExtension implements GlobalsInterface

 {

     public function getTokenParsers()

     {

         return [

-            new Twig_Tests_EnvironmentTest_TokenParser(),

+            new EnvironmentTest_TokenParser(),

         ];

     }

     public function getNodeVisitors()

     {

         return [

-            new Twig_Tests_EnvironmentTest_NodeVisitor(),

+            new EnvironmentTest_NodeVisitor(),

         ];

     }

@@ -578,9 +578,9 @@ class Twig_Tests_EnvironmentTest_Extension extends AbstractExtension implements

         ];

     }

 }

-class_alias('Twig_Tests_EnvironmentTest_Extension', 'Twig\Tests\EnvironmentTest\Extension', false);

+class_alias('\Twig\Tests\EnvironmentTest_Extension', 'Twig\Tests\EnvironmentTest\Extension', false);

-class Twig_Tests_EnvironmentTest_Extension_WithDeprecatedName extends AbstractExtension

+class EnvironmentTest_Extension_WithDeprecatedName extends AbstractExtension

 {

     public function getName()

     {

@@ -588,7 +588,7 @@ class Twig_Tests_EnvironmentTest_Extension_WithDeprecatedName extends AbstractEx

     }

 }

-class Twig_Tests_EnvironmentTest_Extension_DynamicWithDeprecatedName extends AbstractExtension

+class EnvironmentTest_Extension_DynamicWithDeprecatedName extends AbstractExtension

 {

     private $name;

@@ -603,7 +603,7 @@ class Twig_Tests_EnvironmentTest_Extension_DynamicWithDeprecatedName extends Abs

     }

 }

-class Twig_Tests_EnvironmentTest_TokenParser extends AbstractTokenParser

+class EnvironmentTest_TokenParser extends AbstractTokenParser

 {

     public function parse(Token $token)

     {

@@ -615,14 +615,14 @@ class Twig_Tests_EnvironmentTest_TokenParser extends AbstractTokenParser

     }

 }

-class Twig_Tests_EnvironmentTest_NodeVisitor implements NodeVisitorInterface

+class EnvironmentTest_NodeVisitor implements NodeVisitorInterface

 {

-    public function enterNode(Twig_NodeInterface $node, Environment $env)

+    public function enterNode(\Twig_NodeInterface $node, Environment $env)

     {

         return $node;

     }

-    public function leaveNode(Twig_NodeInterface $node, Environment $env)

+    public function leaveNode(\Twig_NodeInterface $node, Environment $env)

     {

         return $node;

     }

@@ -633,27 +633,27 @@ class Twig_Tests_EnvironmentTest_NodeVisitor implements NodeVisitorInterface

     }

 }

-class Twig_Tests_EnvironmentTest_ExtensionWithDeprecationInitRuntime extends AbstractExtension

+class EnvironmentTest_ExtensionWithDeprecationInitRuntime extends AbstractExtension

 {

     public function initRuntime(Environment $env)

     {

     }

 }

-class Twig_Tests_EnvironmentTest_ExtensionWithoutDeprecationInitRuntime extends AbstractExtension implements InitRuntimeInterface

+class EnvironmentTest_ExtensionWithoutDeprecationInitRuntime extends AbstractExtension implements InitRuntimeInterface

 {

     public function initRuntime(Environment $env)

     {

     }

 }

-class Twig_Tests_EnvironmentTest_ExtensionWithoutRuntime extends AbstractExtension

+class EnvironmentTest_ExtensionWithoutRuntime extends AbstractExtension

 {

     public function getFunctions()

     {

         return [

-            new TwigFunction('from_runtime_array', ['Twig_Tests_EnvironmentTest_Runtime', 'fromRuntime']),

-            new TwigFunction('from_runtime_string', 'Twig_Tests_EnvironmentTest_Runtime::fromRuntime'),

+            new TwigFunction('from_runtime_array', ['Twig\Tests\EnvironmentTest_Runtime', 'fromRuntime']),

+            new TwigFunction('from_runtime_string', 'Twig\Tests\EnvironmentTest_Runtime::fromRuntime'),

         ];

     }

@@ -663,7 +663,7 @@ class Twig_Tests_EnvironmentTest_ExtensionWithoutRuntime extends AbstractExtensi

     }

 }

-class Twig_Tests_EnvironmentTest_Runtime

+class EnvironmentTest_Runtime

 {

     public function fromRuntime($name = 'bar')

     {

@@ -672,6 +672,6 @@ class Twig_Tests_EnvironmentTest_Runtime

 }

 // to be removed in 2.0

-interface Twig_EnvironmentTestLoaderInterface extends LoaderInterface, SourceContextLoaderInterface

+interface EnvironmentTestLoaderInterface extends LoaderInterface, SourceContextLoaderInterface

 {

 }

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -16,7 +18,7 @@ use Twig\Loader\ArrayLoader;

 use Twig\Loader\FilesystemLoader;

 use Twig\Source;

-class Twig_Tests_ErrorTest extends \PHPUnit\Framework\TestCase

+class ErrorTest extends \PHPUnit\Framework\TestCase

 {

     public function testErrorWithObjectFilename()

     {

@@ -80,7 +82,7 @@ EOHTML

         $template = $twig->load('index.html');

         try {

-            $template->render(['foo' => new Twig_Tests_ErrorTest_Foo()]);

+            $template->render(['foo' => new ErrorTest_Foo()]);

             $this->fail();

         } catch (RuntimeError $e) {

@@ -116,7 +118,7 @@ EOHTML

         $template = $twig->load('index.html');

         try {

-            $template->render(['foo' => new Twig_Tests_ErrorTest_Foo()]);

+            $template->render(['foo' => new ErrorTest_Foo()]);

             $this->fail();

         } catch (RuntimeError $e) {

@@ -149,7 +151,7 @@ EOHTML

         }

         try {

-            $template->render(['foo' => new Twig_Tests_ErrorTest_Foo()]);

+            $template->render(['foo' => new ErrorTest_Foo()]);

             $this->fail();

         } catch (RuntimeError $e) {

@@ -223,7 +225,7 @@ EOHTML

     }

 }

-class Twig_Tests_ErrorTest_Foo

+class ErrorTest_Foo

 {

     public function bar()

     {

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -17,7 +19,7 @@ use Twig\Node\Expression\NameExpression;

 use Twig\Parser;

 use Twig\Source;

-class Twig_Tests_ExpressionParserTest extends \PHPUnit\Framework\TestCase

+class ExpressionParserTest extends \PHPUnit\Framework\TestCase

 {

     /**

      * @expectedException \Twig\Error\SyntaxError

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests\Extension;

+

 /*

  * This file is part of Twig.

  *

@@ -11,14 +13,14 @@

 use Twig\Environment;

-class Twig_Tests_Extension_CoreTest extends \PHPUnit\Framework\TestCase

+class CoreTest extends \PHPUnit\Framework\TestCase

 {

     /**

      * @dataProvider getRandomFunctionTestData

      */

     public function testRandomFunction(array $expectedInArray, $value1, $value2 = null)

     {

-        $env = new Twig_Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());

+        $env = new Environment($this->getMockBuilder('Twig_LoaderInterface')->getMock());

         for ($i = 0; $i < 100; ++$i) {

             $this->assertTrue(\in_array(twig_random($env, $value1, $value2), $expectedInArray, true)); // assertContains() would not consider the type

         }

@@ -33,7 +35,7 @@ class Twig_Tests_Extension_CoreTest extends \PHPUnit\Framework\TestCase

             ],

             'Traversable' => [

                 ['apple', 'orange', 'citrus'],

-                new ArrayObject(['apple', 'orange', 'citrus']),

+                new \ArrayObject(['apple', 'orange', 'citrus']),

             ],

             'unicode string' => [

                 ['Ä', '€', 'é'],

@@ -137,7 +139,7 @@ class Twig_Tests_Extension_CoreTest extends \PHPUnit\Framework\TestCase

     public function testCustomEscaper($expected, $string, $strategy)

     {

         $twig = new Environment($this->getMockBuilder('\Twig\Loader\LoaderInterface')->getMock());

-        $twig->getExtension('\Twig\Extension\CoreExtension')->setEscaper('foo', 'foo_escaper_for_test');

+        $twig->getExtension('\Twig\Extension\CoreExtension')->setEscaper('foo', '\Twig\Tests\Extension\foo_escaper_for_test');

         $this->assertSame($expected, twig_escape_filter($twig, $string, $strategy));

     }

@@ -320,7 +322,7 @@ final class CoreTestIteratorAggregateAggregate implements \IteratorAggregate

     }

 }

-final class CoreTestIterator implements Iterator

+final class CoreTestIterator implements \Iterator

 {

     private $position;

     private $array;

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests\Extension;

+

 /*

  * This file is part of Twig.

  *

@@ -15,7 +17,7 @@ use Twig\Loader\ArrayLoader;

 use Twig\Sandbox\SecurityError;

 use Twig\Sandbox\SecurityPolicy;

-class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

+class SandboxTest extends \PHPUnit\Framework\TestCase

 {

     protected static $params;

     protected static $templates;

@@ -69,7 +71,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

             $this->fail('Sandbox throws a SecurityError exception if an unallowed method is called');

         } catch (SecurityError $e) {

             $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedMethodError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedMethodError');

-            $this->assertEquals('FooObject', $e->getClassName(), 'Exception should be raised on the "FooObject" class');

+            $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');

             $this->assertEquals('foo', $e->getMethodName(), 'Exception should be raised on the "foo" method');

         }

     }

@@ -106,7 +108,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

             $this->fail('Sandbox throws a SecurityError exception if an unallowed property is called in the template');

         } catch (SecurityError $e) {

             $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedPropertyError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedPropertyError');

-            $this->assertEquals('FooObject', $e->getClassName(), 'Exception should be raised on the "FooObject" class');

+            $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');

             $this->assertEquals('bar', $e->getPropertyName(), 'Exception should be raised on the "bar" property');

         }

     }

@@ -116,13 +118,13 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

      */

     public function testSandboxUnallowedToString($template)

     {

-        $twig = $this->getEnvironment(true, [], ['index' => $template], [], ['upper'], ['FooObject' => 'getAnotherFooObject'], [], ['random']);

+        $twig = $this->getEnvironment(true, [], ['index' => $template], [], ['upper'], ['Twig\Tests\Extension\FooObject' => 'getAnotherFooObject'], [], ['random']);

         try {

             $twig->load('index')->render(self::$params);

             $this->fail('Sandbox throws a SecurityError exception if an unallowed method (__toString()) is called in the template');

         } catch (SecurityError $e) {

             $this->assertInstanceOf('\Twig\Sandbox\SecurityNotAllowedMethodError', $e, 'Exception should be an instance of Twig_Sandbox_SecurityNotAllowedMethodError');

-            $this->assertEquals('FooObject', $e->getClassName(), 'Exception should be raised on the "FooObject" class');

+            $this->assertEquals('Twig\Tests\Extension\FooObject', $e->getClassName(), 'Exception should be raised on the "Twig\Tests\Extension\FooObject" class');

             $this->assertEquals('__tostring', $e->getMethodName(), 'Exception should be raised on the "__toString" method');

         }

     }

@@ -151,7 +153,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

      */

     public function testSandboxAllowedToString($template, $output)

     {

-        $twig = $this->getEnvironment(true, [], ['index' => $template], ['set'], [], ['FooObject' => ['foo', 'getAnotherFooObject']]);

+        $twig = $this->getEnvironment(true, [], ['index' => $template], ['set'], [], ['Twig\Tests\Extension\FooObject' => ['foo', 'getAnotherFooObject']]);

         $this->assertEquals($output, $twig->load('index')->render(self::$params));

     }

@@ -170,7 +172,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

     public function testSandboxAllowMethodToString()

     {

-        $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['FooObject' => '__toString']);

+        $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => '__toString']);

         FooObject::reset();

         $this->assertEquals('foo', $twig->load('1_basic5')->render(self::$params), 'Sandbox allow some methods');

         $this->assertEquals(1, FooObject::$called['__toString'], 'Sandbox only calls method once');

@@ -210,7 +212,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

     public function testSandboxAllowMethodFoo()

     {

-        $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['FooObject' => 'foo']);

+        $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => 'foo']);

         FooObject::reset();

         $this->assertEquals('foo', $twig->load('1_basic1')->render(self::$params), 'Sandbox allow some methods');

         $this->assertEquals(1, FooObject::$called['foo'], 'Sandbox only calls method once');

@@ -230,7 +232,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

     public function testSandboxAllowProperty()

     {

-        $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], ['FooObject' => 'bar']);

+        $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], ['Twig\Tests\Extension\FooObject' => 'bar']);

         $this->assertEquals('bar', $twig->load('1_basic4')->render(self::$params), 'Sandbox allow some properties');

     }

@@ -249,7 +251,7 @@ class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase

     public function testSandboxAllowFunctionsCaseInsensitive()

     {

         foreach (['getfoobar', 'getFoobar', 'getFooBar'] as $name) {

-            $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['FooObject' => $name]);

+            $twig = $this->getEnvironment(true, [], self::$templates, [], [], ['Twig\Tests\Extension\FooObject' => $name]);

             FooObject::reset();

             $this->assertEquals('foobarfoobar', $twig->load('1_basic8')->render(self::$params), 'Sandbox allow methods in a case-insensitive way');

             $this->assertEquals(2, FooObject::$called['getFooBar'], 'Sandbox only calls method once');

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -11,11 +13,11 @@

 use Twig\RuntimeLoader\FactoryRuntimeLoader;

-class Twig_Tests_FactoryRuntimeLoaderTest extends \PHPUnit\Framework\TestCase

+class FactoryRuntimeLoaderTest extends \PHPUnit\Framework\TestCase

 {

     public function testLoad()

     {

-        $loader = new FactoryRuntimeLoader(['stdClass' => 'getRuntime']);

+        $loader = new FactoryRuntimeLoader(['stdClass' => '\Twig\Tests\getRuntime']);

         $this->assertInstanceOf('stdClass', $loader->load('stdClass'));

     }

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -12,9 +14,7 @@

 use Twig\Environment;

 use Twig\Loader\ArrayLoader;

-require_once __DIR__.'/FilesystemHelper.php';

-

-class Twig_Tests_FileCachingTest extends \PHPUnit\Framework\TestCase

+class FileCachingTest extends \PHPUnit\Framework\TestCase

 {

     private $env;

     private $tmpDir;

@@ -35,7 +35,7 @@ class Twig_Tests_FileCachingTest extends \PHPUnit\Framework\TestCase

     protected function tearDown()

     {

-        Twig_Tests_FilesystemHelper::removeDir($this->tmpDir);

+        FilesystemHelper::removeDir($this->tmpDir);

     }

     /**

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -11,7 +13,7 @@

 use Twig\FileExtensionEscapingStrategy;

-class Twig_Tests_FileExtensionEscapingStrategyTest extends \PHPUnit\Framework\TestCase

+class FileExtensionEscapingStrategyTest extends \PHPUnit\Framework\TestCase

 {

     /**

      * @dataProvider getGuessData

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests;

+

 /*

  * This file is part of Twig.

  *

@@ -9,7 +11,7 @@

  * file that was distributed with this source code.

  */

-class Twig_Tests_FilesystemHelper

+class FilesystemHelper

 {

     public static function removeDir($dir)

     {

@@ -1,5 +1,7 @@

 <?php

+namespace Twig\Tests\Fixtures\errors;

+

 require __DIR__.'/../../../../../vendor/autoload.php';

 use Twig\Environment;

@@ -12,7 +12,7 @@ Twig supports method calls

 {{ items.foo.in }}

 {{ items.foo.not }}

 --DATA--

-return ['foo' => 'bar', 'items' => ['foo' => new TwigTestFoo(), 'bar' => 'foo']]

+return ['foo' => 'bar', 'items' => ['foo' => new Twig\Tests\TwigTestFoo(), 'bar' => 'foo']]

 --CONFIG--

 return ['strict_variables' => false]

 --EXPECT--

@@ -51,7 +51,7 @@ return [

         'nullVar'      => null,

         'definedArray' => [0],

     ],

-    'object' => new TwigTestFoo(),

+    'object' => new Twig\Tests\TwigTestFoo(),

 ]

 --CONFIG--

 return ['strict_variables' => false]

@@ -106,7 +106,7 @@ return [

         'nullVar'      => null,

         'definedArray' => [0],

     ],

-    'object' => new TwigTestFoo(),

+    'object' => new Twig\Tests\TwigTestFoo(),

 ]

 --CONFIG--

 return ['strict_variables' => true]

@@ -25,7 +25,7 @@

 --DATA--

 return [

     'it' => new \ArrayIterator(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8]),

-    'ita' => new IteratorAggregateStub(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8]),

+    'ita' => new Twig\Tests\IteratorAggregateStub(['a' => 1, 'b' => 2, 'c' => 5, 'd' => 8]),

 ]

 --EXPECT--

 1 = 5

@@ -18,7 +18,7 @@

 {{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',') }}

 {{ {"a": "w", "b": "x", "c": "y", "d": "z"}|join(',','-') }}

 --DATA--

-return ['foo' => new TwigTestFoo(), 'bar' => new \ArrayObject([3, 4])]

+return ['foo' => new Twig\Tests\TwigTestFoo(), 'bar' => new \ArrayObject([3, 4])]

 --EXPECT--

 foo, bar

 1, 2

@@ -17,14 +17,14 @@ return [

     'array' => [1, 4],

     'string' => 'foo',

     'number' => 1000,

-    'to_string_able' => new ToStringStub('foobar'),

-    'countable' => new CountableStub(42),       /* also asserts we do *not* call __toString() */

-    'iterator_aggregate' => new IteratorAggregateStub(['a', 'b', 'c']),   /* also asserts we do *not* call __toString() */

+    'to_string_able' => new Twig\Tests\ToStringStub('foobar'),

+    'countable' => new Twig\Tests\CountableStub(42),       /* also asserts we do *not* call __toString() */

+    'iterator_aggregate' => new Twig\Tests\IteratorAggregateStub(['a', 'b', 'c']),   /* also asserts we do *not* call __toString() */

     'null'          => null,

-    'magic'         => new MagicCallStub(),     /* used to assert we do *not* call __call */

+    'magic'         => new Twig\Tests\MagicCallStub(),     /* used to assert we do *not* call __call */

     'non_countable' => new \StdClass(),

     'simple_xml_element' => new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><doc><elem/><elem/></doc>'),

-    'iterator' => new \SimpleIteratorForTesting()

+    'iterator' => new Twig\Tests\SimpleIteratorForTesting()

 ]

 --EXPECT--

 2

@@ -8,7 +8,7 @@

 {{ attribute(obj, method) is defined ? 'ok' : 'ko' }}

 {{ attribute(obj, nonmethod) is defined ? 'ok' : 'ko' }}

 --DATA--

-return ['obj' => new TwigTestFoo(), 'method' => 'foo', 'array' => ['foo' => 'bar'], 'item' => 'foo', 'nonmethod' => 'xxx', 'arguments' => ['a', 'b']]

+return ['obj' => new Twig\Tests\TwigTestFoo(), 'method' => 'foo', 'array' => ['foo' => 'bar'], 'item' => 'foo', 'nonmethod' => 'xxx', 'arguments' => ['a', 'b']]

 --EXPECT--

 foo

 bar

@@ -2,8 +2,8 @@

 "const" test

 --TEMPLATE--

 {{ 8 is constant('E_NOTICE') ? 'ok' : 'no' }}