Twig update to latest Twig 1.x legacy as per vichan

1 files changed, 12 insertions, 6 deletions

diff --git a/inc/lib/Twig/Autoloader.php b/inc/lib/Twig/Autoloader.php
index 7007d315..212af544 100644
--- a/inc/lib/Twig/Autoloader.php
+++ b/inc/lib/Twig/Autoloader.php
@@ -3,37 +3,43 @@
 /*
  * This file is part of Twig.
  *
- * (c) 2009 Fabien Potencier
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
+@trigger_error('The Twig_Autoloader class is deprecated since version 1.21 and will be removed in 2.0. Use Composer instead.', E_USER_DEPRECATED);
+
 /**
  * Autoloads Twig classes.
  *
  * @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @deprecated since 1.21 and will be removed in 2.0. Use Composer instead. 2.0.
  */
 class Twig_Autoloader
 {
     /**
      * Registers Twig_Autoloader as an SPL autoloader.
      *
-     * @param Boolean $prepend Whether to prepend the autoloader or not.
+     * @param bool $prepend whether to prepend the autoloader or not
      */
     public static function register($prepend = false)
     {
-        if (version_compare(phpversion(), '5.3.0', '>=')) {
-            spl_autoload_register(array(new self, 'autoload'), true, $prepend);
+        @trigger_error('Using Twig_Autoloader is deprecated since version 1.21. Use Composer instead.', E_USER_DEPRECATED);
+
+        if (PHP_VERSION_ID < 50300) {
+            spl_autoload_register(array(__CLASS__, 'autoload'));
         } else {
-            spl_autoload_register(array(new self, 'autoload'));
+            spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
         }
     }
 
     /**
      * Handles autoloading of classes.
      *
-     * @param string $class A class name.
+     * @param string $class a class name
      */
     public static function autoload($class)
     {