use twig namespaces

CHANGELOG.md

@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - No longer send a response body when one has not been supplied.
+- Stop using deprecated Twig classes and switch to namespaces (Twig 2.7+)
 
 ## 1.0 - 2017-12-02
 ### Changed

composer.json

@@ -33,6 +33,6 @@
 		"smarty/smarty": ">=v3.1.19",
 		"mockery/mockery": "~1.0",
 		"mustache/mustache": "2.7.0",
-		"twig/twig": "~1.0"
+		"twig/twig": "~2.7"
 	}
 }

src/ViewEngine/Twig.php

@@ -12,8 +12,8 @@
 
 use Infuse\ViewEngine;
 use Infuse\View;
-use Twig_Environment;
-use Twig_Loader_Filesystem;
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
 
 class Twig extends ViewEngine
 {
@@ -25,7 +25,7 @@ class Twig extends ViewEngine
     private $viewsDir = 'views';
 
     /**
-     * @var Twig_Environment
+     * @var Environment
      */
     private $twig;
 
@@ -79,13 +79,13 @@ public function renderView(View $view)
     /**
      * Gets (and creates) a new Twig instance.
      *
-     * @return Twig_Environment
+     * @return Environment
      */
     public function twig()
     {
         if (!$this->twig) {
-            $loader = new Twig_Loader_Filesystem($this->viewsDir);
-            $this->twig = new Twig_Environment($loader, $this->twigConfig);
+            $loader = new FilesystemLoader($this->viewsDir);
+            $this->twig = new Environment($loader, $this->twigConfig);
         }
 
         return $this->twig;

tests/ViewEngine/TwigTest.php

@@ -11,6 +11,7 @@
 use Infuse\ViewEngine\Twig;
 use Infuse\View;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
+use Twig\Environment;
 
 class TwigViewEngineTest extends MockeryTestCase
 {
@@ -49,7 +50,7 @@ public function testGlobalParameters()
     public function testTwig()
     {
         $engine = new Twig(__DIR__.'/views');
-        $this->assertInstanceOf('Twig_Environment', $engine->twig());
+        $this->assertInstanceOf(Environment::class, $engine->twig());
     }
 
     public function testRenderView()