Replace deprecated methods as of Twig 2.7

Author: trasher

src/Twig.php

@@ -24,14 +24,14 @@ class Twig implements \ArrayAccess
     /**
      * Twig loader
      *
-     * @var \Twig_LoaderInterface
+     * @var \Twig\Loader\LoaderInterface
      */
     protected $loader;
 
     /**
      * Twig environment
      *
-     * @var \Twig_Environment
+     * @var \Twig\Environment
      */
     protected $environment;
 
@@ -55,7 +55,7 @@ class Twig implements \ArrayAccess
     public function __construct($path, $settings = [])
     {
         $this->loader = $this->createLoader(is_string($path) ? [$path] : $path);
-        $this->environment = new \Twig_Environment($this->loader, $settings);
+        $this->environment = new \Twig\Environment($this->loader, $settings);
     }
 
     /********************************************************************************
@@ -65,9 +65,9 @@ public function __construct($path, $settings = [])
     /**
      * Proxy method to add an extension to the Twig environment
      *
-     * @param \Twig_ExtensionInterface $extension A single extension instance or an array of instances
+     * @param \Twig\Extension\ExtensionInterface $extension A single extension instance or an array of instances
      */
-    public function addExtension(\Twig_ExtensionInterface $extension)
+    public function addExtension(\Twig\Extension\ExtensionInterface $extension)
     {
         $this->environment->addExtension($extension);
     }
@@ -138,11 +138,11 @@ public function render(ResponseInterface $response, $template, $data = [])
      * Create a loader with the given path
      *
      * @param array $paths
-     * @return \Twig_Loader_Filesystem
+     * @return \Twig\Loader\FilesystemLoader
      */
     private function createLoader(array $paths)
     {
-        $loader = new \Twig_Loader_Filesystem();
+        $loader = new \Twig\Loader\FilesystemLoader();
 
         foreach ($paths as $namespace => $path) {
             if (is_string($namespace)) {
@@ -162,7 +162,7 @@ private function createLoader(array $paths)
     /**
      * Return Twig loader
      *
-     * @return \Twig_LoaderInterface
+     * @return \Twig\Loader\LoaderInterface
      */
     public function getLoader()
     {
@@ -172,7 +172,7 @@ public function getLoader()
     /**
      * Return Twig environment
      *
-     * @return \Twig_Environment
+     * @return \Twig\Environment
      */
     public function getEnvironment()
     {

src/TwigExtension.php

@@ -8,7 +8,7 @@
  */
 namespace Slim\Views;
 
-class TwigExtension extends \Twig_Extension
+class TwigExtension extends \Twig\Extension\AbstractExtension
 {
     /**
      * @var \Slim\Interfaces\RouterInterface
@@ -34,10 +34,10 @@ public function getName()
     public function getFunctions()
     {
         return [
-            new \Twig_SimpleFunction('path_for', array($this, 'pathFor')),
-            new \Twig_SimpleFunction('base_url', array($this, 'baseUrl')),
-            new \Twig_SimpleFunction('is_current_path', array($this, 'isCurrentPath')),
-            new \Twig_SimpleFunction('current_path', array($this, 'currentPath')),
+            new \Twig\TwigFunction('path_for', array($this, 'pathFor')),
+            new \Twig\TwigFunction('base_url', array($this, 'baseUrl')),
+            new \Twig\TwigFunction('is_current_path', array($this, 'isCurrentPath')),
+            new \Twig\TwigFunction('current_path', array($this, 'currentPath')),
         ];
     }