Fix Twig class references

Author: tobias-93

src/Builder/BaseBuilder.php

@@ -10,6 +10,10 @@
 
 namespace TwigGenerator\Builder;
 
+use Twig\Environment;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFilter;
+
 /**
  * @author Cédric Lombardot
  */
@@ -298,12 +302,12 @@ public function addTwigExtensions(array $extensions)
      * Initialize the Twig Environment which automatically loads
      * extensions and filters.
      *
-     * @return \Twig_Environment
+     * @return Environment
      */
     protected function getTwigEnvironment()
     {
-        $loader = new \Twig_Loader_Filesystem($this->getTemplateDirs());
-        $twig = new \Twig_Environment($loader, array(
+        $loader = new FilesystemLoader($this->getTemplateDirs());
+        $twig = new Environment($loader, array(
             'autoescape' => false,
             'strict_variables' => true,
             'debug' => true,
@@ -316,7 +320,7 @@ protected function getTwigEnvironment()
         return $twig;
     }
 
-    protected function loadTwigFilters(\Twig_Environment $twig)
+    protected function loadTwigFilters(Environment $twig)
     {
         foreach ($this->twigFilters as $twigFilter) {
             if (is_object($twigFilter)) {
@@ -327,11 +331,11 @@ protected function loadTwigFilters(\Twig_Environment $twig)
             } else {
                 $twigFilterName = $twigFilter;
             }
-            $twig->addFilter(new \Twig_SimpleFilter($twigFilterName, $twigFilter));
+            $twig->addFilter(new TwigFilter($twigFilterName, $twigFilter));
         }
     }
 
-    protected function loadTwigExtensions(\Twig_Environment $twig)
+    protected function loadTwigExtensions(Environment $twig)
     {
         foreach ($this->twigExtensions as $twigExtensionName) {
             if (is_object($twigExtensionName)) {

tests/TwigGenerator/Tests/Extension/BaseExtensionTest.php

@@ -1,6 +1,10 @@
 <?php
 namespace TwigGenerator\Tests\Extension;
 
+use Twig\Environment;
+use Twig\Extension\AbstractExtension;
+use Twig\Loader\ArrayLoader;
+
 /**
  *
  * Base class to test extensions. Provide builtin functions to initialize
@@ -20,12 +24,12 @@ abstract class BaseExtensionTest extends \PHPUnit_Framework_TestCase
     protected $twigVariables = array();
 
     /**
-     * @var \Twig_Extension
+     * @var AbstractExtension
      */
     protected $extension;
 
     /**
-     * @return \Twig_Extension
+     * @return AbstractExtension
      */
     abstract protected function getTestedExtension();
 
@@ -63,8 +67,8 @@ protected function runTwigTests(array $templates, array $returns)
 
     protected function getEnvironment($templates, $options = array())
     {
-        $twig = new \Twig_Environment(
-            new \Twig_Loader_Array($templates),
+        $twig = new Environment(
+            new ArrayLoader($templates),
             array_merge(
                 array(
                     'debug' => true,