Initial attempt a switch to composer and PHP-8.1 compatibility

265 files changed, 929 insertions, 31557 deletions

diff --git a/inc/anti-bot.php b/inc/anti-bot.php
index 59f5351f..4c321176 100644
--- a/inc/anti-bot.php
+++ b/inc/anti-bot.php
@@ -123,7 +123,7 @@ class AntiBot {
 		$html = '';
 		
 		if ($count === false) {
-			$count = mt_rand(1, abs(count($this->inputs) / 15) + 1);
+			$count = mt_rand(1, (int)abs(count($this->inputs) / 15) + 1);
 		}
 		
 		if ($count === true) {
diff --git a/inc/bans.php b/inc/bans.php
index 81e38006..a87fd12a 100644
--- a/inc/bans.php
+++ b/inc/bans.php
@@ -1,10 +1,6 @@
 <?php
 
-require 'inc/lib/IP/Lifo/IP/IP.php';
-require 'inc/lib/IP/Lifo/IP/BC.php';
-require 'inc/lib/IP/Lifo/IP/CIDR.php';
-
-use Lifo\IP\CIDR;
+use AwsumChan\IP\CIDR;
 
 class Bans {
 	static public function range_to_string($mask) {
diff --git a/inc/bootstrap.php b/inc/bootstrap.php
new file mode 100644
index 00000000..e0676f3a
--- /dev/null
+++ b/inc/bootstrap.php
@@ -0,0 +1,4 @@
+<?php
+@define('TINYBOARD', '1');
+require_once 'inc/error.php';
+require_once('vendor/autoload.php');
diff --git a/inc/config.php b/inc/config.php
index 7c7d870d..61c5fe67 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -50,7 +50,7 @@
 
 	// Directory where temporary files will be created.
 	$config['tmp'] = sys_get_temp_dir();
-
+	$config['overboards'] = array();
 	// The HTTP status code to use when redirecting. http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
 	// Can be either 303 "See Other" or 302 "Found". (303 is more correct but both should work.)
 	// There is really no reason for you to ever need to change this.
@@ -1136,7 +1136,8 @@
 	$config['error']['mime_exploit']	= _('MIME type detection XSS exploit (IE) detected; post discarded.');
 	$config['error']['invalid_embed']	= _('Couldn\'t make sense of the URL of the video you tried to embed.');
 	$config['error']['captcha']		= _('You seem to have mistyped the verification.');
-
+	$config['error']['flag_undefined']	= _('The flag %s is undefined, your PHP version is too old!');
+	$config['error']['flag_wrongtype']	= _('defined_flags_accumulate(): The flag %s is of the wrong type!');
 
 	// Moderator errors
 	$config['error']['toomanyunban']	= _('You are only allowed to unban %s users at a time. You tried to unban %u users.');
diff --git a/inc/display.php b/inc/display.php
index 05f91c2b..f702d7f8 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -367,8 +367,8 @@ class Thread {
 		if (isset($this->files))
 			$this->files = @json_decode($this->files);
 		
-		$this->subject = utf8tohtml($this->subject);
-		$this->name = utf8tohtml($this->name);
+		$this->subject = utf8tohtml($this->subject ?? "");
+		$this->name = utf8tohtml($this->name ?? "");
 		$this->mod = $mod;
 		$this->root = $root;
 		$this->hr = $hr;
diff --git a/inc/error.php b/inc/error.php
index 1f66b977..37defe32 100644
--- a/inc/error.php
+++ b/inc/error.php
@@ -1,6 +1,6 @@
 <?PHP
 
-function error_handler($errno,$errstr,$errfile, $errline, $errcontext){
+function error_handler($errno,$errstr,$errfile, $errline){
 	if(error_reporting() & $errno){
 		$config['debug']=true;
 		error($errstr . ' in ' . $errfile . ' at line ' . $errline);
@@ -9,10 +9,11 @@ function error_handler($errno,$errstr,$errfile, $errline, $errcontext){
 }
 
 function exception_handler($e){
-	error($e->getMessage());
+	error($e->getMessage() . " " . $e->getTraceAsString());
 }
 
-set_exception_handler('exception_handler');
+//set_error_handler('error_handler');
+//set_exception_handler('exception_handler');
 
 function fatal_error_handler(){
 	if (($error = error_get_last()) && $error['type'] == E_ERROR) {
@@ -24,7 +25,7 @@ register_shutdown_function('fatal_error_handler');
 
 $error_recursion=false;
 
-function error($message, $priority = true, $debug_stuff = false) {
+function error($message, $priority = true, $debug_stuff = true) {
 	global $board, $mod, $config, $db_error, $error_recursion;
 	
 	if($error_recursion!==false){
@@ -54,7 +55,7 @@ function error($message, $priority = true, $debug_stuff = false) {
 			}
 			$debug_stuff['backtrace'] = debug_backtrace();
 			$pw = $config['db']['password'];
-			$debug_callback = function(&$item) use (&$debug_callback, $pw) {
+			$debug_callback = function(&$item) use ($debug_callback, $pw) {
 				if (is_array($item)) {
 					return array_map($debug_callback, $item);
 				}
diff --git a/inc/functions.php b/inc/functions.php
index 23b61404..b4f07bcb 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -9,25 +9,12 @@ if (realpath($_SERVER['SCRIPT_FILENAME']) == str_replace('\\', '/', __FILE__)) {
 	exit;
 }
 
-define('TINYBOARD', null);
 
 $microtime_start = microtime(true);
-require_once 'inc/error.php';
-require_once 'inc/cache.php';
-require_once 'inc/display.php';
-require_once 'inc/template.php';
-require_once 'inc/database.php';
-require_once 'inc/events.php';
-require_once 'inc/api.php';
-require_once 'inc/mod/auth.php';
-require_once 'inc/lock.php';
-require_once 'inc/queue.php';
-require_once 'inc/polyfill.php';
+$current_locale = 'en';
+require_once 'inc/bootstrap.php';
 @include_once 'inc/lib/parsedown/Parsedown.php'; // fail silently, this isn't a critical piece of code
 
-if (!extension_loaded('gettext')) {
-	require_once 'inc/lib/gettext/gettext.inc';
-}
 
 // the user is not currently logged in as a moderator
 $mod = false;
@@ -58,7 +45,6 @@ function init_locale($locale) {
 		_textdomain('tinyboard');
 	}
 }
-$current_locale = 'en';
 
 
 function loadConfig() {
@@ -228,15 +214,17 @@ function loadConfig() {
 		if (!isset($config['image_deleted']))
 			$config['image_deleted'] = $config['dir']['static'] . 'deleted.png';
 
-		if (!isset($config['uri_thumb']))
-			$config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb'];
-		elseif (isset($board['dir']))
-			$config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']);
+		if (isset($board)) {
+			if (!isset($config['uri_thumb']))
+				$config['uri_thumb'] = $config['root'] . $board['dir'] . $config['dir']['thumb'];
+			elseif (isset($board['dir']))
+				$config['uri_thumb'] = sprintf($config['uri_thumb'], $board['dir']);
 
-		if (!isset($config['uri_img']))
-			$config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img'];
-		elseif (isset($board['dir']))
-			$config['uri_img'] = sprintf($config['uri_img'], $board['dir']);
+			if (!isset($config['uri_img']))
+				$config['uri_img'] = $config['root'] . $board['dir'] . $config['dir']['img'];
+			elseif (isset($board['dir']))
+				$config['uri_img'] = sprintf($config['uri_img'], $board['dir']);
+		}
 
 		if (!isset($config['uri_stylesheets']))
 			$config['uri_stylesheets'] = $config['root'] . 'stylesheets/';
@@ -361,7 +349,7 @@ function define_groups() {
 	foreach ($config['mod']['groups'] as $group_value => $group_name) {
 		$group_name = strtoupper($group_name);
 		if(!defined($group_name)) {
-			define($group_name, $group_value, true);
+			define($group_name, $group_value);
 		}
 	}
 	
@@ -609,7 +597,6 @@ function purge($uri) {
 
 function file_write($path, $data, $simple = false, $skip_purge = false) {
 	global $config, $debug;
-
 	if (preg_match('/^remote:\/\/(.+)\:(.+)$/', $path, $m)) {
 		if (isset($config['remote'][$m[1]])) {
 			require_once 'inc/remote.php';
@@ -1393,7 +1380,6 @@ function index($page, $mod=false, $brief = false) {
 	if ($config['file_board']) {
 		$body = Element('fileboard.html', array('body' => $body, 'mod' => $mod));
 	}
-
 	return array(
 		'board' => $board,
 		'body' => $body,
@@ -1659,7 +1645,6 @@ function buildIndex($global_api = "yes") {
 			$content['pages'][$page-1]['selected'] = true;
 			$content['btn'] = getPageButtons($content['pages']);
 			$content['antibot'] = $antibot;
-
 			file_write($filename, Element('index.html', $content));
 		}
 		elseif ($action == 'delete' || $catalog_api_action == 'delete') {
@@ -1740,7 +1725,6 @@ function buildJavascript() {
 	}
 
 	if ($config['minify_js']) {
-		require_once 'inc/lib/minify/JSMin.php';		
 		$script = JSMin::minify($script);
 	}
 
@@ -2226,8 +2210,25 @@ function escape_markup_modifiers($string) {
 	return preg_replace('@<(tinyboard) ([\w\s]+)>@mi', '<$1 escape $2>', $string);
 }
 
+function defined_flags_accumulate($desired_flags) {
+	$output_flags = 0x0;
+	foreach ($desired_flags as $flagname) {
+		if (defined($flagname)) {
+			$flag = constant($flagname);
+			if (gettype($flag) != 'integer')
+				error(sprintf($config['error']['flag_wrongtype'], $flagname));
+			$output_flags |= $flag;
+		} else {
+			if ($config['deprecation_errors'])
+				error(sprintf($config['error']['flag_undefined'], $flagname));
+		}
+	}
+	return $output_flags;
+}
+
 function utf8tohtml($utf8) {
-	return htmlspecialchars($utf8, ENT_NOQUOTES, 'UTF-8');
+	$flags = defined_flags_accumulate(['ENT_QUOTES', 'ENT_SUBSTITUTE', 'ENT_DISALLOWED']);
+	return htmlspecialchars($utf8 ?? "", $flags, 'UTF-8');
 }
 
 function ordutf8($string, &$offset) {
diff --git a/inc/lib/IP/LICENSE b/inc/lib/IP/LICENSE
deleted file mode 100755
index fb315548..00000000
--- a/inc/lib/IP/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2013 Jason Morriss
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/inc/lib/IP/Lifo/IP/BC.php b/inc/lib/IP/Lifo/IP/BC.php
deleted file mode 100755
index 545fe372..00000000
--- a/inc/lib/IP/Lifo/IP/BC.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-/**
- * This file is part of the Lifo\IP PHP Library.
- *
- * (c) Jason Morriss <lifo2013@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace Lifo\IP;
-
-/**
- * BCMath helper class.
- *
- * Provides a handful of BCMath routines that are not included in the native
- * PHP library.
- *
- * Note: The Bitwise functions operate on fixed byte boundaries. For example,
- * comparing the following numbers uses X number of bits:
- *  0xFFFF and 0xFF will result in comparison of 16 bits.
- *  0xFFFFFFFF and 0xF will result in comparison of 32 bits.
- *  etc...
- *
- */
-abstract class BC
-{
-    // Some common (maybe useless) constants
-    const MAX_INT_32   = '2147483647';                                  // 7FFFFFFF
-    const MAX_UINT_32  = '4294967295';                                  // FFFFFFFF
-    const MAX_INT_64   = '9223372036854775807';                         // 7FFFFFFFFFFFFFFF
-    const MAX_UINT_64  = '18446744073709551615';                        // FFFFFFFFFFFFFFFF
-    const MAX_INT_96   = '39614081257132168796771975167';               // 7FFFFFFFFFFFFFFFFFFFFFFF
-    const MAX_UINT_96  = '79228162514264337593543950335';               // FFFFFFFFFFFFFFFFFFFFFFFF
-    const MAX_INT_128  = '170141183460469231731687303715884105727';     // 7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-    const MAX_UINT_128 = '340282366920938463463374607431768211455';     // FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-
-    /**
-     * BC Math function to convert a HEX string into a DECIMAL
-     */
-    public static function bchexdec($hex)
-    {
-        if (strlen($hex) == 1) {
-            return hexdec($hex);
-        }
-
-        $remain = substr($hex, 0, -1);
-        $last = substr($hex, -1);
-        return bcadd(bcmul(16, self::bchexdec($remain), 0), hexdec($last), 0);
-    }
-
-    /**
-     * BC Math function to convert a DECIMAL string into a BINARY string
-     */
-    public static function bcdecbin($dec, $pad = null)
-    {
-        $bin = '';
-        while ($dec) {
-            $m = bcmod($dec, 2);
-            $dec = bcdiv($dec, 2, 0);
-            $bin = abs($m) . $bin;
-        }
-        return $pad ? sprintf("%0{$pad}s", $bin) : $bin;
-    }
-
-    /**
-     * BC Math function to convert a BINARY string into a DECIMAL string
-     */
-    public static function bcbindec($bin)
-    {
-        $dec = '0';
-        for ($i=0, $j=strlen($bin); $i<$j; $i++) {
-            $dec = bcmul($dec, '2', 0);
-            $dec = bcadd($dec, $bin[$i], 0);
-        }
-        return $dec;
-    }
-
-    /**
-     * BC Math function to convert a BINARY string into a HEX string
-     */
-    public static function bcbinhex($bin, $pad = 0)
-    {
-        return self::bcdechex(self::bcbindec($bin));
-    }
-
-    /**
-     * BC Math function to convert a DECIMAL into a HEX string
-     */
-    public static function bcdechex($dec)
-    {
-        $last = bcmod($dec, 16);
-        $remain = bcdiv(bcsub($dec, $last, 0), 16, 0);
-        return $remain == 0 ? dechex($last) : self::bcdechex($remain) . dechex($last);
-    }
-
-    /**
-     * Bitwise AND two arbitrarily large numbers together.
-     */
-    public static function bcand($left, $right)
-    {
-        $len = self::_bitwise($left, $right);
-
-        $value = '';
-        for ($i=0; $i<$len; $i++) {
-            $value .= (($left{$i} + 0) & ($right{$i} + 0)) ? '1' : '0';
-        }
-        return self::bcbindec($value != '' ? $value : '0');
-    }
-
-    /**
-     * Bitwise OR two arbitrarily large numbers together.
-     */
-    public static function bcor($left, $right)
-    {
-        $len = self::_bitwise($left, $right);
-
-        $value = '';
-        for ($i=0; $i<$len; $i++) {
-            $value .= (($left{$i} + 0) | ($right{$i} + 0)) ? '1' : '0';
-        }
-        return self::bcbindec($value != '' ? $value : '0');
-    }
-
-    /**
-     * Bitwise XOR two arbitrarily large numbers together.
-     */
-    public static function bcxor($left, $right)
-    {
-        $len = self::_bitwise($left, $right);
-
-        $value = '';
-        for ($i=0; $i<$len; $i++) {
-            $value .= (($left{$i} + 0) ^ ($right{$i} + 0)) ? '1' : '0';
-        }
-        return self::bcbindec($value != '' ? $value : '0');
-    }
-
-    /**
-     * Bitwise NOT two arbitrarily large numbers together.
-     */
-    public static function bcnot($left, $bits = null)
-    {
-        $right = 0;
-        $len = self::_bitwise($left, $right, $bits);
-        $value = '';
-        for ($i=0; $i<$len; $i++) {
-            $value .= $left{$i} == '1' ? '0' : '1';
-        }
-        return self::bcbindec($value);
-    }
-
-    /**
-     * Shift number to the left
-     *
-     * @param integer $bits Total bits to shift
-     */
-    public static function bcleft($num, $bits) {
-        return bcmul($num, bcpow('2', $bits));
-    }
-
-    /**
-     * Shift number to the right
-     *
-     * @param integer $bits Total bits to shift
-     */
-    public static function bcright($num, $bits) {
-        return bcdiv($num, bcpow('2', $bits));
-    }
-
-    /**
-     * Determine how many bits are needed to store the number rounded to the
-     * nearest bit boundary.
-     */
-    public static function bits_needed($num, $boundary = 4)
-    {
-        $bits = 0;
-        while ($num > 0) {
-            $num = bcdiv($num, '2', 0);
-            $bits++;
-        }
-        // round to nearest boundrary
-        return $boundary ? ceil($bits / $boundary) * $boundary : $bits;
-    }
-
-    /**
-     * BC Math function to return an arbitrarily large random number.
-     */
-    public static function bcrand($min, $max = null)
-    {
-        if ($max === null) {
-            $max = $min;
-            $min = 0;
-        }
-
-        // swap values if $min > $max
-        if (bccomp($min, $max) == 1) {
-            list($min,$max) = array($max,$min);
-        }
-
-        return bcadd(
-            bcmul(
-                bcdiv(
-                    mt_rand(0, mt_getrandmax()),
-                    mt_getrandmax(),
-                    strlen($max)
-                ),
-                bcsub(
-                    bcadd($max, '1'),
-                    $min
-                )
-            ),
-            $min
-        );
-    }
-
-    /**
-     * Computes the natural logarithm using a series.
-     * @author Thomas Oldbury.
-     * @license Public domain.
-     */
-    public static function bclog($num, $iter = 10, $scale = 100)
-    {
-        $log = "0.0";
-        for($i = 0; $i < $iter; $i++) {
-            $pow = 1 + (2 * $i);
-            $mul = bcdiv("1.0", $pow, $scale);
-            $fraction = bcmul($mul, bcpow(bcsub($num, "1.0", $scale) / bcadd($num, "1.0", $scale), $pow, $scale), $scale);
-            $log = bcadd($fraction, $log, $scale);
-        }
-        return bcmul("2.0", $log, $scale);
-    }
-
-    /**
-     * Computes the base2 log using baseN log.
-     */
-    public static function bclog2($num, $iter = 10, $scale = 100)
-    {
-        return bcdiv(self::bclog($num, $iter, $scale), self::bclog("2", $iter, $scale), $scale);
-    }
-
-    public static function bcfloor($num)
-    {
-        if (substr($num, 0, 1) == '-') {
-            return bcsub($num, 1, 0);
-        }
-        return bcadd($num, 0, 0);
-    }
-
-    public static function bcceil($num)
-    {
-        if (substr($num, 0, 1) == '-') {
-            return bcsub($num, 0, 0);
-        }
-        return bcadd($num, 1, 0);
-    }
-
-    /**
-     * Compare two numbers and return -1, 0, 1 depending if the LEFT number is
-     * < = > the RIGHT.
-     *
-     * @param string|integer $left Left side operand
-     * @param string|integer $right Right side operand
-     * @return integer Return -1,0,1 for <=> comparison
-     */
-    public static function cmp($left, $right)
-    {
-        // @todo could an optimization be done to determine if a normal 32bit
-        //       comparison could be done instead of using bccomp? But would
-        //       the number verification cause too much overhead to be useful?
-        return bccomp($left, $right, 0);
-    }
-
-    /**
-     * Internal function to prepare for bitwise operations
-     */
-    private static function _bitwise(&$left, &$right, $bits = null)
-    {
-        if ($bits === null) {
-            $bits = max(self::bits_needed($left), self::bits_needed($right));
-        }
-
-        $left  = self::bcdecbin($left);
-        $right = self::bcdecbin($right);
-
-        $len   = max(strlen($left), strlen($right), (int)$bits);
-
-        $left  = sprintf("%0{$len}s", $left);
-        $right = sprintf("%0{$len}s", $right);
-
-        return $len;
-    }
-
-}
diff --git a/inc/lib/IP/Lifo/IP/CIDR.php b/inc/lib/IP/Lifo/IP/CIDR.php
deleted file mode 100755
index e8fe32ce..00000000
--- a/inc/lib/IP/Lifo/IP/CIDR.php
+++ /dev/null
@@ -1,706 +0,0 @@
-<?php
-/**
- * This file is part of the Lifo\IP PHP Library.
- *
- * (c) Jason Morriss <lifo2013@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace Lifo\IP;
-
-/**
- * CIDR Block helper class.
- *
- * Most routines can be used statically or by instantiating an object and
- * calling its methods.
- *
- * Provides routines to do various calculations on IP addresses and ranges.
- * Convert to/from CIDR to ranges, etc.
- */
-class CIDR
-{
-    const INTERSECT_NO              = 0;
-    const INTERSECT_YES             = 1;
-    const INTERSECT_LOW             = 2;
-    const INTERSECT_HIGH            = 3;
-
-    protected $start;
-    protected $end;
-    protected $prefix;
-    protected $version;
-    protected $istart;
-    protected $iend;
-
-    private $cache;
-
-    /**
-     * Create a new CIDR object.
-     *
-     * The IP range can be arbitrary and does not have to fall on a valid CIDR
-     * range. Some methods will return different values depending if you ignore
-     * the prefix or not. By default all prefix sensitive methods will assume
-     * the prefix is used.
-     *
-     * @param string $cidr An IP address (1.2.3.4), CIDR block (1.2.3.4/24),
-     *                     or range "1.2.3.4-1.2.3.10"
-     * @param string $end Ending IP in range if no cidr/prefix is given
-     */
-    public function __construct($cidr, $end = null)
-    {
-        if ($end !== null) {
-            $this->setRange($cidr, $end);
-        } else {
-            $this->setCidr($cidr);
-        }
-    }
-
-    /**
-     * Returns the string representation of the CIDR block.
-     */
-    public function __toString()
-    {
-        // do not include the prefix if its a single IP
-        try {
-            if ($this->isTrueCidr() && (
-                ($this->version == 4 and $this->prefix != 32) ||
-                ($this->version == 6 and $this->prefix != 128)
-                )
-            ) {
-                return $this->start . '/' . $this->prefix;
-            }
-        } catch (\Exception $e) {
-            // isTrueCidr() calls getRange which can throw an exception
-        }
-        if (strcmp($this->start, $this->end) == 0) {
-            return $this->start;
-        }
-        return $this->start . ' - ' . $this->end;
-    }
-
-    public function __clone()
-    {
-        // do not clone the cache. No real reason why. I just want to keep the
-        // memory foot print as low as possible, even though this is trivial.
-        $this->cache = array();
-    }
-
-    /**
-     * Set an arbitrary IP range.
-     * The closest matching prefix will be calculated but the actual range
-     * stored in the object can be arbitrary.
-     * @param string $start Starting IP or combination "start-end" string.
-     * @param string $end   Ending IP or null.
-     */
-    public function setRange($ip, $end = null)
-    {
-        if (strpos($ip, '-') !== false) {
-            list($ip, $end) = array_map('trim', explode('-', $ip, 2));
-        }
-
-        if (false === filter_var($ip, FILTER_VALIDATE_IP) ||
-            false === filter_var($end, FILTER_VALIDATE_IP)) {
-            throw new \InvalidArgumentException("Invalid IP range \"$ip-$end\"");
-        }
-
-        // determine version (4 or 6)
-        $this->version = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
-
-        $this->istart = IP::inet_ptod($ip);
-        $this->iend   = IP::inet_ptod($end);
-
-        // fix order
-        if (bccomp($this->istart, $this->iend) == 1) {
-            list($this->istart, $this->iend) = array($this->iend, $this->istart);
-            list($ip, $end) = array($end, $ip);
-        }
-
-        $this->start = $ip;
-        $this->end = $end;
-
-        // calculate real prefix
-        $len = $this->version == 4 ? 32 : 128;
-        $this->prefix = $len - strlen(BC::bcdecbin(BC::bcxor($this->istart, $this->iend)));
-    }
-
-    /**
-     * Returns true if the current IP is a true cidr block
-     */
-    public function isTrueCidr()
-    {
-        return $this->start == $this->getNetwork() && $this->end == $this->getBroadcast();
-    }
-
-    /**
-     * Set the CIDR block.
-     *
-     * The prefix length is optional and will default to 32 ot 128 depending on
-     * the version detected.
-     *
-     * @param string $cidr CIDR block string, eg: "192.168.0.0/24" or "2001::1/64"
-     * @throws \InvalidArgumentException If the CIDR block is invalid
-     */
-    public function setCidr($cidr)
-    {
-        if (strpos($cidr, '-') !== false) {
-            return $this->setRange($cidr);
-        }
-
-        list($ip, $bits) = array_pad(array_map('trim', explode('/', $cidr, 2)), 2, null);
-        if (false === filter_var($ip, FILTER_VALIDATE_IP)) {
-            throw new \InvalidArgumentException("Invalid IP address \"$cidr\"");
-        }
-
-        // determine version (4 or 6)
-        $this->version = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
-
-        $this->start = $ip;
-        $this->istart = IP::inet_ptod($ip);
-
-        if ($bits !== null and $bits !== '') {
-            $this->prefix = $bits;
-        } else {
-            $this->prefix = $this->version == 4 ? 32 : 128;
-        }
-
-        if (($this->prefix < 0)
-            || ($this->prefix > 32 and $this->version == 4)
-            || ($this->prefix > 128 and $this->version == 6)) {
-            throw new \InvalidArgumentException("Invalid IP address \"$cidr\"");
-        }
-
-        $this->end = $this->getBroadcast();
-        $this->iend = IP::inet_ptod($this->end);
-
-        $this->cache = array();
-    }
-
-    /**
-     * Get the IP version. 4 or 6.
-     *
-     * @return integer
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * Get the prefix.
-     *
-     * Always returns the "proper" prefix, even if the IP range is arbitrary.
-     *
-     * @return integer
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * Return the starting presentational IP or Decimal value.
-     *
-     * Ignores prefix
-     */
-    public function getStart($decimal = false)
-    {
-        return $decimal ? $this->istart : $this->start;
-    }
-
-    /**
-     * Return the ending presentational IP or Decimal value.
-     *
-     * Ignores prefix
-     */
-    public function getEnd($decimal = false)
-    {
-        return $decimal ? $this->iend : $this->end;
-    }
-
-    /**
-     * Return the next presentational IP or Decimal value (following the
-     * broadcast address of the current CIDR block).
-     */
-    public function getNext($decimal = false)
-    {
-        $next = bcadd($this->getEnd(true), '1');
-        return $decimal ? $next : new self(IP::inet_dtop($next));
-    }
-
-    /**
-     * Returns true if the IP is an IPv4
-     *
-     * @return boolean
-     */
-    public function isIPv4()
-    {
-        return $this->version == 4;
-    }
-
-    /**
-     * Returns true if the IP is an IPv6
-     *
-     * @return boolean
-     */
-    public function isIPv6()
-    {
-        return $this->version == 6;
-    }
-
-    /**
-     * Get the cidr notation for the subnet block.
-     *
-     * This is useful for when you want a string representation of the IP/prefix
-     * and the starting IP is not on a valid network boundrary (eg: Displaying
-     * an IP from an interface).
-     *
-     * @return string IP in CIDR notation "ipaddr/prefix"
-     */
-    public function getCidr()
-    {
-        return $this->start . '/' . $this->prefix;
-    }
-
-    /**
-     * Get the [low,high] range of the CIDR block
-     *
-     * Prefix sensitive.
-     *
-     * @param boolean $ignorePrefix If true the arbitrary start-end range is
-     *                              returned. default=false.
-     */
-    public function getRange($ignorePrefix = false)
-    {
-        $range = $ignorePrefix
-            ? array($this->start, $this->end)
-            : self::cidr_to_range($this->start, $this->prefix);
-        // watch out for IP '0' being converted to IPv6 '::'
-        if ($range[0] == '::' and strpos($range[1], ':') == false) {
-            $range[0] = '0.0.0.0';
-        }
-        return $range;
-    }
-
-    /**
-     * Return the IP in its fully expanded form.
-     *
-     * For example: 2001::1 == 2007:0000:0000:0000:0000:0000:0000:0001
-     *
-     * @see IP::inet_expand
-     */
-    public function getExpanded()
-    {
-        return IP::inet_expand($this->start);
-    }
-
-    /**
-     * Get network IP of the CIDR block
-     *
-     * Prefix sensitive.
-     *
-     * @param boolean $ignorePrefix If true the arbitrary start-end range is
-     *                              returned. default=false.
-     */
-    public function getNetwork($ignorePrefix = false)
-    {
-        // micro-optimization to prevent calling getRange repeatedly
-        $k = $ignorePrefix ? 1 : 0;
-        if (!isset($this->cache['range'][$k])) {
-            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
-        }
-        return $this->cache['range'][$k][0];
-    }
-
-    /**
-     * Get broadcast IP of the CIDR block
-     *
-     * Prefix sensitive.
-     *
-     * @param boolean $ignorePrefix If true the arbitrary start-end range is
-     *                              returned. default=false.
-     */
-    public function getBroadcast($ignorePrefix = false)
-    {
-        // micro-optimization to prevent calling getRange repeatedly
-        $k = $ignorePrefix ? 1 : 0;
-        if (!isset($this->cache['range'][$k])) {
-            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
-        }
-        return $this->cache['range'][$k][1];
-    }
-
-    /**
-     * Get the network mask based on the prefix.
-     *
-     */
-    public function getMask()
-    {
-        return self::prefix_to_mask($this->prefix, $this->version);
-    }
-
-    /**
-     * Get total hosts within CIDR range
-     *
-     * Prefix sensitive.
-     *
-     * @param boolean $ignorePrefix If true the arbitrary start-end range is
-     *                              returned. default=false.
-     */
-    public function getTotal($ignorePrefix = false)
-    {
-        // micro-optimization to prevent calling getRange repeatedly
-        $k = $ignorePrefix ? 1 : 0;
-        if (!isset($this->cache['range'][$k])) {
-            $this->cache['range'][$k] = $this->getRange($ignorePrefix);
-        }
-        return bcadd(bcsub(IP::inet_ptod($this->cache['range'][$k][1]),
-                           IP::inet_ptod($this->cache['range'][$k][0])), '1');
-    }
-
-    public function intersects($cidr)
-    {
-        return self::cidr_intersect((string)$this, $cidr);
-    }
-
-    /**
-     * Determines the intersection between an IP (with optional prefix) and a
-     * CIDR block.
-     *
-     * The IP will be checked against the CIDR block given and will either be
-     * inside or outside the CIDR completely, or partially.
-     *
-     * NOTE: The caller should explicitly check against the INTERSECT_*
-     * constants because this method will return a value > 1 even for partial
-     * matches.
-     *
-     * @param mixed $ip The IP/cidr to match
-     * @param mixed $cidr The CIDR block to match within
-     * @return integer Returns an INTERSECT_* constant
-     * @throws \InvalidArgumentException if either $ip or $cidr is invalid
-     */
-    public static function cidr_intersect($ip, $cidr)
-    {
-        // use fixed length HEX strings so we can easily do STRING comparisons
-        // instead of using slower bccomp() math.
-        list($lo,$hi)   = array_map(function($v){ return sprintf("%032s", IP::inet_ptoh($v)); }, CIDR::cidr_to_range($ip));
-        list($min,$max) = array_map(function($v){ return sprintf("%032s", IP::inet_ptoh($v)); }, CIDR::cidr_to_range($cidr));
-
-        /** visualization of logic used below
-            lo-hi   = $ip to check
-            min-max = $cidr block being checked against
-            --- --- --- lo  --- --- hi  --- --- --- --- --- IP/prefix to check
-            --- min --- --- max --- --- --- --- --- --- --- Partial "LOW" match
-            --- --- --- --- --- min --- --- max --- --- --- Partial "HIGH" match
-            --- --- --- --- min max --- --- --- --- --- --- No match "NO"
-            --- --- --- --- --- --- --- --- min --- max --- No match "NO"
-            min --- max --- --- --- --- --- --- --- --- --- No match "NO"
-            --- --- min --- --- --- --- max --- --- --- --- Full match "YES"
-         */
-
-        // IP is exact match or completely inside the CIDR block
-        if ($lo >= $min and $hi <= $max) {
-            return self::INTERSECT_YES;
-        }
-
-        // IP is completely outside the CIDR block
-        if ($max < $lo or $min > $hi) {
-            return self::INTERSECT_NO;
-        }
-
-        // @todo is it useful to return LOW/HIGH partial matches?
-
-        // IP matches the lower end
-        if ($max <= $hi and $min <= $lo) {
-            return self::INTERSECT_LOW;
-        }
-
-        // IP matches the higher end
-        if ($min >= $lo and $max >= $hi) {
-            return self::INTERSECT_HIGH;
-        }
-
-        return self::INTERSECT_NO;
-    }
-
-    /**
-     * Converts an IPv4 or IPv6 CIDR block into its range.
-     *
-     * @todo May not be the fastest way to do this.
-     *
-     * @static
-     * @param string       $cidr CIDR block or IP address string.
-     * @param integer|null $bits If /bits is not specified on string they can be
-     *                           passed via this parameter instead.
-     * @return array             A 2 element array with the low, high range
-     */
-    public static function cidr_to_range($cidr, $bits = null)
-    {
-        if (strpos($cidr, '/') !== false) {
-            list($ip, $_bits) = array_pad(explode('/', $cidr, 2), 2, null);
-        } else {
-            $ip = $cidr;
-            $_bits = $bits;
-        }
-
-        if (false === filter_var($ip, FILTER_VALIDATE_IP)) {
-            throw new \InvalidArgumentException("IP address \"$cidr\" is invalid");
-        }
-
-        // force bit length to 32 or 128 depending on type of IP
-        $bitlen = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 128 : 32;
-
-        if ($bits === null) {
-            // if no prefix is given use the length of the binary string which
-            // will give us 32 or 128 and result in a single IP being returned.
-            $bits = $_bits !== null ? $_bits : $bitlen;
-        }
-
-        if ($bits > $bitlen) {
-            throw new \InvalidArgumentException("IP address \"$cidr\" is invalid");
-        }
-
-        $ipdec = IP::inet_ptod($ip);
-        $ipbin = BC::bcdecbin($ipdec, $bitlen);
-
-        // calculate network
-        $netmask = BC::bcbindec(str_pad(str_repeat('1',$bits), $bitlen, '0'));
-        $ip1 = BC::bcand($ipdec, $netmask);
-
-        // calculate "broadcast" (not technically a broadcast in IPv6)
-        $ip2 = BC::bcor($ip1, BC::bcnot($netmask));
-
-        return array(IP::inet_dtop($ip1), IP::inet_dtop($ip2));
-    }
-
-    /**
-     * Return the CIDR string from the range given
-     */
-    public static function range_to_cidr($start, $end)
-    {
-        $cidr = new CIDR($start, $end);
-        return (string)$cidr;
-    }
-
-    /**
-     * Return the maximum prefix length that would fit the IP address given.
-     *
-     * This is useful to determine how my bit would be needed to store the IP
-     * address when you don't already have a prefix for the IP.
-     *
-     * @example 216.240.32.0 would return 27
-     *
-     * @param string $ip IP address without prefix
-     * @param integer $bits Maximum bits to check; defaults to 32 for IPv4 and 128 for IPv6
-     */
-    public static function max_prefix($ip, $bits = null)
-    {
-        static $mask = array();
-
-        $ver = (false === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
-        $max = $ver == 6 ? 128 : 32;
-        if ($bits === null) {
-            $bits = $max;
-
-        }
-
-        $int = IP::inet_ptod($ip);
-        while ($bits > 0) {
-            // micro-optimization; calculate mask once ...
-            if (!isset($mask[$ver][$bits-1])) {
-                // 2^$max - 2^($max - $bits);
-                if ($ver == 4) {
-                    $mask[$ver][$bits-1] = pow(2, $max) - pow(2, $max - ($bits-1));
-                } else {
-                    $mask[$ver][$bits-1] = bcsub(bcpow(2, $max), bcpow(2, $max - ($bits-1)));
-                }
-            }
-
-            $m = $mask[$ver][$bits-1];
-            //printf("%s/%d: %s & %s == %s\n", $ip, $bits-1, BC::bcdecbin($m, 32), BC::bcdecbin($int, 32), BC::bcdecbin(BC::bcand($int, $m)));
-            //echo "$ip/", $bits-1, ": ", IP::inet_dtop($m), " ($m) & $int == ", BC::bcand($int, $m), "\n";
-            if (bccomp(BC::bcand($int, $m), $int) != 0) {
-                return $bits;
-            }
-            $bits--;
-        }
-        return $bits;
-    }
-
-    /**
-     * Return a contiguous list of true CIDR blocks that span the range given.
-     *
-     * Note: It's not a good idea to call this with IPv6 addresses. While it may
-     * work for certain ranges this can be very slow. Also an IPv6 list won't be
-     * as accurate as an IPv4 list.
-     *
-     * @example
-     *  range_to_cidrlist(192.168.0.0, 192.168.0.15) ==
-     *    192.168.0.0/28
-     *  range_to_cidrlist(192.168.0.0, 192.168.0.20) ==
-     *    192.168.0.0/28
-     *    192.168.0.16/30
-     *    192.168.0.20/32
-     */
-    public static function range_to_cidrlist($start, $end)
-    {
-        $ver   = (false === filter_var($start, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) ? 6 : 4;
-        $start = IP::inet_ptod($start);
-        $end   = IP::inet_ptod($end);
-
-        $len = $ver == 4 ? 32 : 128;
-        $log2 = $ver == 4 ? log(2) : BC::bclog(2);
-
-        $list = array();
-        while (BC::cmp($end, $start) >= 0) { // $end >= $start
-            $prefix = self::max_prefix(IP::inet_dtop($start), $len);
-            if ($ver == 4) {
-                $diff = $len - floor( log($end - $start + 1) / $log2 );
-            } else {
-                // this is not as accurate due to the bclog function
-                $diff = bcsub($len, BC::bcfloor(bcdiv(BC::bclog(bcadd(bcsub($end, $start), '1')), $log2)));
-            }
-
-            if ($prefix < $diff) {
-                $prefix = $diff;
-            }
-
-            $list[] = IP::inet_dtop($start) . "/" . $prefix;
-
-            if ($ver == 4) {
-                $start += pow(2, $len - $prefix);
-            } else {
-                $start = bcadd($start, bcpow(2, $len - $prefix));
-            }
-        }
-        return $list;
-    }
-
-    /**
-     * Return an list of optimized CIDR blocks by collapsing adjacent CIDR
-     * blocks into larger blocks.
-     *
-     * @param array $cidrs List of CIDR block strings or objects
-     * @param integer $maxPrefix Maximum prefix to allow
-     * @return array Optimized list of CIDR objects
-     */
-    public static function optimize_cidrlist($cidrs, $maxPrefix = 32)
-    {
-        // all indexes must be a CIDR object
-        $cidrs = array_map(function($o){ return $o instanceof CIDR ? $o : new CIDR($o); }, $cidrs);
-        // sort CIDR blocks in proper order so we can easily loop over them
-        $cidrs = self::cidr_sort($cidrs);
-
-        $list = array();
-        while ($cidrs) {
-            $c = array_shift($cidrs);
-            $start = $c->getStart();
-
-            $max = bcadd($c->getStart(true), $c->getTotal());
-
-            // loop through each cidr block until its ending range is more than
-            // the current maximum.
-            while (!empty($cidrs) and $cidrs[0]->getStart(true) <= $max) {
-                $b = array_shift($cidrs);
-                $newmax = bcadd($b->getStart(true), $b->getTotal());
-                if ($newmax > $max) {
-                    $max = $newmax;
-                }
-            }
-
-            // add the new cidr range to the optimized list
-            $list = array_merge($list, self::range_to_cidrlist($start, IP::inet_dtop(bcsub($max, '1'))));
-        }
-
-        return $list;
-    }
-
-    /**
-     * Sort the list of CIDR blocks, optionally with a custom callback function.
-     *
-     * @param array $cidrs A list of CIDR blocks (strings or objects)
-     * @param Closure $callback Optional callback to perform the sorting.
-     *                          See PHP usort documentation for more details.
-     */
-    public static function cidr_sort($cidrs, $callback = null)
-    {
-        // all indexes must be a CIDR object
-        $cidrs = array_map(function($o){ return $o instanceof CIDR ? $o : new CIDR($o); }, $cidrs);
-
-        if ($callback === null) {
-            $callback = function($a, $b) {
-                if (0 != ($o = BC::cmp($a->getStart(true), $b->getStart(true)))) {
-                    return $o;  // < or >
-                }
-                if ($a->getPrefix() == $b->getPrefix()) {
-                    return 0;
-                }
-                return $a->getPrefix() < $b->getPrefix() ? -1 : 1;
-            };
-        } elseif (!($callback instanceof \Closure) or !is_callable($callback)) {
-            throw new \InvalidArgumentException("Invalid callback in CIDR::cidr_sort, expected Closure, got " . gettype($callback));
-        }
-
-        usort($cidrs, $callback);
-        return $cidrs;
-    }
-
-    /**
-     * Return the Prefix bits from the IPv4 mask given.
-     *
-     * This is only valid for IPv4 addresses since IPv6 addressing does not
-     * have a concept of network masks.
-     *
-     * Example: 255.255.255.0 == 24
-     *
-     * @param string $mask IPv4 network mask.
-     */
-    public static function mask_to_prefix($mask)
-    {
-        if (false === filter_var($mask, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            throw new \InvalidArgumentException("Invalid IP netmask \"$mask\"");
-        }
-        return strrpos(IP::inet_ptob($mask, 32), '1') + 1;
-    }
-
-    /**
-     * Return the network mask for the prefix given.
-     *
-     * Normally this is only useful for IPv4 addresses but you can generate a
-     * mask for IPv6 addresses as well, only because its mathematically
-     * possible.
-     *
-     * @param integer $prefix CIDR prefix bits (0-128)
-     * @param integer $version IP version. If null the version will be detected
-     *                         based on the prefix length given.
-     */
-    public static function prefix_to_mask($prefix, $version = null)
-    {
-        if ($version === null) {
-            $version = $prefix > 32 ? 6 : 4;
-        }
-        if ($prefix < 0 or $prefix > 128) {
-            throw new \InvalidArgumentException("Invalid prefix length \"$prefix\"");
-        }
-        if ($version != 4 and $version != 6) {
-            throw new \InvalidArgumentException("Invalid version \"$version\". Must be 4 or 6");
-        }
-
-        if ($version == 4) {
-            return long2ip($prefix == 0 ? 0 : (0xFFFFFFFF >> (32 - $prefix)) << (32 - $prefix));
-        } else {
-            return IP::inet_dtop($prefix == 0 ? 0 : BC::bcleft(BC::bcright(BC::MAX_UINT_128, 128-$prefix), 128-$prefix));
-        }
-    }
-
-    /**
-     * Return true if the $ip given is a true CIDR block.
-     *
-     * A true CIDR block is one where the $ip given is the actual Network
-     * address and broadcast matches the prefix appropriately.
-     */
-    public static function cidr_is_true($ip)
-    {
-        $ip = new CIDR($ip);
-        return $ip->isTrueCidr();
-    }
-}
diff --git a/inc/lib/IP/Lifo/IP/IP.php b/inc/lib/IP/Lifo/IP/IP.php
deleted file mode 100755
index 4d22aa76..00000000
--- a/inc/lib/IP/Lifo/IP/IP.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/**
- * This file is part of the Lifo\IP PHP Library.
- *
- * (c) Jason Morriss <lifo2013@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-namespace Lifo\IP;
-
-/**
- * IP Address helper class.
- *
- * Provides routines to translate IPv4 and IPv6 addresses between human readable
- * strings, decimal, hexidecimal and binary.
- *
- * Requires BCmath extension and IPv6 PHP support
- */
-abstract class IP
-{
-    /**
-     * Convert a human readable (presentational) IP address string into a decimal string.
-     */
-    public static function inet_ptod($ip)
-    {
-        // shortcut for IPv4 addresses
-        if (strpos($ip, ':') === false && strpos($ip, '.') !== false) {
-            return sprintf('%u', ip2long($ip));
-        }
-
-        // remove any cidr block notation
-        if (($o = strpos($ip, '/')) !== false) {
-            $ip = substr($ip, 0, $o);
-        }
-
-        // unpack into 4 32bit integers
-        $parts = unpack('N*', inet_pton($ip));
-        foreach ($parts as &$part) {
-            if ($part < 0) {
-                // convert signed int into unsigned
-                $part = sprintf('%u', $part);
-                //$part = bcadd($part, '4294967296');
-            }
-        }
-
-        // add each 32bit integer to the proper bit location in our big decimal
-        $decimal = $parts[4];                                                           // << 0
-        $decimal = bcadd($decimal, bcmul($parts[3], '4294967296'));                     // << 32
-        $decimal = bcadd($decimal, bcmul($parts[2], '18446744073709551616'));           // << 64
-        $decimal = bcadd($decimal, bcmul($parts[1], '79228162514264337593543950336'));  // << 96
-
-        return $decimal;
-    }
-
-    /**
-     * Convert a decimal string into a human readable IP address.
-     */
-    public static function inet_dtop($decimal, $expand = false)
-    {
-        $parts = array();
-        $parts[1] = bcdiv($decimal,                  '79228162514264337593543950336', 0);   // >> 96
-        $decimal  = bcsub($decimal, bcmul($parts[1], '79228162514264337593543950336'));
-        $parts[2] = bcdiv($decimal,                  '18446744073709551616', 0);            // >> 64
-        $decimal  = bcsub($decimal, bcmul($parts[2], '18446744073709551616'));
-        $parts[3] = bcdiv($decimal,                  '4294967296', 0);                      // >> 32
-        $decimal  = bcsub($decimal, bcmul($parts[3], '4294967296'));
-        $parts[4] = $decimal;                                                               // >> 0
-
-        foreach ($parts as &$part) {
-            if (bccomp($part, '2147483647') == 1) {
-                $part = bcsub($part, '4294967296');
-            }
-            $part = (int) $part;
-        }
-
-        // if the first 96bits is all zeros then we can safely assume we
-        // actually have an IPv4 address. Even though it's technically possible
-        // you're not really ever going to see an IPv6 address in the range:
-        // ::0 - ::ffff
-        // It's feasible to see an IPv6 address of "::", in which case the
-        // caller is going to have to account for that on their own.
-        if (($parts[1] | $parts[2] | $parts[3]) == 0) {
-            $ip = long2ip($parts[4]);
-        } else {
-            $packed = pack('N4', $parts[1], $parts[2], $parts[3], $parts[4]);
-            $ip = inet_ntop($packed);
-        }
-
-        // Turn IPv6 to IPv4 if it's IPv4
-        if (preg_match('/^::\d+\./', $ip)) {
-            return substr($ip, 2);
-        }
-
-        return $expand ? self::inet_expand($ip) : $ip;
-    }
-
-    /**
-     * Convert a human readable (presentational) IP address into a HEX string.
-     */
-    public static function inet_ptoh($ip)
-    {
-        return bin2hex(inet_pton($ip));
-        //return BC::bcdechex(self::inet_ptod($ip));
-    }
-
-    /**
-     * Convert a human readable (presentational) IP address into a BINARY string.
-     */
-    public static function inet_ptob($ip, $bits = 128)
-    {
-        return BC::bcdecbin(self::inet_ptod($ip), $bits);
-    }
-
-    /**
-     * Convert a binary string into an IP address (presentational) string.
-     */
-    public static function inet_btop($bin)
-    {
-        return self::inet_dtop(BC::bcbindec($bin));
-    }
-
-    /**
-     * Convert a HEX string into a human readable (presentational) IP address
-     */
-    public static function inet_htop($hex)
-    {
-        return self::inet_dtop(BC::bchexdec($hex));
-    }
-
-    /**
-     * Expand an IP address. IPv4 addresses are returned as-is.
-     *
-     * Example:
-     *      2001::1     expands to 2001:0000:0000:0000:0000:0000:0000:0001
-     *      ::127.0.0.1 expands to 0000:0000:0000:0000:0000:0000:7f00:0001
-     *      127.0.0.1   expands to 127.0.0.1
-     */
-    public static function inet_expand($ip)
-    {
-        // strip possible cidr notation off
-        if (($pos = strpos($ip, '/')) !== false) {
-            $ip = substr($ip, 0, $pos);
-        }
-        $bytes = unpack('n*', inet_pton($ip));
-        if (count($bytes) > 2) {
-            return implode(':', array_map(function ($b) {
-                return sprintf("%04x", $b);
-            }, $bytes));
-        }
-        return $ip;
-    }
-
-    /**
-     * Convert an IPv4 address into an IPv6 address.
-     *
-     * One use-case for this is IP 6to4 tunnels used in networking.
-     *
-     * @example
-     *      to_ipv4("10.10.10.10") == a0a:a0a
-     *
-     * @param string $ip IPv4 address.
-     * @param boolean $mapped If true a Full IPv6 address is returned within the
-     *                        official ipv4to6 mapped space "0:0:0:0:0:ffff:x:x"
-     */
-    public static function to_ipv6($ip, $mapped = false)
-    {
-        if (!self::isIPv4($ip)) {
-            throw new \InvalidArgumentException("Invalid IPv4 address \"$ip\"");
-        }
-
-        $num = IP::inet_ptod($ip);
-        $o1 = dechex($num >> 16);
-        $o2 = dechex($num & 0x0000FFFF);
-
-        return $mapped ? "0:0:0:0:0:ffff:$o1:$o2" : "$o1:$o2";
-    }
-
-    /**
-     * Returns true if the IP address is a valid IPv4 address
-     */
-    public static function isIPv4($ip)
-    {
-        return $ip === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
-    }
-
-    /**
-     * Returns true if the IP address is a valid IPv6 address
-     */
-    public static function isIPv6($ip)
-    {
-        return $ip === filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
-    }
-
-    /**
-     * Compare two IP's (v4 or v6) and return -1, 0, 1 if the first is < = >
-     * the second.
-     *
-     * @param string $ip1 IP address
-     * @param string $ip2 IP address to compare against
-     * @return integer Return -1,0,1 depending if $ip1 is <=> $ip2
-     */
-    public static function cmp($ip1, $ip2)
-    {
-        return bccomp(self::inet_ptod($ip1), self::inet_ptod($ip2), 0);
-    }
-}
diff --git a/inc/lib/Twig/Autoloader.php b/inc/lib/Twig/Autoloader.php
deleted file mode 100644
index 212af544..00000000
--- a/inc/lib/Twig/Autoloader.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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 bool $prepend whether to prepend the autoloader or not
-     */
-    public static function register($prepend = false)
-    {
-        @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(__CLASS__, 'autoload'), true, $prepend);
-        }
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class a class name
-     */
-    public static function autoload($class)
-    {
-        if (0 !== strpos($class, 'Twig')) {
-            return;
-        }
-
-        if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
-            require $file;
-        }
-    }
-}
diff --git a/inc/lib/Twig/BaseNodeVisitor.php b/inc/lib/Twig/BaseNodeVisitor.php
deleted file mode 100644
index d8ef02fb..00000000
--- a/inc/lib/Twig/BaseNodeVisitor.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_BaseNodeVisitor can be used to make node visitors compatible with Twig 1.x and 2.x.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
-{
-    final public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node) {
-            throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
-        }
-
-        return $this->doEnterNode($node, $env);
-    }
-
-    final public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node) {
-            throw new LogicException('Twig_BaseNodeVisitor only supports Twig_Node instances.');
-        }
-
-        return $this->doLeaveNode($node, $env);
-    }
-
-    /**
-     * Called before child nodes are visited.
-     *
-     * @return Twig_Node The modified node
-     */
-    abstract protected function doEnterNode(Twig_Node $node, Twig_Environment $env);
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @return Twig_Node|false The modified node or false if the node must be removed
-     */
-    abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
-}
-
-class_alias('Twig_BaseNodeVisitor', 'Twig\NodeVisitor\AbstractNodeVisitor', false);
-class_exists('Twig_Environment');
-class_exists('Twig_Node');
diff --git a/inc/lib/Twig/Cache/Filesystem.php b/inc/lib/Twig/Cache/Filesystem.php
deleted file mode 100644
index 65976282..00000000
--- a/inc/lib/Twig/Cache/Filesystem.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Implements a cache on the filesystem.
- *
- * @author Andrew Tch <andrew@noop.lv>
- */
-class Twig_Cache_Filesystem implements Twig_CacheInterface
-{
-    const FORCE_BYTECODE_INVALIDATION = 1;
-
-    private $directory;
-    private $options;
-
-    /**
-     * @param $directory string The root cache directory
-     * @param $options   int    A set of options
-     */
-    public function __construct($directory, $options = 0)
-    {
-        $this->directory = rtrim($directory, '\/').'/';
-        $this->options = $options;
-    }
-
-    public function generateKey($name, $className)
-    {
-        $hash = hash('sha256', $className);
-
-        return $this->directory.$hash[0].$hash[1].'/'.$hash.'.php';
-    }
-
-    public function load($key)
-    {
-        if (file_exists($key)) {
-            @include_once $key;
-        }
-    }
-
-    public function write($key, $content)
-    {
-        $dir = dirname($key);
-        if (!is_dir($dir)) {
-            if (false === @mkdir($dir, 0777, true)) {
-                if (PHP_VERSION_ID >= 50300) {
-                    clearstatcache(true, $dir);
-                }
-                if (!is_dir($dir)) {
-                    throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
-                }
-            }
-        } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf('Unable to write in the cache directory (%s).', $dir));
-        }
-
-        $tmpFile = tempnam($dir, basename($key));
-        if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $key)) {
-            @chmod($key, 0666 & ~umask());
-
-            if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
-                // Compile cached file into bytecode cache
-                if (function_exists('opcache_invalidate')) {
-                    opcache_invalidate($key, true);
-                } elseif (function_exists('apc_compile_file')) {
-                    apc_compile_file($key);
-                }
-            }
-
-            return;
-        }
-
-        throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
-    }
-
-    public function getTimestamp($key)
-    {
-        if (!file_exists($key)) {
-            return 0;
-        }
-
-        return (int) @filemtime($key);
-    }
-}
-
-class_alias('Twig_Cache_Filesystem', 'Twig\Cache\FilesystemCache', false);
diff --git a/inc/lib/Twig/Cache/Null.php b/inc/lib/Twig/Cache/Null.php
deleted file mode 100644
index 69d1d2f9..00000000
--- a/inc/lib/Twig/Cache/Null.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Implements a no-cache strategy.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Cache_Null implements Twig_CacheInterface
-{
-    public function generateKey($name, $className)
-    {
-        return '';
-    }
-
-    public function write($key, $content)
-    {
-    }
-
-    public function load($key)
-    {
-    }
-
-    public function getTimestamp($key)
-    {
-        return 0;
-    }
-}
-
-class_alias('Twig_Cache_Null', 'Twig\Cache\NullCache', false);
diff --git a/inc/lib/Twig/CacheInterface.php b/inc/lib/Twig/CacheInterface.php
deleted file mode 100644
index 776808bf..00000000
--- a/inc/lib/Twig/CacheInterface.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by cache classes.
- *
- * It is highly recommended to always store templates on the filesystem to
- * benefit from the PHP opcode cache. This interface is mostly useful if you
- * need to implement a custom strategy for storing templates on the filesystem.
- *
- * @author Andrew Tch <andrew@noop.lv>
- */
-interface Twig_CacheInterface
-{
-    /**
-     * Generates a cache key for the given template class name.
-     *
-     * @param string $name      The template name
-     * @param string $className The template class name
-     *
-     * @return string
-     */
-    public function generateKey($name, $className);
-
-    /**
-     * Writes the compiled template to cache.
-     *
-     * @param string $key     The cache key
-     * @param string $content The template representation as a PHP class
-     */
-    public function write($key, $content);
-
-    /**
-     * Loads a template from the cache.
-     *
-     * @param string $key The cache key
-     */
-    public function load($key);
-
-    /**
-     * Returns the modification timestamp of a key.
-     *
-     * @param string $key The cache key
-     *
-     * @return int
-     */
-    public function getTimestamp($key);
-}
-
-class_alias('Twig_CacheInterface', 'Twig\Cache\CacheInterface', false);
diff --git a/inc/lib/Twig/Compiler.php b/inc/lib/Twig/Compiler.php
deleted file mode 100644
index 803eb896..00000000
--- a/inc/lib/Twig/Compiler.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Compiles a node to PHP code.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Compiler implements Twig_CompilerInterface
-{
-    protected $lastLine;
-    protected $source;
-    protected $indentation;
-    protected $env;
-    protected $debugInfo = array();
-    protected $sourceOffset;
-    protected $sourceLine;
-    protected $filename;
-    private $varNameSalt = 0;
-
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * @deprecated since 1.25 (to be removed in 2.0)
-     */
-    public function getFilename()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
-        return $this->filename;
-    }
-
-    /**
-     * Returns the environment instance related to this compiler.
-     *
-     * @return Twig_Environment
-     */
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource()
-    {
-        return $this->source;
-    }
-
-    /**
-     * Compiles a node.
-     *
-     * @param Twig_NodeInterface $node        The node to compile
-     * @param int                $indentation The current indentation
-     *
-     * @return $this
-     */
-    public function compile(Twig_NodeInterface $node, $indentation = 0)
-    {
-        $this->lastLine = null;
-        $this->source = '';
-        $this->debugInfo = array();
-        $this->sourceOffset = 0;
-        // source code starts at 1 (as we then increment it when we encounter new lines)
-        $this->sourceLine = 1;
-        $this->indentation = $indentation;
-        $this->varNameSalt = 0;
-
-        if ($node instanceof Twig_Node_Module) {
-            // to be removed in 2.0
-            $this->filename = $node->getTemplateName();
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    public function subcompile(Twig_NodeInterface $node, $raw = true)
-    {
-        if (false === $raw) {
-            $this->source .= str_repeat(' ', $this->indentation * 4);
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    /**
-     * Adds a raw string to the compiled code.
-     *
-     * @param string $string The string
-     *
-     * @return $this
-     */
-    public function raw($string)
-    {
-        $this->source .= $string;
-
-        return $this;
-    }
-
-    /**
-     * Writes a string to the compiled code by adding indentation.
-     *
-     * @return $this
-     */
-    public function write()
-    {
-        $strings = func_get_args();
-        foreach ($strings as $string) {
-            $this->source .= str_repeat(' ', $this->indentation * 4).$string;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Appends an indentation to the current PHP code after compilation.
-     *
-     * @return $this
-     *
-     * @deprecated since 1.27 (to be removed in 2.0).
-     */
-    public function addIndentation()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use write(\'\') instead.', E_USER_DEPRECATED);
-
-        $this->source .= str_repeat(' ', $this->indentation * 4);
-
-        return $this;
-    }
-
-    /**
-     * Adds a quoted string to the compiled code.
-     *
-     * @param string $value The string
-     *
-     * @return $this
-     */
-    public function string($value)
-    {
-        $this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
-
-        return $this;
-    }
-
-    /**
-     * Returns a PHP representation of a given value.
-     *
-     * @param mixed $value The value to convert
-     *
-     * @return $this
-     */
-    public function repr($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, '0')) {
-                setlocale(LC_NUMERIC, 'C');
-            }
-
-            $this->raw($value);
-
-            if (false !== $locale) {
-                setlocale(LC_NUMERIC, $locale);
-            }
-        } elseif (null === $value) {
-            $this->raw('null');
-        } elseif (is_bool($value)) {
-            $this->raw($value ? 'true' : 'false');
-        } elseif (is_array($value)) {
-            $this->raw('array(');
-            $first = true;
-            foreach ($value as $key => $v) {
-                if (!$first) {
-                    $this->raw(', ');
-                }
-                $first = false;
-                $this->repr($key);
-                $this->raw(' => ');
-                $this->repr($v);
-            }
-            $this->raw(')');
-        } else {
-            $this->string($value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds debugging information.
-     *
-     * @return $this
-     */
-    public function addDebugInfo(Twig_NodeInterface $node)
-    {
-        if ($node->getTemplateLine() != $this->lastLine) {
-            $this->write(sprintf("// line %d\n", $node->getTemplateLine()));
-
-            // when mbstring.func_overload is set to 2
-            // mb_substr_count() replaces substr_count()
-            // but they have different signatures!
-            if (((int) ini_get('mbstring.func_overload')) & 2) {
-                @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-                // this is much slower than the "right" version
-                $this->sourceLine += mb_substr_count(mb_substr($this->source, $this->sourceOffset), "\n");
-            } else {
-                $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
-            }
-            $this->sourceOffset = strlen($this->source);
-            $this->debugInfo[$this->sourceLine] = $node->getTemplateLine();
-
-            $this->lastLine = $node->getTemplateLine();
-        }
-
-        return $this;
-    }
-
-    public function getDebugInfo()
-    {
-        ksort($this->debugInfo);
-
-        return $this->debugInfo;
-    }
-
-    /**
-     * Indents the generated code.
-     *
-     * @param int $step The number of indentation to add
-     *
-     * @return $this
-     */
-    public function indent($step = 1)
-    {
-        $this->indentation += $step;
-
-        return $this;
-    }
-
-    /**
-     * Outdents the generated code.
-     *
-     * @param int $step The number of indentation to remove
-     *
-     * @return $this
-     *
-     * @throws LogicException When trying to outdent too much so the indentation would become negative
-     */
-    public function outdent($step = 1)
-    {
-        // can't outdent by more steps than the current indentation level
-        if ($this->indentation < $step) {
-            throw new LogicException('Unable to call outdent() as the indentation would become negative.');
-        }
-
-        $this->indentation -= $step;
-
-        return $this;
-    }
-
-    public function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', __METHOD__.$this->varNameSalt++));
-    }
-}
-
-class_alias('Twig_Compiler', 'Twig\Compiler', false);
-class_exists('Twig_Node');
diff --git a/inc/lib/Twig/CompilerInterface.php b/inc/lib/Twig/CompilerInterface.php
deleted file mode 100644
index 42872c9c..00000000
--- a/inc/lib/Twig/CompilerInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by compiler classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_CompilerInterface
-{
-    /**
-     * Compiles a node.
-     *
-     * @return $this
-     */
-    public function compile(Twig_NodeInterface $node);
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource();
-}
diff --git a/inc/lib/Twig/ContainerRuntimeLoader.php b/inc/lib/Twig/ContainerRuntimeLoader.php
deleted file mode 100644
index 814ab58b..00000000
--- a/inc/lib/Twig/ContainerRuntimeLoader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Psr\Container\ContainerInterface;
-
-/**
- * Lazily loads Twig runtime implementations from a PSR-11 container.
- *
- * Note that the runtime services MUST use their class names as identifiers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Robin Chalas <robin.chalas@gmail.com>
- */
-class Twig_ContainerRuntimeLoader implements Twig_RuntimeLoaderInterface
-{
-    private $container;
-
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
-
-    public function load($class)
-    {
-        if ($this->container->has($class)) {
-            return $this->container->get($class);
-        }
-    }
-}
-
-class_alias('Twig_ContainerRuntimeLoader', 'Twig\RuntimeLoader\ContainerRuntimeLoader', false);
diff --git a/inc/lib/Twig/Environment.php b/inc/lib/Twig/Environment.php
deleted file mode 100644
index b15f2aff..00000000
--- a/inc/lib/Twig/Environment.php
+++ /dev/null
@@ -1,1604 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores the Twig configuration.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Environment
-{
-    const VERSION = '1.35.4-DEV';
-    const VERSION_ID = 13504;
-    const MAJOR_VERSION = 1;
-    const MINOR_VERSION = 35;
-    const RELEASE_VERSION = 4;
-    const EXTRA_VERSION = 'DEV';
-
-    protected $charset;
-    protected $loader;
-    protected $debug;
-    protected $autoReload;
-    protected $cache;
-    protected $lexer;
-    protected $parser;
-    protected $compiler;
-    protected $baseTemplateClass;
-    protected $extensions;
-    protected $parsers;
-    protected $visitors;
-    protected $filters;
-    protected $tests;
-    protected $functions;
-    protected $globals;
-    protected $runtimeInitialized = false;
-    protected $extensionInitialized = false;
-    protected $loadedTemplates;
-    protected $strictVariables;
-    protected $unaryOperators;
-    protected $binaryOperators;
-    protected $templateClassPrefix = '__TwigTemplate_';
-    protected $functionCallbacks = array();
-    protected $filterCallbacks = array();
-    protected $staging;
-
-    private $originalCache;
-    private $bcWriteCacheFile = false;
-    private $bcGetCacheFilename = false;
-    private $lastModifiedExtension = 0;
-    private $extensionsByClass = array();
-    private $runtimeLoaders = array();
-    private $runtimes = array();
-    private $optionsHash;
-    private $loading = array();
-
-    /**
-     * Constructor.
-     *
-     * Available options:
-     *
-     *  * debug: When set to true, it automatically set "auto_reload" to true as
-     *           well (default to false).
-     *
-     *  * charset: The charset used by the templates (default to UTF-8).
-     *
-     *  * base_template_class: The base template class to use for generated
-     *                         templates (default to Twig_Template).
-     *
-     *  * cache: An absolute path where to store the compiled templates,
-     *           a Twig_Cache_Interface implementation,
-     *           or false to disable compilation cache (default).
-     *
-     *  * auto_reload: Whether to reload the template if the original source changed.
-     *                 If you don't provide the auto_reload option, it will be
-     *                 determined automatically based on the debug value.
-     *
-     *  * strict_variables: Whether to ignore invalid variables in templates
-     *                      (default to false).
-     *
-     *  * autoescape: Whether to enable auto-escaping (default to html):
-     *                  * false: disable auto-escaping
-     *                  * true: equivalent to html
-     *                  * html, js: set the autoescaping to one of the supported strategies
-     *                  * name: set the autoescaping strategy based on the template name extension
-     *                  * PHP callback: a PHP callback that returns an escaping strategy based on the template "name"
-     *
-     *  * optimizations: A flag that indicates which optimizations to apply
-     *                   (default to -1 which means that all optimizations are enabled;
-     *                   set it to 0 to disable).
-     *
-     * @param Twig_LoaderInterface $loader
-     * @param array                $options An array of options
-     */
-    public function __construct(Twig_LoaderInterface $loader = null, $options = array())
-    {
-        if (null !== $loader) {
-            $this->setLoader($loader);
-        } else {
-            @trigger_error('Not passing a Twig_LoaderInterface as the first constructor argument of Twig_Environment is deprecated since version 1.21.', E_USER_DEPRECATED);
-        }
-
-        $options = array_merge(array(
-            'debug' => false,
-            'charset' => 'UTF-8',
-            'base_template_class' => 'Twig_Template',
-            'strict_variables' => false,
-            'autoescape' => 'html',
-            'cache' => false,
-            'auto_reload' => null,
-            'optimizations' => -1,
-        ), $options);
-
-        $this->debug = (bool) $options['debug'];
-        $this->charset = strtoupper($options['charset']);
-        $this->baseTemplateClass = $options['base_template_class'];
-        $this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
-        $this->strictVariables = (bool) $options['strict_variables'];
-        $this->setCache($options['cache']);
-
-        $this->addExtension(new Twig_Extension_Core());
-        $this->addExtension(new Twig_Extension_Escaper($options['autoescape']));
-        $this->addExtension(new Twig_Extension_Optimizer($options['optimizations']));
-        $this->staging = new Twig_Extension_Staging();
-
-        // For BC
-        if (is_string($this->originalCache)) {
-            $r = new ReflectionMethod($this, 'writeCacheFile');
-            if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                @trigger_error('The Twig_Environment::writeCacheFile method is deprecated since version 1.22 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
-                $this->bcWriteCacheFile = true;
-            }
-
-            $r = new ReflectionMethod($this, 'getCacheFilename');
-            if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                @trigger_error('The Twig_Environment::getCacheFilename method is deprecated since version 1.22 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-
-                $this->bcGetCacheFilename = true;
-            }
-        }
-    }
-
-    /**
-     * Gets the base template class for compiled templates.
-     *
-     * @return string The base template class name
-     */
-    public function getBaseTemplateClass()
-    {
-        return $this->baseTemplateClass;
-    }
-
-    /**
-     * Sets the base template class for compiled templates.
-     *
-     * @param string $class The base template class name
-     */
-    public function setBaseTemplateClass($class)
-    {
-        $this->baseTemplateClass = $class;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Enables debugging mode.
-     */
-    public function enableDebug()
-    {
-        $this->debug = true;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Disables debugging mode.
-     */
-    public function disableDebug()
-    {
-        $this->debug = false;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Checks if debug mode is enabled.
-     *
-     * @return bool true if debug mode is enabled, false otherwise
-     */
-    public function isDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Enables the auto_reload option.
-     */
-    public function enableAutoReload()
-    {
-        $this->autoReload = true;
-    }
-
-    /**
-     * Disables the auto_reload option.
-     */
-    public function disableAutoReload()
-    {
-        $this->autoReload = false;
-    }
-
-    /**
-     * Checks if the auto_reload option is enabled.
-     *
-     * @return bool true if auto_reload is enabled, false otherwise
-     */
-    public function isAutoReload()
-    {
-        return $this->autoReload;
-    }
-
-    /**
-     * Enables the strict_variables option.
-     */
-    public function enableStrictVariables()
-    {
-        $this->strictVariables = true;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Disables the strict_variables option.
-     */
-    public function disableStrictVariables()
-    {
-        $this->strictVariables = false;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Checks if the strict_variables option is enabled.
-     *
-     * @return bool true if strict_variables is enabled, false otherwise
-     */
-    public function isStrictVariables()
-    {
-        return $this->strictVariables;
-    }
-
-    /**
-     * Gets the current cache implementation.
-     *
-     * @param bool $original Whether to return the original cache option or the real cache instance
-     *
-     * @return Twig_CacheInterface|string|false A Twig_CacheInterface implementation,
-     *                                          an absolute path to the compiled templates,
-     *                                          or false to disable cache
-     */
-    public function getCache($original = true)
-    {
-        return $original ? $this->originalCache : $this->cache;
-    }
-
-    /**
-     * Sets the current cache implementation.
-     *
-     * @param Twig_CacheInterface|string|false $cache A Twig_CacheInterface implementation,
-     *                                                an absolute path to the compiled templates,
-     *                                                or false to disable cache
-     */
-    public function setCache($cache)
-    {
-        if (is_string($cache)) {
-            $this->originalCache = $cache;
-            $this->cache = new Twig_Cache_Filesystem($cache);
-        } elseif (false === $cache) {
-            $this->originalCache = $cache;
-            $this->cache = new Twig_Cache_Null();
-        } elseif (null === $cache) {
-            @trigger_error('Using "null" as the cache strategy is deprecated since version 1.23 and will be removed in Twig 2.0.', E_USER_DEPRECATED);
-            $this->originalCache = false;
-            $this->cache = new Twig_Cache_Null();
-        } elseif ($cache instanceof Twig_CacheInterface) {
-            $this->originalCache = $this->cache = $cache;
-        } else {
-            throw new LogicException(sprintf('Cache can only be a string, false, or a Twig_CacheInterface implementation.'));
-        }
-    }
-
-    /**
-     * Gets the cache filename for a given template.
-     *
-     * @param string $name The template name
-     *
-     * @return string|false The cache file name or false when caching is disabled
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function getCacheFilename($name)
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $key = $this->cache->generateKey($name, $this->getTemplateClass($name));
-
-        return !$key ? false : $key;
-    }
-
-    /**
-     * Gets the template class associated with the given string.
-     *
-     * The generated template class is based on the following parameters:
-     *
-     *  * The cache key for the given template;
-     *  * The currently enabled extensions;
-     *  * Whether the Twig C extension is available or not;
-     *  * PHP version;
-     *  * Twig version;
-     *  * Options with what environment was created.
-     *
-     * @param string   $name  The name for which to calculate the template class name
-     * @param int|null $index The index if it is an embedded template
-     *
-     * @return string The template class name
-     */
-    public function getTemplateClass($name, $index = null)
-    {
-        $key = $this->getLoader()->getCacheKey($name).$this->optionsHash;
-
-        return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
-    }
-
-    /**
-     * Gets the template class prefix.
-     *
-     * @return string The template class prefix
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function getTemplateClassPrefix()
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->templateClassPrefix;
-    }
-
-    /**
-     * Renders a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     * @throws Twig_Error_Runtime When an error occurred during rendering
-     */
-    public function render($name, array $context = array())
-    {
-        return $this->loadTemplate($name)->render($context);
-    }
-
-    /**
-     * Displays a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     * @throws Twig_Error_Runtime When an error occurred during rendering
-     */
-    public function display($name, array $context = array())
-    {
-        $this->loadTemplate($name)->display($context);
-    }
-
-    /**
-     * Loads a template.
-     *
-     * @param string|Twig_TemplateWrapper|Twig_Template $name The template name
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Runtime When a previously generated cache is corrupted
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     *
-     * @return Twig_TemplateWrapper
-     */
-    public function load($name)
-    {
-        if ($name instanceof Twig_TemplateWrapper) {
-            return $name;
-        }
-
-        if ($name instanceof Twig_Template) {
-            return new Twig_TemplateWrapper($this, $name);
-        }
-
-        return new Twig_TemplateWrapper($this, $this->loadTemplate($name));
-    }
-
-    /**
-     * Loads a template internal representation.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name  The template name
-     * @param int    $index The index if it is an embedded template
-     *
-     * @return Twig_TemplateInterface A template instance representing the given template name
-     *
-     * @throws Twig_Error_Loader  When the template cannot be found
-     * @throws Twig_Error_Runtime When a previously generated cache is corrupted
-     * @throws Twig_Error_Syntax  When an error occurred during compilation
-     *
-     * @internal
-     */
-    public function loadTemplate($name, $index = null)
-    {
-        $cls = $mainCls = $this->getTemplateClass($name);
-        if (null !== $index) {
-            $cls .= '_'.$index;
-        }
-
-        if (isset($this->loadedTemplates[$cls])) {
-            return $this->loadedTemplates[$cls];
-        }
-
-        if (!class_exists($cls, false)) {
-            if ($this->bcGetCacheFilename) {
-                $key = $this->getCacheFilename($name);
-            } else {
-                $key = $this->cache->generateKey($name, $mainCls);
-            }
-
-            if (!$this->isAutoReload() || $this->isTemplateFresh($name, $this->cache->getTimestamp($key))) {
-                $this->cache->load($key);
-            }
-
-            if (!class_exists($cls, false)) {
-                $loader = $this->getLoader();
-                if (!$loader instanceof Twig_SourceContextLoaderInterface) {
-                    $source = new Twig_Source($loader->getSource($name), $name);
-                } else {
-                    $source = $loader->getSourceContext($name);
-                }
-
-                $content = $this->compileSource($source);
-
-                if ($this->bcWriteCacheFile) {
-                    $this->writeCacheFile($key, $content);
-                } else {
-                    $this->cache->write($key, $content);
-                    $this->cache->load($key);
-                }
-
-                if (!class_exists($mainCls, false)) {
-                    /* Last line of defense if either $this->bcWriteCacheFile was used,
-                     * $this->cache is implemented as a no-op or we have a race condition
-                     * where the cache was cleared between the above calls to write to and load from
-                     * the cache.
-                     */
-                    eval('?>'.$content);
-                }
-            }
-
-            if (!class_exists($cls, false)) {
-                throw new Twig_Error_Runtime(sprintf('Failed to load Twig template "%s", index "%s": cache is corrupted.', $name, $index), -1, $source);
-            }
-        }
-
-        if (!$this->runtimeInitialized) {
-            $this->initRuntime();
-        }
-
-        if (isset($this->loading[$cls])) {
-            throw new Twig_Error_Runtime(sprintf('Circular reference detected for Twig template "%s", path: %s.', $name, implode(' -> ', array_merge($this->loading, array($name)))));
-        }
-
-        $this->loading[$cls] = $name;
-
-        try {
-            $this->loadedTemplates[$cls] = new $cls($this);
-            unset($this->loading[$cls]);
-        } catch (\Exception $e) {
-            unset($this->loading[$cls]);
-
-            throw $e;
-        }
-
-        return $this->loadedTemplates[$cls];
-    }
-
-    /**
-     * Creates a template from source.
-     *
-     * This method should not be used as a generic way to load templates.
-     *
-     * @param string $template The template name
-     *
-     * @return Twig_Template A template instance representing the given template name
-     *
-     * @throws Twig_Error_Loader When the template cannot be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
-     */
-    public function createTemplate($template)
-    {
-        $name = sprintf('__string_template__%s', hash('sha256', $template, false));
-
-        $loader = new Twig_Loader_Chain(array(
-            new Twig_Loader_Array(array($name => $template)),
-            $current = $this->getLoader(),
-        ));
-
-        $this->setLoader($loader);
-        try {
-            $template = $this->loadTemplate($name);
-        } catch (Exception $e) {
-            $this->setLoader($current);
-
-            throw $e;
-        } catch (Throwable $e) {
-            $this->setLoader($current);
-
-            throw $e;
-        }
-        $this->setLoader($current);
-
-        return $template;
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * Besides checking the loader for freshness information,
-     * this method also checks if the enabled extensions have
-     * not changed.
-     *
-     * @param string $name The template name
-     * @param int    $time The last modification time of the cached template
-     *
-     * @return bool true if the template is fresh, false otherwise
-     */
-    public function isTemplateFresh($name, $time)
-    {
-        if (0 === $this->lastModifiedExtension) {
-            foreach ($this->extensions as $extension) {
-                $r = new ReflectionObject($extension);
-                if (file_exists($r->getFileName()) && ($extensionTime = filemtime($r->getFileName())) > $this->lastModifiedExtension) {
-                    $this->lastModifiedExtension = $extensionTime;
-                }
-            }
-        }
-
-        return $this->lastModifiedExtension <= $time && $this->getLoader()->isFresh($name, $time);
-    }
-
-    /**
-     * Tries to load a template consecutively from an array.
-     *
-     * Similar to loadTemplate() but it also accepts instances of Twig_Template and
-     * Twig_TemplateWrapper, and an array of templates where each is tried to be loaded.
-     *
-     * @param string|Twig_Template|Twig_TemplateWrapper|array $names A template or an array of templates to try consecutively
-     *
-     * @return Twig_Template|Twig_TemplateWrapper
-     *
-     * @throws Twig_Error_Loader When none of the templates can be found
-     * @throws Twig_Error_Syntax When an error occurred during compilation
-     */
-    public function resolveTemplate($names)
-    {
-        if (!is_array($names)) {
-            $names = array($names);
-        }
-
-        foreach ($names as $name) {
-            if ($name instanceof Twig_Template) {
-                return $name;
-            }
-
-            if ($name instanceof Twig_TemplateWrapper) {
-                return $name;
-            }
-
-            try {
-                return $this->loadTemplate($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        if (1 === count($names)) {
-            throw $e;
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
-    }
-
-    /**
-     * Clears the internal template cache.
-     *
-     * @deprecated since 1.18.3 (to be removed in 2.0)
-     */
-    public function clearTemplateCache()
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.18.3 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->loadedTemplates = array();
-    }
-
-    /**
-     * Clears the template cache files on the filesystem.
-     *
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    public function clearCacheFiles()
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.22 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        if (is_string($this->originalCache)) {
-            foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->originalCache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-                if ($file->isFile()) {
-                    @unlink($file->getPathname());
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets the Lexer instance.
-     *
-     * @return Twig_LexerInterface
-     *
-     * @deprecated since 1.25 (to be removed in 2.0)
-     */
-    public function getLexer()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
-        if (null === $this->lexer) {
-            $this->lexer = new Twig_Lexer($this);
-        }
-
-        return $this->lexer;
-    }
-
-    public function setLexer(Twig_LexerInterface $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string|Twig_Source $source The template source code
-     * @param string             $name   The template name (deprecated)
-     *
-     * @return Twig_TokenStream
-     *
-     * @throws Twig_Error_Syntax When the code is syntactically wrong
-     */
-    public function tokenize($source, $name = null)
-    {
-        if (!$source instanceof Twig_Source) {
-            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            $source = new Twig_Source($source, $name);
-        }
-
-        if (null === $this->lexer) {
-            $this->lexer = new Twig_Lexer($this);
-        }
-
-        return $this->lexer->tokenize($source);
-    }
-
-    /**
-     * Gets the Parser instance.
-     *
-     * @return Twig_ParserInterface
-     *
-     * @deprecated since 1.25 (to be removed in 2.0)
-     */
-    public function getParser()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
-        if (null === $this->parser) {
-            $this->parser = new Twig_Parser($this);
-        }
-
-        return $this->parser;
-    }
-
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @return Twig_Node_Module
-     *
-     * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
-     */
-    public function parse(Twig_TokenStream $stream)
-    {
-        if (null === $this->parser) {
-            $this->parser = new Twig_Parser($this);
-        }
-
-        return $this->parser->parse($stream);
-    }
-
-    /**
-     * Gets the Compiler instance.
-     *
-     * @return Twig_CompilerInterface
-     *
-     * @deprecated since 1.25 (to be removed in 2.0)
-     */
-    public function getCompiler()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.25 and will be removed in 2.0.', __FUNCTION__), E_USER_DEPRECATED);
-
-        if (null === $this->compiler) {
-            $this->compiler = new Twig_Compiler($this);
-        }
-
-        return $this->compiler;
-    }
-
-    public function setCompiler(Twig_CompilerInterface $compiler)
-    {
-        $this->compiler = $compiler;
-    }
-
-    /**
-     * Compiles a node and returns the PHP code.
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compile(Twig_NodeInterface $node)
-    {
-        if (null === $this->compiler) {
-            $this->compiler = new Twig_Compiler($this);
-        }
-
-        return $this->compiler->compile($node)->getSource();
-    }
-
-    /**
-     * Compiles a template source code.
-     *
-     * @param string|Twig_Source $source The template source code
-     * @param string             $name   The template name (deprecated)
-     *
-     * @return string The compiled PHP source code
-     *
-     * @throws Twig_Error_Syntax When there was an error during tokenizing, parsing or compiling
-     */
-    public function compileSource($source, $name = null)
-    {
-        if (!$source instanceof Twig_Source) {
-            @trigger_error(sprintf('Passing a string as the $source argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            $source = new Twig_Source($source, $name);
-        }
-
-        try {
-            return $this->compile($this->parse($this->tokenize($source)));
-        } catch (Twig_Error $e) {
-            $e->setSourceContext($source);
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $source, $e);
-        }
-    }
-
-    public function setLoader(Twig_LoaderInterface $loader)
-    {
-        if (!$loader instanceof Twig_SourceContextLoaderInterface && 0 !== strpos(get_class($loader), 'Mock_')) {
-            @trigger_error(sprintf('Twig loader "%s" should implement Twig_SourceContextLoaderInterface since version 1.27.', get_class($loader)), E_USER_DEPRECATED);
-        }
-
-        $this->loader = $loader;
-    }
-
-    /**
-     * Gets the Loader instance.
-     *
-     * @return Twig_LoaderInterface
-     */
-    public function getLoader()
-    {
-        if (null === $this->loader) {
-            throw new LogicException('You must set a loader first.');
-        }
-
-        return $this->loader;
-    }
-
-    /**
-     * Sets the default template charset.
-     *
-     * @param string $charset The default charset
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = strtoupper($charset);
-    }
-
-    /**
-     * Gets the default template charset.
-     *
-     * @return string The default charset
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Initializes the runtime environment.
-     *
-     * @deprecated since 1.23 (to be removed in 2.0)
-     */
-    public function initRuntime()
-    {
-        $this->runtimeInitialized = true;
-
-        foreach ($this->getExtensions() as $name => $extension) {
-            if (!$extension instanceof Twig_Extension_InitRuntimeInterface) {
-                $m = new ReflectionMethod($extension, 'initRuntime');
-
-                if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Defining the initRuntime() method in the "%s" extension is deprecated since version 1.23. Use the `needs_environment` option to get the Twig_Environment instance in filters, functions, or tests; or explicitly implement Twig_Extension_InitRuntimeInterface if needed (not recommended).', $name), E_USER_DEPRECATED);
-                }
-            }
-
-            $extension->initRuntime($this);
-        }
-    }
-
-    /**
-     * Returns true if the given extension is registered.
-     *
-     * @param string $class The extension class name
-     *
-     * @return bool Whether the extension is registered or not
-     */
-    public function hasExtension($class)
-    {
-        $class = ltrim($class, '\\');
-        if (!isset($this->extensionsByClass[$class]) && class_exists($class, false)) {
-            // For BC/FC with namespaced aliases
-            $class = new ReflectionClass($class);
-            $class = $class->name;
-        }
-
-        if (isset($this->extensions[$class])) {
-            if ($class !== get_class($this->extensions[$class])) {
-                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
-            }
-
-            return true;
-        }
-
-        return isset($this->extensionsByClass[$class]);
-    }
-
-    /**
-     * Adds a runtime loader.
-     */
-    public function addRuntimeLoader(Twig_RuntimeLoaderInterface $loader)
-    {
-        $this->runtimeLoaders[] = $loader;
-    }
-
-    /**
-     * Gets an extension by class name.
-     *
-     * @param string $class The extension class name
-     *
-     * @return Twig_ExtensionInterface
-     */
-    public function getExtension($class)
-    {
-        $class = ltrim($class, '\\');
-        if (!isset($this->extensionsByClass[$class]) && class_exists($class, false)) {
-            // For BC/FC with namespaced aliases
-            $class = new ReflectionClass($class);
-            $class = $class->name;
-        }
-
-        if (isset($this->extensions[$class])) {
-            if ($class !== get_class($this->extensions[$class])) {
-                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
-            }
-
-            return $this->extensions[$class];
-        }
-
-        if (!isset($this->extensionsByClass[$class])) {
-            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $class));
-        }
-
-        return $this->extensionsByClass[$class];
-    }
-
-    /**
-     * Returns the runtime implementation of a Twig element (filter/function/test).
-     *
-     * @param string $class A runtime class name
-     *
-     * @return object The runtime implementation
-     *
-     * @throws Twig_Error_Runtime When the template cannot be found
-     */
-    public function getRuntime($class)
-    {
-        if (isset($this->runtimes[$class])) {
-            return $this->runtimes[$class];
-        }
-
-        foreach ($this->runtimeLoaders as $loader) {
-            if (null !== $runtime = $loader->load($class)) {
-                return $this->runtimes[$class] = $runtime;
-            }
-        }
-
-        throw new Twig_Error_Runtime(sprintf('Unable to load the "%s" runtime.', $class));
-    }
-
-    public function addExtension(Twig_ExtensionInterface $extension)
-    {
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $extension->getName()));
-        }
-
-        $class = get_class($extension);
-        if ($class !== $extension->getName()) {
-            if (isset($this->extensions[$extension->getName()])) {
-                unset($this->extensions[$extension->getName()], $this->extensionsByClass[$class]);
-                @trigger_error(sprintf('The possibility to register the same extension twice ("%s") is deprecated since version 1.23 and will be removed in Twig 2.0. Use proper PHP inheritance instead.', $extension->getName()), E_USER_DEPRECATED);
-            }
-        }
-
-        $this->lastModifiedExtension = 0;
-        $this->extensionsByClass[$class] = $extension;
-        $this->extensions[$extension->getName()] = $extension;
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Removes an extension by name.
-     *
-     * This method is deprecated and you should not use it.
-     *
-     * @param string $name The extension name
-     *
-     * @deprecated since 1.12 (to be removed in 2.0)
-     */
-    public function removeExtension($name)
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.12 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to remove extension "%s" as extensions have already been initialized.', $name));
-        }
-
-        $class = ltrim($name, '\\');
-        if (!isset($this->extensionsByClass[$class]) && class_exists($class, false)) {
-            // For BC/FC with namespaced aliases
-            $class = new ReflectionClass($class);
-            $class = $class->name;
-        }
-
-        if (isset($this->extensions[$class])) {
-            if ($class !== get_class($this->extensions[$class])) {
-                @trigger_error(sprintf('Referencing the "%s" extension by its name (defined by getName()) is deprecated since 1.26 and will be removed in Twig 2.0. Use the Fully Qualified Extension Class Name instead.', $class), E_USER_DEPRECATED);
-            }
-
-            unset($this->extensions[$class]);
-        }
-
-        unset($this->extensions[$class]);
-        $this->updateOptionsHash();
-    }
-
-    /**
-     * Registers an array of extensions.
-     *
-     * @param array $extensions An array of extensions
-     */
-    public function setExtensions(array $extensions)
-    {
-        foreach ($extensions as $extension) {
-            $this->addExtension($extension);
-        }
-    }
-
-    /**
-     * Returns all registered extensions.
-     *
-     * @return Twig_ExtensionInterface[] An array of extensions (keys are for internal usage only and should not be relied on)
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        if ($this->extensionInitialized) {
-            throw new LogicException('Unable to add a token parser as extensions have already been initialized.');
-        }
-
-        $this->staging->addTokenParser($parser);
-    }
-
-    /**
-     * Gets the registered Token Parsers.
-     *
-     * @return Twig_TokenParserBrokerInterface
-     *
-     * @internal
-     */
-    public function getTokenParsers()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->parsers;
-    }
-
-    /**
-     * Gets registered tags.
-     *
-     * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
-     *
-     * @return Twig_TokenParserInterface[]
-     *
-     * @internal
-     */
-    public function getTags()
-    {
-        $tags = array();
-        foreach ($this->getTokenParsers()->getParsers() as $parser) {
-            if ($parser instanceof Twig_TokenParserInterface) {
-                $tags[$parser->getTag()] = $parser;
-            }
-        }
-
-        return $tags;
-    }
-
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if ($this->extensionInitialized) {
-            throw new LogicException('Unable to add a node visitor as extensions have already been initialized.');
-        }
-
-        $this->staging->addNodeVisitor($visitor);
-    }
-
-    /**
-     * Gets the registered Node Visitors.
-     *
-     * @return Twig_NodeVisitorInterface[]
-     *
-     * @internal
-     */
-    public function getNodeVisitors()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->visitors;
-    }
-
-    /**
-     * Registers a Filter.
-     *
-     * @param string|Twig_SimpleFilter               $name   The filter name or a Twig_SimpleFilter instance
-     * @param Twig_FilterInterface|Twig_SimpleFilter $filter
-     */
-    public function addFilter($name, $filter = null)
-    {
-        if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
-            throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter.');
-        }
-
-        if ($name instanceof Twig_SimpleFilter) {
-            $filter = $name;
-            $name = $filter->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleFilter" instead when defining filter "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addFilter($name, $filter);
-    }
-
-    /**
-     * Get a filter by name.
-     *
-     * Subclasses may override this method and load filters differently;
-     * so no list of filters is available.
-     *
-     * @param string $name The filter name
-     *
-     * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exist
-     *
-     * @internal
-     */
-    public function getFilter($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->filters[$name])) {
-            return $this->filters[$name];
-        }
-
-        foreach ($this->filters as $pattern => $filter) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $filter->setArguments($matches);
-
-                    return $filter;
-                }
-            }
-        }
-
-        foreach ($this->filterCallbacks as $callback) {
-            if (false !== $filter = call_user_func($callback, $name)) {
-                return $filter;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFilterCallback($callable)
-    {
-        $this->filterCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets the registered Filters.
-     *
-     * Be warned that this method cannot return filters defined with registerUndefinedFilterCallback.
-     *
-     * @return Twig_FilterInterface[]
-     *
-     * @see registerUndefinedFilterCallback
-     *
-     * @internal
-     */
-    public function getFilters()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->filters;
-    }
-
-    /**
-     * Registers a Test.
-     *
-     * @param string|Twig_SimpleTest             $name The test name or a Twig_SimpleTest instance
-     * @param Twig_TestInterface|Twig_SimpleTest $test A Twig_TestInterface instance or a Twig_SimpleTest instance
-     */
-    public function addTest($name, $test = null)
-    {
-        if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
-            throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest.');
-        }
-
-        if ($name instanceof Twig_SimpleTest) {
-            $test = $name;
-            $name = $test->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleTest" instead when defining test "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addTest($name, $test);
-    }
-
-    /**
-     * Gets the registered Tests.
-     *
-     * @return Twig_TestInterface[]
-     *
-     * @internal
-     */
-    public function getTests()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->tests;
-    }
-
-    /**
-     * Gets a test by name.
-     *
-     * @param string $name The test name
-     *
-     * @return Twig_Test|false A Twig_Test instance or false if the test does not exist
-     *
-     * @internal
-     */
-    public function getTest($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->tests[$name])) {
-            return $this->tests[$name];
-        }
-
-        return false;
-    }
-
-    /**
-     * Registers a Function.
-     *
-     * @param string|Twig_SimpleFunction                 $name     The function name or a Twig_SimpleFunction instance
-     * @param Twig_FunctionInterface|Twig_SimpleFunction $function
-     */
-    public function addFunction($name, $function = null)
-    {
-        if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
-            throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction.');
-        }
-
-        if ($name instanceof Twig_SimpleFunction) {
-            $function = $name;
-            $name = $function->getName();
-        } else {
-            @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated since version 1.21. Pass an instance of "Twig_SimpleFunction" instead when defining function "%s".', __METHOD__, $name), E_USER_DEPRECATED);
-        }
-
-        if ($this->extensionInitialized) {
-            throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
-        }
-
-        $this->staging->addFunction($name, $function);
-    }
-
-    /**
-     * Get a function by name.
-     *
-     * Subclasses may override this method and load functions differently;
-     * so no list of functions is available.
-     *
-     * @param string $name function name
-     *
-     * @return Twig_Function|false A Twig_Function instance or false if the function does not exist
-     *
-     * @internal
-     */
-    public function getFunction($name)
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        if (isset($this->functions[$name])) {
-            return $this->functions[$name];
-        }
-
-        foreach ($this->functions as $pattern => $function) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $function->setArguments($matches);
-
-                    return $function;
-                }
-            }
-        }
-
-        foreach ($this->functionCallbacks as $callback) {
-            if (false !== $function = call_user_func($callback, $name)) {
-                return $function;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFunctionCallback($callable)
-    {
-        $this->functionCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets registered functions.
-     *
-     * Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
-     *
-     * @return Twig_FunctionInterface[]
-     *
-     * @see registerUndefinedFunctionCallback
-     *
-     * @internal
-     */
-    public function getFunctions()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->functions;
-    }
-
-    /**
-     * Registers a Global.
-     *
-     * New globals can be added before compiling or rendering a template;
-     * but after, you can only update existing globals.
-     *
-     * @param string $name  The global name
-     * @param mixed  $value The global value
-     */
-    public function addGlobal($name, $value)
-    {
-        if ($this->extensionInitialized || $this->runtimeInitialized) {
-            if (null === $this->globals) {
-                $this->globals = $this->initGlobals();
-            }
-
-            if (!array_key_exists($name, $this->globals)) {
-                // The deprecation notice must be turned into the following exception in Twig 2.0
-                @trigger_error(sprintf('Registering global variable "%s" at runtime or when the extensions have already been initialized is deprecated since version 1.21.', $name), E_USER_DEPRECATED);
-                //throw new LogicException(sprintf('Unable to add global "%s" as the runtime or the extensions have already been initialized.', $name));
-            }
-        }
-
-        if ($this->extensionInitialized || $this->runtimeInitialized) {
-            // update the value
-            $this->globals[$name] = $value;
-        } else {
-            $this->staging->addGlobal($name, $value);
-        }
-    }
-
-    /**
-     * Gets the registered Globals.
-     *
-     * @return array An array of globals
-     *
-     * @internal
-     */
-    public function getGlobals()
-    {
-        if (!$this->runtimeInitialized && !$this->extensionInitialized) {
-            return $this->initGlobals();
-        }
-
-        if (null === $this->globals) {
-            $this->globals = $this->initGlobals();
-        }
-
-        return $this->globals;
-    }
-
-    /**
-     * Merges a context with the defined globals.
-     *
-     * @param array $context An array representing the context
-     *
-     * @return array The context merged with the globals
-     */
-    public function mergeGlobals(array $context)
-    {
-        // we don't use array_merge as the context being generally
-        // bigger than globals, this code is faster.
-        foreach ($this->getGlobals() as $key => $value) {
-            if (!array_key_exists($key, $context)) {
-                $context[$key] = $value;
-            }
-        }
-
-        return $context;
-    }
-
-    /**
-     * Gets the registered unary Operators.
-     *
-     * @return array An array of unary operators
-     *
-     * @internal
-     */
-    public function getUnaryOperators()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->unaryOperators;
-    }
-
-    /**
-     * Gets the registered binary Operators.
-     *
-     * @return array An array of binary operators
-     *
-     * @internal
-     */
-    public function getBinaryOperators()
-    {
-        if (!$this->extensionInitialized) {
-            $this->initExtensions();
-        }
-
-        return $this->binaryOperators;
-    }
-
-    /**
-     * @deprecated since 1.23 (to be removed in 2.0)
-     */
-    public function computeAlternatives($name, $items)
-    {
-        @trigger_error(sprintf('The %s method is deprecated since version 1.23 and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        return Twig_Error_Syntax::computeAlternatives($name, $items);
-    }
-
-    /**
-     * @internal
-     */
-    protected function initGlobals()
-    {
-        $globals = array();
-        foreach ($this->extensions as $name => $extension) {
-            if (!$extension instanceof Twig_Extension_GlobalsInterface) {
-                $m = new ReflectionMethod($extension, 'getGlobals');
-
-                if ('Twig_Extension' !== $m->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Defining the getGlobals() method in the "%s" extension without explicitly implementing Twig_Extension_GlobalsInterface is deprecated since version 1.23.', $name), E_USER_DEPRECATED);
-                }
-            }
-
-            $extGlob = $extension->getGlobals();
-            if (!is_array($extGlob)) {
-                throw new UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', get_class($extension)));
-            }
-
-            $globals[] = $extGlob;
-        }
-
-        $globals[] = $this->staging->getGlobals();
-
-        return call_user_func_array('array_merge', $globals);
-    }
-
-    /**
-     * @internal
-     */
-    protected function initExtensions()
-    {
-        if ($this->extensionInitialized) {
-            return;
-        }
-
-        $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
-        $this->filters = array();
-        $this->functions = array();
-        $this->tests = array();
-        $this->visitors = array();
-        $this->unaryOperators = array();
-        $this->binaryOperators = array();
-
-        foreach ($this->extensions as $extension) {
-            $this->initExtension($extension);
-        }
-        $this->initExtension($this->staging);
-        // Done at the end only, so that an exception during initialization does not mark the environment as initialized when catching the exception
-        $this->extensionInitialized = true;
-    }
-
-    /**
-     * @internal
-     */
-    protected function initExtension(Twig_ExtensionInterface $extension)
-    {
-        // filters
-        foreach ($extension->getFilters() as $name => $filter) {
-            if ($filter instanceof Twig_SimpleFilter) {
-                $name = $filter->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for filter "%s" is deprecated since version 1.21. Use Twig_SimpleFilter instead.', get_class($filter), $name), E_USER_DEPRECATED);
-            }
-
-            $this->filters[$name] = $filter;
-        }
-
-        // functions
-        foreach ($extension->getFunctions() as $name => $function) {
-            if ($function instanceof Twig_SimpleFunction) {
-                $name = $function->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for function "%s" is deprecated since version 1.21. Use Twig_SimpleFunction instead.', get_class($function), $name), E_USER_DEPRECATED);
-            }
-
-            $this->functions[$name] = $function;
-        }
-
-        // tests
-        foreach ($extension->getTests() as $name => $test) {
-            if ($test instanceof Twig_SimpleTest) {
-                $name = $test->getName();
-            } else {
-                @trigger_error(sprintf('Using an instance of "%s" for test "%s" is deprecated since version 1.21. Use Twig_SimpleTest instead.', get_class($test), $name), E_USER_DEPRECATED);
-            }
-
-            $this->tests[$name] = $test;
-        }
-
-        // token parsers
-        foreach ($extension->getTokenParsers() as $parser) {
-            if ($parser instanceof Twig_TokenParserInterface) {
-                $this->parsers->addTokenParser($parser);
-            } elseif ($parser instanceof Twig_TokenParserBrokerInterface) {
-                @trigger_error('Registering a Twig_TokenParserBrokerInterface instance is deprecated since version 1.21.', E_USER_DEPRECATED);
-
-                $this->parsers->addTokenParserBroker($parser);
-            } else {
-                throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances.');
-            }
-        }
-
-        // node visitors
-        foreach ($extension->getNodeVisitors() as $visitor) {
-            $this->visitors[] = $visitor;
-        }
-
-        // operators
-        if ($operators = $extension->getOperators()) {
-            if (!is_array($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" must return an array with operators, got "%s".', get_class($extension), is_object($operators) ? get_class($operators) : gettype($operators).(is_resource($operators) ? '' : '#'.$operators)));
-            }
-
-            if (2 !== count($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" must return an array of 2 elements, got %d.', get_class($extension), count($operators)));
-            }
-
-            $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
-            $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
-        }
-    }
-
-    /**
-     * @deprecated since 1.22 (to be removed in 2.0)
-     */
-    protected function writeCacheFile($file, $content)
-    {
-        $this->cache->write($file, $content);
-    }
-
-    private function updateOptionsHash()
-    {
-        $hashParts = array_merge(
-            array_keys($this->extensions),
-            array(
-                (int) function_exists('twig_template_get_attributes'),
-                PHP_MAJOR_VERSION,
-                PHP_MINOR_VERSION,
-                self::VERSION,
-                (int) $this->debug,
-                $this->baseTemplateClass,
-                (int) $this->strictVariables,
-            )
-        );
-        $this->optionsHash = implode(':', $hashParts);
-    }
-}
-
-class_alias('Twig_Environment', 'Twig\Environment', false);
diff --git a/inc/lib/Twig/Error.php b/inc/lib/Twig/Error.php
deleted file mode 100644
index 787e0d09..00000000
--- a/inc/lib/Twig/Error.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig base exception.
- *
- * This exception class and its children must only be used when
- * an error occurs during the loading of a template, when a syntax error
- * is detected in a template, or when rendering a template. Other
- * errors must use regular PHP exception classes (like when the template
- * cache directory is not writable for instance).
- *
- * To help debugging template issues, this class tracks the original template
- * name and line where the error occurred.
- *
- * Whenever possible, you must set these information (original template name
- * and line number) yourself by passing them to the constructor. If some or all
- * these information are not available from where you throw the exception, then
- * this class will guess them automatically (when the line number is set to -1
- * and/or the name is set to null). As this is a costly operation, this
- * can be disabled by passing false for both the name and the line number
- * when creating a new instance of this class.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error extends Exception
-{
-    protected $lineno;
-    // to be renamed to name in 2.0
-    protected $filename;
-    protected $rawMessage;
-    protected $previous;
-
-    private $sourcePath;
-    private $sourceCode;
-
-    /**
-     * Constructor.
-     *
-     * Set both the line number and the name to false to
-     * disable automatic guessing of the original template name
-     * and line number.
-     *
-     * Set the line number to -1 to enable its automatic guessing.
-     * Set the name to null to enable its automatic guessing.
-     *
-     * By default, automatic guessing is enabled.
-     *
-     * @param string                  $message  The error message
-     * @param int                     $lineno   The template line where the error occurred
-     * @param Twig_Source|string|null $source   The source context where the error occurred
-     * @param Exception               $previous The previous exception
-     */
-    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
-    {
-        if (null === $source) {
-            $name = null;
-        } elseif (!$source instanceof Twig_Source) {
-            // for compat with the Twig C ext., passing the template name as string is accepted
-            $name = $source;
-        } else {
-            $name = $source->getName();
-            $this->sourceCode = $source->getCode();
-            $this->sourcePath = $source->getPath();
-        }
-        if (PHP_VERSION_ID < 50300) {
-            $this->previous = $previous;
-            parent::__construct('');
-        } else {
-            parent::__construct('', 0, $previous);
-        }
-
-        $this->lineno = $lineno;
-        $this->filename = $name;
-
-        if (-1 === $lineno || null === $name || null === $this->sourcePath) {
-            $this->guessTemplateInfo();
-        }
-
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the raw message.
-     *
-     * @return string The raw message
-     */
-    public function getRawMessage()
-    {
-        return $this->rawMessage;
-    }
-
-    /**
-     * Gets the logical name where the error occurred.
-     *
-     * @return string The name
-     *
-     * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead.
-     */
-    public function getTemplateFile()
-    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->filename;
-    }
-
-    /**
-     * Sets the logical name where the error occurred.
-     *
-     * @param string $name The name
-     *
-     * @deprecated since 1.27 (to be removed in 2.0). Use setSourceContext() instead.
-     */
-    public function setTemplateFile($name)
-    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->filename = $name;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the logical name where the error occurred.
-     *
-     * @return string The name
-     *
-     * @deprecated since 1.29 (to be removed in 2.0). Use getSourceContext() instead.
-     */
-    public function getTemplateName()
-    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->filename;
-    }
-
-    /**
-     * Sets the logical name where the error occurred.
-     *
-     * @param string $name The name
-     *
-     * @deprecated since 1.29 (to be removed in 2.0). Use setSourceContext() instead.
-     */
-    public function setTemplateName($name)
-    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.29 and will be removed in 2.0. Use setSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        $this->filename = $name;
-        $this->sourceCode = $this->sourcePath = null;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the template line where the error occurred.
-     *
-     * @return int The template line
-     */
-    public function getTemplateLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Sets the template line where the error occurred.
-     *
-     * @param int $lineno The template line
-     */
-    public function setTemplateLine($lineno)
-    {
-        $this->lineno = $lineno;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the source context of the Twig template where the error occurred.
-     *
-     * @return Twig_Source|null
-     */
-    public function getSourceContext()
-    {
-        return $this->filename ? new Twig_Source($this->sourceCode, $this->filename, $this->sourcePath) : null;
-    }
-
-    /**
-     * Sets the source context of the Twig template where the error occurred.
-     */
-    public function setSourceContext(Twig_Source $source = null)
-    {
-        if (null === $source) {
-            $this->sourceCode = $this->filename = $this->sourcePath = null;
-        } else {
-            $this->sourceCode = $source->getCode();
-            $this->filename = $source->getName();
-            $this->sourcePath = $source->getPath();
-        }
-
-        $this->updateRepr();
-    }
-
-    public function guess()
-    {
-        $this->guessTemplateInfo();
-        $this->updateRepr();
-    }
-
-    /**
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     *
-     * @param string $method    The method name
-     * @param array  $arguments The parameters to be passed to the method
-     *
-     * @return Exception The previous exception or null
-     *
-     * @throws BadMethodCallException
-     */
-    public function __call($method, $arguments)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->previous;
-        }
-
-        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
-    }
-
-    public function appendMessage($rawMessage)
-    {
-        $this->rawMessage .= $rawMessage;
-        $this->updateRepr();
-    }
-
-    /**
-     * @internal
-     */
-    protected function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        if ($this->sourcePath && $this->lineno > 0) {
-            $this->file = $this->sourcePath;
-            $this->line = $this->lineno;
-
-            return;
-        }
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        $questionMark = false;
-        if ('?' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $questionMark = true;
-        }
-
-        if ($this->filename) {
-            if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
-                $name = sprintf('"%s"', $this->filename);
-            } else {
-                $name = json_encode($this->filename);
-            }
-            $this->message .= sprintf(' in %s', $name);
-        }
-
-        if ($this->lineno && $this->lineno >= 0) {
-            $this->message .= sprintf(' at line %d', $this->lineno);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-
-        if ($questionMark) {
-            $this->message .= '?';
-        }
-    }
-
-    /**
-     * @internal
-     */
-    protected function guessTemplateInfo()
-    {
-        $template = null;
-        $templateClass = null;
-
-        if (PHP_VERSION_ID >= 50306) {
-            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT);
-        } else {
-            $backtrace = debug_backtrace();
-        }
-
-        foreach ($backtrace as $trace) {
-            if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
-                $currentClass = get_class($trace['object']);
-                $isEmbedContainer = 0 === strpos($templateClass, $currentClass);
-                if (null === $this->filename || ($this->filename == $trace['object']->getTemplateName() && !$isEmbedContainer)) {
-                    $template = $trace['object'];
-                    $templateClass = get_class($trace['object']);
-                }
-            }
-        }
-
-        // update template name
-        if (null !== $template && null === $this->filename) {
-            $this->filename = $template->getTemplateName();
-        }
-
-        // update template path if any
-        if (null !== $template && null === $this->sourcePath) {
-            $src = $template->getSourceContext();
-            $this->sourceCode = $src->getCode();
-            $this->sourcePath = $src->getPath();
-        }
-
-        if (null === $template || $this->lineno > -1) {
-            return;
-        }
-
-        $r = new ReflectionObject($template);
-        $file = $r->getFileName();
-
-        $exceptions = array($e = $this);
-        while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
-            $exceptions[] = $e;
-        }
-
-        while ($e = array_pop($exceptions)) {
-            $traces = $e->getTrace();
-            array_unshift($traces, array('file' => $e->getFile(), 'line' => $e->getLine()));
-
-            while ($trace = array_shift($traces)) {
-                if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
-                    continue;
-                }
-
-                foreach ($template->getDebugInfo() as $codeLine => $templateLine) {
-                    if ($codeLine <= $trace['line']) {
-                        // update template line
-                        $this->lineno = $templateLine;
-
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
-
-class_alias('Twig_Error', 'Twig\Error\Error', false);
-class_exists('Twig_Source');
diff --git a/inc/lib/Twig/Error/Loader.php b/inc/lib/Twig/Error/Loader.php
deleted file mode 100644
index df566dd7..00000000
--- a/inc/lib/Twig/Error/Loader.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs during template loading.
- *
- * Automatic template information guessing is always turned off as
- * if a template cannot be loaded, there is nothing to guess.
- * However, when a template is loaded from another one, then, we need
- * to find the current context and this is automatically done by
- * Twig_Template::displayWithErrorHandling().
- *
- * This strategy makes Twig_Environment::resolveTemplate() much faster.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Loader extends Twig_Error
-{
-    public function __construct($message, $lineno = -1, $source = null, Exception $previous = null)
-    {
-        if (PHP_VERSION_ID < 50300) {
-            $this->previous = $previous;
-            Exception::__construct('');
-        } else {
-            Exception::__construct('', 0, $previous);
-        }
-        $this->appendMessage($message);
-        $this->setTemplateLine(false);
-    }
-}
-
-class_alias('Twig_Error_Loader', 'Twig\Error\LoaderError', false);
diff --git a/inc/lib/Twig/Error/Runtime.php b/inc/lib/Twig/Error/Runtime.php
deleted file mode 100644
index 3b24ad3a..00000000
--- a/inc/lib/Twig/Error/Runtime.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when an error occurs at runtime.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Runtime extends Twig_Error
-{
-}
-
-class_alias('Twig_Error_Runtime', 'Twig\Error\RuntimeError', false);
diff --git a/inc/lib/Twig/Error/Syntax.php b/inc/lib/Twig/Error/Syntax.php
deleted file mode 100644
index 9d09f217..00000000
--- a/inc/lib/Twig/Error/Syntax.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a syntax error occurs during lexing or parsing of a template.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Error_Syntax extends Twig_Error
-{
-    /**
-     * Tweaks the error message to include suggestions.
-     *
-     * @param string $name  The original name of the item that does not exist
-     * @param array  $items An array of possible items
-     */
-    public function addSuggestions($name, array $items)
-    {
-        if (!$alternatives = self::computeAlternatives($name, $items)) {
-            return;
-        }
-
-        $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', $alternatives)));
-    }
-
-    /**
-     * @internal
-     *
-     * To be merged with the addSuggestions() method in 2.0.
-     */
-    public static function computeAlternatives($name, $items)
-    {
-        $alternatives = array();
-        foreach ($items as $item) {
-            $lev = levenshtein($name, $item);
-            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
-                $alternatives[$item] = $lev;
-            }
-        }
-        asort($alternatives);
-
-        return array_keys($alternatives);
-    }
-}
-
-class_alias('Twig_Error_Syntax', 'Twig\Error\SyntaxError', false);
diff --git a/inc/lib/Twig/ExistsLoaderInterface.php b/inc/lib/Twig/ExistsLoaderInterface.php
deleted file mode 100644
index 968cb21a..00000000
--- a/inc/lib/Twig/ExistsLoaderInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Adds an exists() method for loaders.
- *
- * @author Florin Patan <florinpatan@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_ExistsLoaderInterface
-{
-    /**
-     * Check if we have the source code of a template, given its name.
-     *
-     * @param string $name The name of the template to check if we can load
-     *
-     * @return bool If the template source code is handled by this loader or not
-     */
-    public function exists($name);
-}
-
-class_alias('Twig_ExistsLoaderInterface', 'Twig\Loader\ExistsLoaderInterface', false);
diff --git a/inc/lib/Twig/ExpressionParser.php b/inc/lib/Twig/ExpressionParser.php
deleted file mode 100644
index fe4a9b4a..00000000
--- a/inc/lib/Twig/ExpressionParser.php
+++ /dev/null
@@ -1,744 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Parses expressions.
- *
- * This parser implements a "Precedence climbing" algorithm.
- *
- * @see https://www.engr.mun.ca/~theo/Misc/exp_parsing.htm
- * @see https://en.wikipedia.org/wiki/Operator-precedence_parser
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @internal
- */
-class Twig_ExpressionParser
-{
-    const OPERATOR_LEFT = 1;
-    const OPERATOR_RIGHT = 2;
-
-    protected $parser;
-    protected $unaryOperators;
-    protected $binaryOperators;
-
-    private $env;
-
-    public function __construct(Twig_Parser $parser, $env = null)
-    {
-        $this->parser = $parser;
-
-        if ($env instanceof Twig_Environment) {
-            $this->env = $env;
-            $this->unaryOperators = $env->getUnaryOperators();
-            $this->binaryOperators = $env->getBinaryOperators();
-        } else {
-            @trigger_error('Passing the operators as constructor arguments to '.__METHOD__.' is deprecated since version 1.27. Pass the environment instead.', E_USER_DEPRECATED);
-
-            $this->env = $parser->getEnvironment();
-            $this->unaryOperators = func_get_arg(1);
-            $this->binaryOperators = func_get_arg(2);
-        }
-    }
-
-    public function parseExpression($precedence = 0)
-    {
-        $expr = $this->getPrimary();
-        $token = $this->parser->getCurrentToken();
-        while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
-            $op = $this->binaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-
-            if ('is not' === $token->getValue()) {
-                $expr = $this->parseNotTestExpression($expr);
-            } elseif ('is' === $token->getValue()) {
-                $expr = $this->parseTestExpression($expr);
-            } elseif (isset($op['callable'])) {
-                $expr = call_user_func($op['callable'], $this->parser, $expr);
-            } else {
-                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
-                $class = $op['class'];
-                $expr = new $class($expr, $expr1, $token->getLine());
-            }
-
-            $token = $this->parser->getCurrentToken();
-        }
-
-        if (0 === $precedence) {
-            return $this->parseConditionalExpression($expr);
-        }
-
-        return $expr;
-    }
-
-    protected function getPrimary()
-    {
-        $token = $this->parser->getCurrentToken();
-
-        if ($this->isUnary($token)) {
-            $operator = $this->unaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression($operator['precedence']);
-            $class = $operator['class'];
-
-            return $this->parsePostfixExpression(new $class($expr, $token->getLine()));
-        } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'An opened parenthesis is not properly closed');
-
-            return $this->parsePostfixExpression($expr);
-        }
-
-        return $this->parsePrimaryExpression();
-    }
-
-    protected function parseConditionalExpression($expr)
-    {
-        while ($this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, '?')) {
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $expr2 = $this->parseExpression();
-                if ($this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                    $expr3 = $this->parseExpression();
-                } else {
-                    $expr3 = new Twig_Node_Expression_Constant('', $this->parser->getCurrentToken()->getLine());
-                }
-            } else {
-                $expr2 = $expr;
-                $expr3 = $this->parseExpression();
-            }
-
-            $expr = new Twig_Node_Expression_Conditional($expr, $expr2, $expr3, $this->parser->getCurrentToken()->getLine());
-        }
-
-        return $expr;
-    }
-
-    protected function isUnary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
-    }
-
-    protected function isBinary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
-    }
-
-    public function parsePrimaryExpression()
-    {
-        $token = $this->parser->getCurrentToken();
-        switch ($token->getType()) {
-            case Twig_Token::NAME_TYPE:
-                $this->parser->getStream()->next();
-                switch ($token->getValue()) {
-                    case 'true':
-                    case 'TRUE':
-                        $node = new Twig_Node_Expression_Constant(true, $token->getLine());
-                        break;
-
-                    case 'false':
-                    case 'FALSE':
-                        $node = new Twig_Node_Expression_Constant(false, $token->getLine());
-                        break;
-
-                    case 'none':
-                    case 'NONE':
-                    case 'null':
-                    case 'NULL':
-                        $node = new Twig_Node_Expression_Constant(null, $token->getLine());
-                        break;
-
-                    default:
-                        if ('(' === $this->parser->getCurrentToken()->getValue()) {
-                            $node = $this->getFunctionNode($token->getValue(), $token->getLine());
-                        } else {
-                            $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                        }
-                }
-                break;
-
-            case Twig_Token::NUMBER_TYPE:
-                $this->parser->getStream()->next();
-                $node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                break;
-
-            case Twig_Token::STRING_TYPE:
-            case Twig_Token::INTERPOLATION_START_TYPE:
-                $node = $this->parseStringExpression();
-                break;
-
-            case Twig_Token::OPERATOR_TYPE:
-                if (preg_match(Twig_Lexer::REGEX_NAME, $token->getValue(), $matches) && $matches[0] == $token->getValue()) {
-                    // in this context, string operators are variable names
-                    $this->parser->getStream()->next();
-                    $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                    break;
-                } elseif (isset($this->unaryOperators[$token->getValue()])) {
-                    $class = $this->unaryOperators[$token->getValue()]['class'];
-
-                    $ref = new ReflectionClass($class);
-                    $negClass = 'Twig_Node_Expression_Unary_Neg';
-                    $posClass = 'Twig_Node_Expression_Unary_Pos';
-                    if (!(in_array($ref->getName(), array($negClass, $posClass)) || $ref->isSubclassOf($negClass) || $ref->isSubclassOf($posClass))) {
-                        throw new Twig_Error_Syntax(sprintf('Unexpected unary operator "%s".', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
-                    }
-
-                    $this->parser->getStream()->next();
-                    $expr = $this->parsePrimaryExpression();
-
-                    $node = new $class($expr, $token->getLine());
-                    break;
-                }
-
-                // no break
-            default:
-                if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
-                    $node = $this->parseArrayExpression();
-                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
-                    $node = $this->parseHashExpression();
-                } elseif ($token->test(Twig_Token::OPERATOR_TYPE, '=') && ('==' === $this->parser->getStream()->look(-1)->getValue() || '!=' === $this->parser->getStream()->look(-1)->getValue())) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected operator of value "%s". Did you try to use "===" or "!==" for strict comparison? Use "is same as(value)" instead.', $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
-                } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getStream()->getSourceContext());
-                }
-        }
-
-        return $this->parsePostfixExpression($node);
-    }
-
-    public function parseStringExpression()
-    {
-        $stream = $this->parser->getStream();
-
-        $nodes = array();
-        // a string cannot be followed by another string in a single expression
-        $nextCanBeString = true;
-        while (true) {
-            if ($nextCanBeString && $token = $stream->nextIf(Twig_Token::STRING_TYPE)) {
-                $nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                $nextCanBeString = false;
-            } elseif ($stream->nextIf(Twig_Token::INTERPOLATION_START_TYPE)) {
-                $nodes[] = $this->parseExpression();
-                $stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
-                $nextCanBeString = true;
-            } else {
-                break;
-            }
-        }
-
-        $expr = array_shift($nodes);
-        foreach ($nodes as $node) {
-            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getTemplateLine());
-        }
-
-        return $expr;
-    }
-
-    public function parseArrayExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            $node->addElement($this->parseExpression());
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
-
-        return $node;
-    }
-
-    public function parseHashExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'A hash value must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            // a hash key can be:
-            //
-            //  * a number -- 12
-            //  * a string -- 'a'
-            //  * a name, which is equivalent to a string -- a
-            //  * an expression, which must be enclosed in parentheses -- (1 + 2)
-            if (($token = $stream->nextIf(Twig_Token::STRING_TYPE)) || ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) || $token = $stream->nextIf(Twig_Token::NUMBER_TYPE)) {
-                $key = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            } elseif ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $key = $this->parseExpression();
-            } else {
-                $current = $stream->getCurrent();
-
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', Twig_Token::typeToEnglish($current->getType()), $current->getValue()), $current->getLine(), $stream->getSourceContext());
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
-            $value = $this->parseExpression();
-
-            $node->addElement($value, $key);
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
-
-        return $node;
-    }
-
-    public function parsePostfixExpression($node)
-    {
-        while (true) {
-            $token = $this->parser->getCurrentToken();
-            if (Twig_Token::PUNCTUATION_TYPE == $token->getType()) {
-                if ('.' == $token->getValue() || '[' == $token->getValue()) {
-                    $node = $this->parseSubscriptExpression($node);
-                } elseif ('|' == $token->getValue()) {
-                    $node = $this->parseFilterExpression($node);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-
-        return $node;
-    }
-
-    public function getFunctionNode($name, $line)
-    {
-        switch ($name) {
-            case 'parent':
-                $this->parseArguments();
-                if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden.', $line, $this->parser->getStream()->getSourceContext());
-                }
-
-                if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden.', $line, $this->parser->getStream()->getSourceContext());
-                }
-
-                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
-            case 'block':
-                $args = $this->parseArguments();
-                if (count($args) < 1) {
-                    throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext());
-                }
-
-                return new Twig_Node_Expression_BlockReference($args->getNode(0), count($args) > 1 ? $args->getNode(1) : null, $line);
-            case 'attribute':
-                $args = $this->parseArguments();
-                if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes).', $line, $this->parser->getStream()->getSourceContext());
-                }
-
-                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : null, Twig_Template::ANY_CALL, $line);
-            default:
-                if (null !== $alias = $this->parser->getImportedSymbol('function', $name)) {
-                    $arguments = new Twig_Node_Expression_Array(array(), $line);
-                    foreach ($this->parseArguments() as $n) {
-                        $arguments->addElement($n);
-                    }
-
-                    $node = new Twig_Node_Expression_MethodCall($alias['node'], $alias['name'], $arguments, $line);
-                    $node->setAttribute('safe', true);
-
-                    return $node;
-                }
-
-                $args = $this->parseArguments(true);
-                $class = $this->getFunctionNodeClass($name, $line);
-
-                return new $class($name, $args, $line);
-        }
-    }
-
-    public function parseSubscriptExpression($node)
-    {
-        $stream = $this->parser->getStream();
-        $token = $stream->next();
-        $lineno = $token->getLine();
-        $arguments = new Twig_Node_Expression_Array(array(), $lineno);
-        $type = Twig_Template::ANY_CALL;
-        if ('.' == $token->getValue()) {
-            $token = $stream->next();
-            if (
-                Twig_Token::NAME_TYPE == $token->getType()
-                ||
-                Twig_Token::NUMBER_TYPE == $token->getType()
-                ||
-                (Twig_Token::OPERATOR_TYPE == $token->getType() && preg_match(Twig_Lexer::REGEX_NAME, $token->getValue()))
-            ) {
-                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
-
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                    $type = Twig_Template::METHOD_CALL;
-                    foreach ($this->parseArguments() as $n) {
-                        $arguments->addElement($n);
-                    }
-                }
-            } else {
-                throw new Twig_Error_Syntax('Expected name or number.', $lineno, $stream->getSourceContext());
-            }
-
-            if ($node instanceof Twig_Node_Expression_Name && null !== $this->parser->getImportedSymbol('template', $node->getAttribute('name'))) {
-                if (!$arg instanceof Twig_Node_Expression_Constant) {
-                    throw new Twig_Error_Syntax(sprintf('Dynamic macro names are not supported (called on "%s").', $node->getAttribute('name')), $token->getLine(), $stream->getSourceContext());
-                }
-
-                $name = $arg->getAttribute('value');
-
-                if ($this->parser->isReservedMacroName($name)) {
-                    throw new Twig_Error_Syntax(sprintf('"%s" cannot be called as macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
-                }
-
-                $node = new Twig_Node_Expression_MethodCall($node, 'get'.$name, $arguments, $lineno);
-                $node->setAttribute('safe', true);
-
-                return $node;
-            }
-        } else {
-            $type = Twig_Template::ARRAY_CALL;
-
-            // slice?
-            $slice = false;
-            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $slice = true;
-                $arg = new Twig_Node_Expression_Constant(0, $token->getLine());
-            } else {
-                $arg = $this->parseExpression();
-            }
-
-            if ($stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $slice = true;
-            }
-
-            if ($slice) {
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    $length = new Twig_Node_Expression_Constant(null, $token->getLine());
-                } else {
-                    $length = $this->parseExpression();
-                }
-
-                $class = $this->getFilterNodeClass('slice', $token->getLine());
-                $arguments = new Twig_Node(array($arg, $length));
-                $filter = new $class($node, new Twig_Node_Expression_Constant('slice', $token->getLine()), $arguments, $token->getLine());
-
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-
-                return $filter;
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-        }
-
-        return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
-    }
-
-    public function parseFilterExpression($node)
-    {
-        $this->parser->getStream()->next();
-
-        return $this->parseFilterExpressionRaw($node);
-    }
-
-    public function parseFilterExpressionRaw($node, $tag = null)
-    {
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE);
-
-            $name = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $arguments = new Twig_Node();
-            } else {
-                $arguments = $this->parseArguments(true);
-            }
-
-            $class = $this->getFilterNodeClass($name->getAttribute('value'), $token->getLine());
-
-            $node = new $class($node, $name, $arguments, $token->getLine(), $tag);
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '|')) {
-                break;
-            }
-
-            $this->parser->getStream()->next();
-        }
-
-        return $node;
-    }
-
-    /**
-     * Parses arguments.
-     *
-     * @param bool $namedArguments Whether to allow named arguments or not
-     * @param bool $definition     Whether we are parsing arguments for a function definition
-     *
-     * @return Twig_Node
-     *
-     * @throws Twig_Error_Syntax
-     */
-    public function parseArguments($namedArguments = false, $definition = false)
-    {
-        $args = array();
-        $stream = $this->parser->getStream();
-
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) {
-            if (!empty($args)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
-            }
-
-            if ($definition) {
-                $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'An argument must be a name');
-                $value = new Twig_Node_Expression_Name($token->getValue(), $this->parser->getCurrentToken()->getLine());
-            } else {
-                $value = $this->parseExpression();
-            }
-
-            $name = null;
-            if ($namedArguments && $token = $stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
-                if (!$value instanceof Twig_Node_Expression_Name) {
-                    throw new Twig_Error_Syntax(sprintf('A parameter name must be a string, "%s" given.', get_class($value)), $token->getLine(), $stream->getSourceContext());
-                }
-                $name = $value->getAttribute('name');
-
-                if ($definition) {
-                    $value = $this->parsePrimaryExpression();
-
-                    if (!$this->checkConstantExpression($value)) {
-                        throw new Twig_Error_Syntax(sprintf('A default value for an argument must be a constant (a boolean, a string, a number, or an array).'), $token->getLine(), $stream->getSourceContext());
-                    }
-                } else {
-                    $value = $this->parseExpression();
-                }
-            }
-
-            if ($definition) {
-                if (null === $name) {
-                    $name = $value->getAttribute('name');
-                    $value = new Twig_Node_Expression_Constant(null, $this->parser->getCurrentToken()->getLine());
-                }
-                $args[$name] = $value;
-            } else {
-                if (null === $name) {
-                    $args[] = $value;
-                } else {
-                    $args[$name] = $value;
-                }
-            }
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
-
-        return new Twig_Node($args);
-    }
-
-    public function parseAssignmentExpression()
-    {
-        $stream = $this->parser->getStream();
-        $targets = array();
-        while (true) {
-            $token = $stream->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            $value = $token->getValue();
-            if (in_array(strtolower($value), array('true', 'false', 'none', 'null'))) {
-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
-            }
-            $targets[] = new Twig_Node_Expression_AssignName($value, $token->getLine());
-
-            if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    public function parseMultitargetExpression()
-    {
-        $targets = array();
-        while (true) {
-            $targets[] = $this->parseExpression();
-            if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    private function parseNotTestExpression(Twig_NodeInterface $node)
-    {
-        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($node), $this->parser->getCurrentToken()->getLine());
-    }
-
-    private function parseTestExpression(Twig_NodeInterface $node)
-    {
-        $stream = $this->parser->getStream();
-        list($name, $test) = $this->getTest($node->getTemplateLine());
-
-        $class = $this->getTestNodeClass($test);
-        $arguments = null;
-        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $this->parser->getExpressionParser()->parseArguments(true);
-        }
-
-        return new $class($node, $name, $arguments, $this->parser->getCurrentToken()->getLine());
-    }
-
-    private function getTest($line)
-    {
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-        if ($test = $this->env->getTest($name)) {
-            return array($name, $test);
-        }
-
-        if ($stream->test(Twig_Token::NAME_TYPE)) {
-            // try 2-words tests
-            $name = $name.' '.$this->parser->getCurrentToken()->getValue();
-
-            if ($test = $this->env->getTest($name)) {
-                $stream->next();
-
-                return array($name, $test);
-            }
-        }
-
-        $e = new Twig_Error_Syntax(sprintf('Unknown "%s" test.', $name), $line, $stream->getSourceContext());
-        $e->addSuggestions($name, array_keys($this->env->getTests()));
-
-        throw $e;
-    }
-
-    private function getTestNodeClass($test)
-    {
-        if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
-            $stream = $this->parser->getStream();
-            $message = sprintf('Twig Test "%s" is deprecated', $test->getName());
-            if (!is_bool($test->getDeprecatedVersion())) {
-                $message .= sprintf(' since version %s', $test->getDeprecatedVersion());
-            }
-            if ($test->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $test->getAlternative());
-            }
-            $src = $stream->getSourceContext();
-            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $stream->getCurrent()->getLine());
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        if ($test instanceof Twig_SimpleTest) {
-            return $test->getNodeClass();
-        }
-
-        return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
-    }
-
-    protected function getFunctionNodeClass($name, $line)
-    {
-        if (false === $function = $this->env->getFunction($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" function.', $name), $line, $this->parser->getStream()->getSourceContext());
-            $e->addSuggestions($name, array_keys($this->env->getFunctions()));
-
-            throw $e;
-        }
-
-        if ($function instanceof Twig_SimpleFunction && $function->isDeprecated()) {
-            $message = sprintf('Twig Function "%s" is deprecated', $function->getName());
-            if (!is_bool($function->getDeprecatedVersion())) {
-                $message .= sprintf(' since version %s', $function->getDeprecatedVersion());
-            }
-            if ($function->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $function->getAlternative());
-            }
-            $src = $this->parser->getStream()->getSourceContext();
-            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        if ($function instanceof Twig_SimpleFunction) {
-            return $function->getNodeClass();
-        }
-
-        return $function instanceof Twig_Function_Node ? $function->getClass() : 'Twig_Node_Expression_Function';
-    }
-
-    protected function getFilterNodeClass($name, $line)
-    {
-        if (false === $filter = $this->env->getFilter($name)) {
-            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" filter.', $name), $line, $this->parser->getStream()->getSourceContext());
-            $e->addSuggestions($name, array_keys($this->env->getFilters()));
-
-            throw $e;
-        }
-
-        if ($filter instanceof Twig_SimpleFilter && $filter->isDeprecated()) {
-            $message = sprintf('Twig Filter "%s" is deprecated', $filter->getName());
-            if (!is_bool($filter->getDeprecatedVersion())) {
-                $message .= sprintf(' since version %s', $filter->getDeprecatedVersion());
-            }
-            if ($filter->getAlternative()) {
-                $message .= sprintf('. Use "%s" instead', $filter->getAlternative());
-            }
-            $src = $this->parser->getStream()->getSourceContext();
-            $message .= sprintf(' in %s at line %d.', $src->getPath() ? $src->getPath() : $src->getName(), $line);
-
-            @trigger_error($message, E_USER_DEPRECATED);
-        }
-
-        if ($filter instanceof Twig_SimpleFilter) {
-            return $filter->getNodeClass();
-        }
-
-        return $filter instanceof Twig_Filter_Node ? $filter->getClass() : 'Twig_Node_Expression_Filter';
-    }
-
-    // checks that the node only contains "constant" elements
-    protected function checkConstantExpression(Twig_NodeInterface $node)
-    {
-        if (!($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array
-            || $node instanceof Twig_Node_Expression_Unary_Neg || $node instanceof Twig_Node_Expression_Unary_Pos
-        )) {
-            return false;
-        }
-
-        foreach ($node as $n) {
-            if (!$this->checkConstantExpression($n)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}
-
-class_alias('Twig_ExpressionParser', 'Twig\ExpressionParser', false);
diff --git a/inc/lib/Twig/Extension.php b/inc/lib/Twig/Extension.php
deleted file mode 100644
index 38084495..00000000
--- a/inc/lib/Twig/Extension.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-abstract class Twig_Extension implements Twig_ExtensionInterface
-{
-    /**
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
-     */
-    public function initRuntime(Twig_Environment $environment)
-    {
-    }
-
-    public function getTokenParsers()
-    {
-        return array();
-    }
-
-    public function getNodeVisitors()
-    {
-        return array();
-    }
-
-    public function getFilters()
-    {
-        return array();
-    }
-
-    public function getTests()
-    {
-        return array();
-    }
-
-    public function getFunctions()
-    {
-        return array();
-    }
-
-    public function getOperators()
-    {
-        return array();
-    }
-
-    /**
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
-     */
-    public function getGlobals()
-    {
-        return array();
-    }
-
-    /**
-     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
-     */
-    public function getName()
-    {
-        return get_class($this);
-    }
-}
-
-class_alias('Twig_Extension', 'Twig\Extension\AbstractExtension', false);
-class_exists('Twig_Environment');
diff --git a/inc/lib/Twig/Extension/Core.php b/inc/lib/Twig/Extension/Core.php
deleted file mode 100644
index 6fa78e13..00000000
--- a/inc/lib/Twig/Extension/Core.php
+++ /dev/null
@@ -1,1642 +0,0 @@
-<?php
-
-if (!defined('ENT_SUBSTITUTE')) {
-    define('ENT_SUBSTITUTE', 8);
-}
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_Core extends Twig_Extension
-{
-    protected $dateFormats = array('F j, Y H:i', '%d days');
-    protected $numberFormat = array(0, '.', ',');
-    protected $timezone = null;
-    protected $escapers = array();
-
-    /**
-     * Defines a new escaper to be used via the escape filter.
-     *
-     * @param string   $strategy The strategy name that should be used as a strategy in the escape call
-     * @param callable $callable A valid PHP callable
-     */
-    public function setEscaper($strategy, $callable)
-    {
-        $this->escapers[$strategy] = $callable;
-    }
-
-    /**
-     * Gets all defined escapers.
-     *
-     * @return array An array of escapers
-     */
-    public function getEscapers()
-    {
-        return $this->escapers;
-    }
-
-    /**
-     * Sets the default format to be used by the date filter.
-     *
-     * @param string $format             The default date format string
-     * @param string $dateIntervalFormat The default date interval format string
-     */
-    public function setDateFormat($format = null, $dateIntervalFormat = null)
-    {
-        if (null !== $format) {
-            $this->dateFormats[0] = $format;
-        }
-
-        if (null !== $dateIntervalFormat) {
-            $this->dateFormats[1] = $dateIntervalFormat;
-        }
-    }
-
-    /**
-     * Gets the default format to be used by the date filter.
-     *
-     * @return array The default date format string and the default date interval format string
-     */
-    public function getDateFormat()
-    {
-        return $this->dateFormats;
-    }
-
-    /**
-     * Sets the default timezone to be used by the date filter.
-     *
-     * @param DateTimeZone|string $timezone The default timezone string or a DateTimeZone object
-     */
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-    }
-
-    /**
-     * Gets the default timezone to be used by the date filter.
-     *
-     * @return DateTimeZone The default timezone currently in use
-     */
-    public function getTimezone()
-    {
-        if (null === $this->timezone) {
-            $this->timezone = new DateTimeZone(date_default_timezone_get());
-        }
-
-        return $this->timezone;
-    }
-
-    /**
-     * Sets the default format to be used by the number_format filter.
-     *
-     * @param int    $decimal      the number of decimal places to use
-     * @param string $decimalPoint the character(s) to use for the decimal point
-     * @param string $thousandSep  the character(s) to use for the thousands separator
-     */
-    public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
-    {
-        $this->numberFormat = array($decimal, $decimalPoint, $thousandSep);
-    }
-
-    /**
-     * Get the default format used by the number_format filter.
-     *
-     * @return array The arguments for number_format()
-     */
-    public function getNumberFormat()
-    {
-        return $this->numberFormat;
-    }
-
-    public function getTokenParsers()
-    {
-        return array(
-            new Twig_TokenParser_For(),
-            new Twig_TokenParser_If(),
-            new Twig_TokenParser_Extends(),
-            new Twig_TokenParser_Include(),
-            new Twig_TokenParser_Block(),
-            new Twig_TokenParser_Use(),
-            new Twig_TokenParser_Filter(),
-            new Twig_TokenParser_Macro(),
-            new Twig_TokenParser_Import(),
-            new Twig_TokenParser_From(),
-            new Twig_TokenParser_Set(),
-            new Twig_TokenParser_Spaceless(),
-            new Twig_TokenParser_Flush(),
-            new Twig_TokenParser_Do(),
-            new Twig_TokenParser_Embed(),
-            new Twig_TokenParser_With(),
-        );
-    }
-
-    public function getFilters()
-    {
-        $filters = array(
-            // formatting filters
-            new Twig_SimpleFilter('date', 'twig_date_format_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('format', 'sprintf'),
-            new Twig_SimpleFilter('replace', 'twig_replace_filter'),
-            new Twig_SimpleFilter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('abs', 'abs'),
-            new Twig_SimpleFilter('round', 'twig_round'),
-
-            // encoding
-            new Twig_SimpleFilter('url_encode', 'twig_urlencode_filter'),
-            new Twig_SimpleFilter('json_encode', 'twig_jsonencode_filter'),
-            new Twig_SimpleFilter('convert_encoding', 'twig_convert_encoding'),
-
-            // string filters
-            new Twig_SimpleFilter('title', 'twig_title_string_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('upper', 'strtoupper'),
-            new Twig_SimpleFilter('lower', 'strtolower'),
-            new Twig_SimpleFilter('striptags', 'strip_tags'),
-            new Twig_SimpleFilter('trim', 'twig_trim_filter'),
-            new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
-
-            // array helpers
-            new Twig_SimpleFilter('join', 'twig_join_filter'),
-            new Twig_SimpleFilter('split', 'twig_split_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('sort', 'twig_sort_filter'),
-            new Twig_SimpleFilter('merge', 'twig_array_merge'),
-            new Twig_SimpleFilter('batch', 'twig_array_batch'),
-
-            // string/array filters
-            new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('length', 'twig_length_filter', array('needs_environment' => true)),
-            new Twig_SimpleFilter('slice', 'twig_slice', array('needs_environment' => true)),
-            new Twig_SimpleFilter('first', 'twig_first', array('needs_environment' => true)),
-            new Twig_SimpleFilter('last', 'twig_last', array('needs_environment' => true)),
-
-            // iteration and runtime
-            new Twig_SimpleFilter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
-            new Twig_SimpleFilter('keys', 'twig_get_array_keys_filter'),
-
-            // escaping
-            new Twig_SimpleFilter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-            new Twig_SimpleFilter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-        );
-
-        if (function_exists('mb_get_info')) {
-            $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
-            $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
-        }
-
-        return $filters;
-    }
-
-    public function getFunctions()
-    {
-        return array(
-            new Twig_SimpleFunction('max', 'max'),
-            new Twig_SimpleFunction('min', 'min'),
-            new Twig_SimpleFunction('range', 'range'),
-            new Twig_SimpleFunction('constant', 'twig_constant'),
-            new Twig_SimpleFunction('cycle', 'twig_cycle'),
-            new Twig_SimpleFunction('random', 'twig_random', array('needs_environment' => true)),
-            new Twig_SimpleFunction('date', 'twig_date_converter', array('needs_environment' => true)),
-            new Twig_SimpleFunction('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
-            new Twig_SimpleFunction('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
-        );
-    }
-
-    public function getTests()
-    {
-        return array(
-            new Twig_SimpleTest('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
-            new Twig_SimpleTest('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
-            new Twig_SimpleTest('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
-            new Twig_SimpleTest('sameas', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => '1.21', 'alternative' => 'same as')),
-            new Twig_SimpleTest('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
-            new Twig_SimpleTest('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
-            new Twig_SimpleTest('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
-            new Twig_SimpleTest('divisibleby', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => '1.21', 'alternative' => 'divisible by')),
-            new Twig_SimpleTest('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
-            new Twig_SimpleTest('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
-            new Twig_SimpleTest('empty', 'twig_test_empty'),
-            new Twig_SimpleTest('iterable', 'twig_test_iterable'),
-        );
-    }
-
-    public function getOperators()
-    {
-        return array(
-            array(
-                'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
-                '-' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'),
-                '+' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'),
-            ),
-            array(
-                'or' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'and' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-or' => array('precedence' => 16, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-xor' => array('precedence' => 17, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-and' => array('precedence' => 18, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '!=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'matches' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Matches', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'starts with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_StartsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'ends with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_EndsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '..' => array('precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '+' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '-' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '~' => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '*' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '/' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '//' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '%' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is not' => array('precedence' => 100, 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
-                '??' => array('precedence' => 300, 'class' => 'Twig_Node_Expression_NullCoalesce', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
-            ),
-        );
-    }
-
-    public function getName()
-    {
-        return 'core';
-    }
-}
-
-/**
- * Cycles over a value.
- *
- * @param ArrayAccess|array $values
- * @param int               $position The cycle position
- *
- * @return string The next value in the cycle
- */
-function twig_cycle($values, $position)
-{
-    if (!is_array($values) && !$values instanceof ArrayAccess) {
-        return $values;
-    }
-
-    return $values[$position % count($values)];
-}
-
-/**
- * Returns a random value depending on the supplied parameter type:
- * - a random item from a Traversable or array
- * - a random character from a string
- * - a random integer between 0 and the integer parameter.
- *
- * @param Twig_Environment                   $env
- * @param Traversable|array|int|float|string $values The values to pick a random item from
- *
- * @throws Twig_Error_Runtime when $values is an empty array (does not apply to an empty string which is returned as is)
- *
- * @return mixed A random value from the given sequence
- */
-function twig_random(Twig_Environment $env, $values = null)
-{
-    if (null === $values) {
-        return mt_rand();
-    }
-
-    if (is_int($values) || is_float($values)) {
-        return $values < 0 ? mt_rand($values, 0) : mt_rand(0, $values);
-    }
-
-    if ($values instanceof Traversable) {
-        $values = iterator_to_array($values);
-    } elseif (is_string($values)) {
-        if ('' === $values) {
-            return '';
-        }
-        if (null !== $charset = $env->getCharset()) {
-            if ('UTF-8' !== $charset) {
-                $values = twig_convert_encoding($values, 'UTF-8', $charset);
-            }
-
-            // unicode version of str_split()
-            // split at all positions, but not after the start and not before the end
-            $values = preg_split('/(?<!^)(?!$)/u', $values);
-
-            if ('UTF-8' !== $charset) {
-                foreach ($values as $i => $value) {
-                    $values[$i] = twig_convert_encoding($value, $charset, 'UTF-8');
-                }
-            }
-        } else {
-            return $values[mt_rand(0, strlen($values) - 1)];
-        }
-    }
-
-    if (!is_array($values)) {
-        return $values;
-    }
-
-    if (0 === count($values)) {
-        throw new Twig_Error_Runtime('The random function cannot pick from an empty array.');
-    }
-
-    return $values[array_rand($values, 1)];
-}
-
-/**
- * Converts a date to the given format.
- *
- * <pre>
- *   {{ post.published_at|date("m/d/Y") }}
- * </pre>
- *
- * @param Twig_Environment                               $env
- * @param DateTime|DateTimeInterface|DateInterval|string $date     A date
- * @param string|null                                    $format   The target format, null to use the default
- * @param DateTimeZone|string|null|false                 $timezone The target timezone, null to use the default, false to leave unchanged
- *
- * @return string The formatted date
- */
-function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
-{
-    if (null === $format) {
-        $formats = $env->getExtension('Twig_Extension_Core')->getDateFormat();
-        $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
-    }
-
-    if ($date instanceof DateInterval) {
-        return $date->format($format);
-    }
-
-    return twig_date_converter($env, $date, $timezone)->format($format);
-}
-
-/**
- * Returns a new date object modified.
- *
- * <pre>
- *   {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
- * </pre>
- *
- * @param Twig_Environment $env
- * @param DateTime|string  $date     A date
- * @param string           $modifier A modifier string
- *
- * @return DateTime A new date object
- */
-function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
-{
-    $date = twig_date_converter($env, $date, false);
-    $resultDate = $date->modify($modifier);
-
-    // This is a hack to ensure PHP 5.2 support and support for DateTimeImmutable
-    // DateTime::modify does not return the modified DateTime object < 5.3.0
-    // and DateTimeImmutable does not modify $date.
-    return null === $resultDate ? $date : $resultDate;
-}
-
-/**
- * Converts an input to a DateTime instance.
- *
- * <pre>
- *    {% if date(user.created_at) < date('+2days') %}
- *      {# do something #}
- *    {% endif %}
- * </pre>
- *
- * @param Twig_Environment                       $env
- * @param DateTime|DateTimeInterface|string|null $date     A date
- * @param DateTimeZone|string|null|false         $timezone The target timezone, null to use the default, false to leave unchanged
- *
- * @return DateTime A DateTime instance
- */
-function twig_date_converter(Twig_Environment $env, $date = null, $timezone = null)
-{
-    // determine the timezone
-    if (false !== $timezone) {
-        if (null === $timezone) {
-            $timezone = $env->getExtension('Twig_Extension_Core')->getTimezone();
-        } elseif (!$timezone instanceof DateTimeZone) {
-            $timezone = new DateTimeZone($timezone);
-        }
-    }
-
-    // immutable dates
-    if ($date instanceof DateTimeImmutable) {
-        return false !== $timezone ? $date->setTimezone($timezone) : $date;
-    }
-
-    if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
-        $date = clone $date;
-        if (false !== $timezone) {
-            $date->setTimezone($timezone);
-        }
-
-        return $date;
-    }
-
-    if (null === $date || 'now' === $date) {
-        return new DateTime($date, false !== $timezone ? $timezone : $env->getExtension('Twig_Extension_Core')->getTimezone());
-    }
-
-    $asString = (string) $date;
-    if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
-        $date = new DateTime('@'.$date);
-    } else {
-        $date = new DateTime($date, $env->getExtension('Twig_Extension_Core')->getTimezone());
-    }
-
-    if (false !== $timezone) {
-        $date->setTimezone($timezone);
-    }
-
-    return $date;
-}
-
-/**
- * Replaces strings within a string.
- *
- * @param string            $str  String to replace in
- * @param array|Traversable $from Replace values
- * @param string|null       $to   Replace to, deprecated (@see https://secure.php.net/manual/en/function.strtr.php)
- *
- * @return string
- */
-function twig_replace_filter($str, $from, $to = null)
-{
-    if ($from instanceof Traversable) {
-        $from = iterator_to_array($from);
-    } elseif (is_string($from) && is_string($to)) {
-        @trigger_error('Using "replace" with character by character replacement is deprecated since version 1.22 and will be removed in Twig 2.0', E_USER_DEPRECATED);
-
-        return strtr($str, $from, $to);
-    } elseif (!is_array($from)) {
-        throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".', is_object($from) ? get_class($from) : gettype($from)));
-    }
-
-    return strtr($str, $from);
-}
-
-/**
- * Rounds a number.
- *
- * @param int|float $value     The value to round
- * @param int|float $precision The rounding precision
- * @param string    $method    The method to use for rounding
- *
- * @return int|float The rounded number
- */
-function twig_round($value, $precision = 0, $method = 'common')
-{
-    if ('common' == $method) {
-        return round($value, $precision);
-    }
-
-    if ('ceil' != $method && 'floor' != $method) {
-        throw new Twig_Error_Runtime('The round filter only supports the "common", "ceil", and "floor" methods.');
-    }
-
-    return $method($value * pow(10, $precision)) / pow(10, $precision);
-}
-
-/**
- * Number format filter.
- *
- * All of the formatting options can be left null, in that case the defaults will
- * be used.  Supplying any of the parameters will override the defaults set in the
- * environment object.
- *
- * @param Twig_Environment $env
- * @param mixed            $number       A float/int/string of the number to format
- * @param int              $decimal      the number of decimal points to display
- * @param string           $decimalPoint the character(s) to use for the decimal point
- * @param string           $thousandSep  the character(s) to use for the thousands separator
- *
- * @return string The formatted number
- */
-function twig_number_format_filter(Twig_Environment $env, $number, $decimal = null, $decimalPoint = null, $thousandSep = null)
-{
-    $defaults = $env->getExtension('Twig_Extension_Core')->getNumberFormat();
-    if (null === $decimal) {
-        $decimal = $defaults[0];
-    }
-
-    if (null === $decimalPoint) {
-        $decimalPoint = $defaults[1];
-    }
-
-    if (null === $thousandSep) {
-        $thousandSep = $defaults[2];
-    }
-
-    return number_format((float) $number, $decimal, $decimalPoint, $thousandSep);
-}
-
-/**
- * URL encodes (RFC 3986) a string as a path segment or an array as a query string.
- *
- * @param string|array $url A URL or an array of query parameters
- *
- * @return string The URL encoded value
- */
-function twig_urlencode_filter($url)
-{
-    if (is_array($url)) {
-        if (defined('PHP_QUERY_RFC3986')) {
-            return http_build_query($url, '', '&', PHP_QUERY_RFC3986);
-        }
-
-        return http_build_query($url, '', '&');
-    }
-
-    return rawurlencode($url);
-}
-
-if (PHP_VERSION_ID < 50300) {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed $value   the value to encode
-     * @param int   $options Not used on PHP 5.2.x
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value);
-    }
-} else {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed $value   the value to encode
-     * @param int   $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value, $options);
-    }
-}
-
-function _twig_markup2string(&$value)
-{
-    if ($value instanceof Twig_Markup) {
-        $value = (string) $value;
-    }
-}
-
-/**
- * Merges an array with another one.
- *
- * <pre>
- *  {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
- *
- *  {% set items = items|merge({ 'peugeot': 'car' }) %}
- *
- *  {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
- * </pre>
- *
- * @param array|Traversable $arr1 An array
- * @param array|Traversable $arr2 An array
- *
- * @return array The merged array
- */
-function twig_array_merge($arr1, $arr2)
-{
-    if ($arr1 instanceof Traversable) {
-        $arr1 = iterator_to_array($arr1);
-    } elseif (!is_array($arr1)) {
-        throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as first argument.', gettype($arr1)));
-    }
-
-    if ($arr2 instanceof Traversable) {
-        $arr2 = iterator_to_array($arr2);
-    } elseif (!is_array($arr2)) {
-        throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as second argument.', gettype($arr2)));
-    }
-
-    return array_merge($arr1, $arr2);
-}
-
-/**
- * Slices a variable.
- *
- * @param Twig_Environment $env
- * @param mixed            $item         A variable
- * @param int              $start        Start of the slice
- * @param int              $length       Size of the slice
- * @param bool             $preserveKeys Whether to preserve key or not (when the input is an array)
- *
- * @return mixed The sliced variable
- */
-function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
-{
-    if ($item instanceof Traversable) {
-        while ($item instanceof IteratorAggregate) {
-            $item = $item->getIterator();
-        }
-
-        if ($start >= 0 && $length >= 0 && $item instanceof Iterator) {
-            try {
-                return iterator_to_array(new LimitIterator($item, $start, null === $length ? -1 : $length), $preserveKeys);
-            } catch (OutOfBoundsException $exception) {
-                return array();
-            }
-        }
-
-        $item = iterator_to_array($item, $preserveKeys);
-    }
-
-    if (is_array($item)) {
-        return array_slice($item, $start, $length, $preserveKeys);
-    }
-
-    $item = (string) $item;
-
-    if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
-        return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
-    }
-
-    return (string) (null === $length ? substr($item, $start) : substr($item, $start, $length));
-}
-
-/**
- * Returns the first element of the item.
- *
- * @param Twig_Environment $env
- * @param mixed            $item A variable
- *
- * @return mixed The first element of the item
- */
-function twig_first(Twig_Environment $env, $item)
-{
-    $elements = twig_slice($env, $item, 0, 1, false);
-
-    return is_string($elements) ? $elements : current($elements);
-}
-
-/**
- * Returns the last element of the item.
- *
- * @param Twig_Environment $env
- * @param mixed            $item A variable
- *
- * @return mixed The last element of the item
- */
-function twig_last(Twig_Environment $env, $item)
-{
-    $elements = twig_slice($env, $item, -1, 1, false);
-
-    return is_string($elements) ? $elements : current($elements);
-}
-
-/**
- * Joins the values to a string.
- *
- * The separator between elements is an empty string per default, you can define it with the optional parameter.
- *
- * <pre>
- *  {{ [1, 2, 3]|join('|') }}
- *  {# returns 1|2|3 #}
- *
- *  {{ [1, 2, 3]|join }}
- *  {# returns 123 #}
- * </pre>
- *
- * @param array  $value An array
- * @param string $glue  The separator
- *
- * @return string The concatenated string
- */
-function twig_join_filter($value, $glue = '')
-{
-    if ($value instanceof Traversable) {
-        $value = iterator_to_array($value, false);
-    }
-
-    return implode($glue, (array) $value);
-}
-
-/**
- * Splits the string into an array.
- *
- * <pre>
- *  {{ "one,two,three"|split(',') }}
- *  {# returns [one, two, three] #}
- *
- *  {{ "one,two,three,four,five"|split(',', 3) }}
- *  {# returns [one, two, "three,four,five"] #}
- *
- *  {{ "123"|split('') }}
- *  {# returns [1, 2, 3] #}
- *
- *  {{ "aabbcc"|split('', 2) }}
- *  {# returns [aa, bb, cc] #}
- * </pre>
- *
- * @param Twig_Environment $env
- * @param string           $value     A string
- * @param string           $delimiter The delimiter
- * @param int              $limit     The limit
- *
- * @return array The split string as an array
- */
-function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = null)
-{
-    if (!empty($delimiter)) {
-        return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
-    }
-
-    if (!function_exists('mb_get_info') || null === $charset = $env->getCharset()) {
-        return str_split($value, null === $limit ? 1 : $limit);
-    }
-
-    if ($limit <= 1) {
-        return preg_split('/(?<!^)(?!$)/u', $value);
-    }
-
-    $length = mb_strlen($value, $charset);
-    if ($length < $limit) {
-        return array($value);
-    }
-
-    $r = array();
-    for ($i = 0; $i < $length; $i += $limit) {
-        $r[] = mb_substr($value, $i, $limit, $charset);
-    }
-
-    return $r;
-}
-
-// The '_default' filter is used internally to avoid using the ternary operator
-// which costs a lot for big contexts (before PHP 5.4). So, on average,
-// a function call is cheaper.
-/**
- * @internal
- */
-function _twig_default_filter($value, $default = '')
-{
-    if (twig_test_empty($value)) {
-        return $default;
-    }
-
-    return $value;
-}
-
-/**
- * Returns the keys for the given array.
- *
- * It is useful when you want to iterate over the keys of an array:
- *
- * <pre>
- *  {% for key in array|keys %}
- *      {# ... #}
- *  {% endfor %}
- * </pre>
- *
- * @param array $array An array
- *
- * @return array The keys
- */
-function twig_get_array_keys_filter($array)
-{
-    if ($array instanceof Traversable) {
-        while ($array instanceof IteratorAggregate) {
-            $array = $array->getIterator();
-        }
-
-        if ($array instanceof Iterator) {
-            $keys = array();
-            $array->rewind();
-            while ($array->valid()) {
-                $keys[] = $array->key();
-                $array->next();
-            }
-
-            return $keys;
-        }
-
-        $keys = array();
-        foreach ($array as $key => $item) {
-            $keys[] = $key;
-        }
-
-        return $keys;
-    }
-
-    if (!is_array($array)) {
-        return array();
-    }
-
-    return array_keys($array);
-}
-
-/**
- * Reverses a variable.
- *
- * @param Twig_Environment         $env
- * @param array|Traversable|string $item         An array, a Traversable instance, or a string
- * @param bool                     $preserveKeys Whether to preserve key or not
- *
- * @return mixed The reversed input
- */
-function twig_reverse_filter(Twig_Environment $env, $item, $preserveKeys = false)
-{
-    if ($item instanceof Traversable) {
-        return array_reverse(iterator_to_array($item), $preserveKeys);
-    }
-
-    if (is_array($item)) {
-        return array_reverse($item, $preserveKeys);
-    }
-
-    if (null !== $charset = $env->getCharset()) {
-        $string = (string) $item;
-
-        if ('UTF-8' !== $charset) {
-            $item = twig_convert_encoding($string, 'UTF-8', $charset);
-        }
-
-        preg_match_all('/./us', $item, $matches);
-
-        $string = implode('', array_reverse($matches[0]));
-
-        if ('UTF-8' !== $charset) {
-            $string = twig_convert_encoding($string, $charset, 'UTF-8');
-        }
-
-        return $string;
-    }
-
-    return strrev((string) $item);
-}
-
-/**
- * Sorts an array.
- *
- * @param array|Traversable $array
- *
- * @return array
- */
-function twig_sort_filter($array)
-{
-    if ($array instanceof Traversable) {
-        $array = iterator_to_array($array);
-    } elseif (!is_array($array)) {
-        throw new Twig_Error_Runtime(sprintf('The sort filter only works with arrays or "Traversable", got "%s".', gettype($array)));
-    }
-
-    asort($array);
-
-    return $array;
-}
-
-/**
- * @internal
- */
-function twig_in_filter($value, $compare)
-{
-    if (is_array($compare)) {
-        return in_array($value, $compare, is_object($value) || is_resource($value));
-    } elseif (is_string($compare) && (is_string($value) || is_int($value) || is_float($value))) {
-        return '' === $value || false !== strpos($compare, (string) $value);
-    } elseif ($compare instanceof Traversable) {
-        if (is_object($value) || is_resource($value)) {
-            foreach ($compare as $item) {
-                if ($item === $value) {
-                    return true;
-                }
-            }
-        } else {
-            foreach ($compare as $item) {
-                if ($item == $value) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    return false;
-}
-
-/**
- * Returns a trimmed string.
- *
- * @return string
- *
- * @throws Twig_Error_Runtime When an invalid trimming side is used (not a string or not 'left', 'right', or 'both')
- */
-function twig_trim_filter($string, $characterMask = null, $side = 'both')
-{
-    if (null === $characterMask) {
-        $characterMask = " \t\n\r\0\x0B";
-    }
-
-    switch ($side) {
-        case 'both':
-            return trim($string, $characterMask);
-        case 'left':
-            return ltrim($string, $characterMask);
-        case 'right':
-            return rtrim($string, $characterMask);
-        default:
-            throw new Twig_Error_Runtime('Trimming side must be "left", "right" or "both".');
-    }
-}
-
-/**
- * Escapes a string.
- *
- * @param Twig_Environment $env
- * @param mixed            $string     The value to be escaped
- * @param string           $strategy   The escaping strategy
- * @param string           $charset    The charset
- * @param bool             $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
- *
- * @return string
- */
-function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false)
-{
-    if ($autoescape && $string instanceof Twig_Markup) {
-        return $string;
-    }
-
-    if (!is_string($string)) {
-        if (is_object($string) && method_exists($string, '__toString')) {
-            $string = (string) $string;
-        } elseif (in_array($strategy, array('html', 'js', 'css', 'html_attr', 'url'))) {
-            return $string;
-        }
-    }
-
-    if (null === $charset) {
-        $charset = $env->getCharset();
-    }
-
-    switch ($strategy) {
-        case 'html':
-            // see https://secure.php.net/htmlspecialchars
-
-            // Using a static variable to avoid initializing the array
-            // each time the function is called. Moving the declaration on the
-            // top of the function slow downs other escaping strategies.
-            static $htmlspecialcharsCharsets = array(
-                'ISO-8859-1' => true, 'ISO8859-1' => true,
-                'ISO-8859-15' => true, 'ISO8859-15' => true,
-                'utf-8' => true, 'UTF-8' => true,
-                'CP866' => true, 'IBM866' => true, '866' => true,
-                'CP1251' => true, 'WINDOWS-1251' => true, 'WIN-1251' => true,
-                '1251' => true,
-                'CP1252' => true, 'WINDOWS-1252' => true, '1252' => true,
-                'KOI8-R' => true, 'KOI8-RU' => true, 'KOI8R' => true,
-                'BIG5' => true, '950' => true,
-                'GB2312' => true, '936' => true,
-                'BIG5-HKSCS' => true,
-                'SHIFT_JIS' => true, 'SJIS' => true, '932' => true,
-                'EUC-JP' => true, 'EUCJP' => true,
-                'ISO8859-5' => true, 'ISO-8859-5' => true, 'MACROMAN' => true,
-            );
-
-            if (isset($htmlspecialcharsCharsets[$charset])) {
-                return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-            }
-
-            if (isset($htmlspecialcharsCharsets[strtoupper($charset)])) {
-                // cache the lowercase variant for future iterations
-                $htmlspecialcharsCharsets[$charset] = true;
-
-                return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-            }
-
-            $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            $string = htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-
-            return twig_convert_encoding($string, $charset, 'UTF-8');
-
-        case 'js':
-            // escape all non-alphanumeric characters
-            // into their \x or \uHHHH representations
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', '_twig_escape_js_callback', $string);
-
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'css':
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9]#Su', '_twig_escape_css_callback', $string);
-
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'html_attr':
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (0 == strlen($string) ? false : 1 !== preg_match('/^./su', $string)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            $string = preg_replace_callback('#[^a-zA-Z0-9,\.\-_]#Su', '_twig_escape_html_attr_callback', $string);
-
-            if ('UTF-8' !== $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'url':
-            if (PHP_VERSION_ID < 50300) {
-                return str_replace('%7E', '~', rawurlencode($string));
-            }
-
-            return rawurlencode($string);
-
-        default:
-            static $escapers;
-
-            if (null === $escapers) {
-                $escapers = $env->getExtension('Twig_Extension_Core')->getEscapers();
-            }
-
-            if (isset($escapers[$strategy])) {
-                return call_user_func($escapers[$strategy], $env, $string, $charset);
-            }
-
-            $validStrategies = implode(', ', array_merge(array('html', 'js', 'url', 'css', 'html_attr'), array_keys($escapers)));
-
-            throw new Twig_Error_Runtime(sprintf('Invalid escaping strategy "%s" (valid ones: %s).', $strategy, $validStrategies));
-    }
-}
-
-/**
- * @internal
- */
-function twig_escape_filter_is_safe(Twig_Node $filterArgs)
-{
-    foreach ($filterArgs as $arg) {
-        if ($arg instanceof Twig_Node_Expression_Constant) {
-            return array($arg->getAttribute('value'));
-        }
-
-        return array();
-    }
-
-    return array('html');
-}
-
-if (function_exists('mb_convert_encoding')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return mb_convert_encoding($string, $to, $from);
-    }
-} elseif (function_exists('iconv')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return iconv($from, $to, $string);
-    }
-} else {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
-    }
-}
-
-function _twig_escape_js_callback($matches)
-{
-    $char = $matches[0];
-
-    /*
-     * A few characters have short escape sequences in JSON and JavaScript.
-     * Escape sequences supported only by JavaScript, not JSON, are ommitted.
-     * \" is also supported but omitted, because the resulting string is not HTML safe.
-     */
-    static $shortMap = array(
-        '\\' => '\\\\',
-        '/' => '\\/',
-        "\x08" => '\b',
-        "\x0C" => '\f',
-        "\x0A" => '\n',
-        "\x0D" => '\r',
-        "\x09" => '\t',
-    );
-
-    if (isset($shortMap[$char])) {
-        return $shortMap[$char];
-    }
-
-    // \uHHHH
-    $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-    $char = strtoupper(bin2hex($char));
-
-    if (4 >= strlen($char)) {
-        return sprintf('\u%04s', $char);
-    }
-
-    return sprintf('\u%04s\u%04s', substr($char, 0, -4), substr($char, -4));
-}
-
-function _twig_escape_css_callback($matches)
-{
-    $char = $matches[0];
-
-    // \xHH
-    if (!isset($char[1])) {
-        $hex = ltrim(strtoupper(bin2hex($char)), '0');
-        if (0 === strlen($hex)) {
-            $hex = '0';
-        }
-
-        return '\\'.$hex.' ';
-    }
-
-    // \uHHHH
-    $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
-    return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
-}
-
-/**
- * This function is adapted from code coming from Zend Framework.
- *
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (https://www.zend.com)
- * @license   https://framework.zend.com/license/new-bsd New BSD License
- */
-function _twig_escape_html_attr_callback($matches)
-{
-    /*
-     * While HTML supports far more named entities, the lowest common denominator
-     * has become HTML5's XML Serialisation which is restricted to the those named
-     * entities that XML supports. Using HTML entities would result in this error:
-     *     XML Parsing Error: undefined entity
-     */
-    static $entityMap = array(
-        34 => 'quot', /* quotation mark */
-        38 => 'amp',  /* ampersand */
-        60 => 'lt',   /* less-than sign */
-        62 => 'gt',   /* greater-than sign */
-    );
-
-    $chr = $matches[0];
-    $ord = ord($chr);
-
-    /*
-     * The following replaces characters undefined in HTML with the
-     * hex entity for the Unicode replacement character.
-     */
-    if (($ord <= 0x1f && "\t" != $chr && "\n" != $chr && "\r" != $chr) || ($ord >= 0x7f && $ord <= 0x9f)) {
-        return '&#xFFFD;';
-    }
-
-    /*
-     * Check if the current character to escape has a name entity we should
-     * replace it with while grabbing the hex value of the character.
-     */
-    if (1 == strlen($chr)) {
-        $hex = strtoupper(substr('00'.bin2hex($chr), -2));
-    } else {
-        $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
-        $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
-    }
-
-    $int = hexdec($hex);
-    if (array_key_exists($int, $entityMap)) {
-        return sprintf('&%s;', $entityMap[$int]);
-    }
-
-    /*
-     * Per OWASP recommendations, we'll use hex entities for any other
-     * characters where a named entity does not exist.
-     */
-    return sprintf('&#x%s;', $hex);
-}
-
-// add multibyte extensions if possible
-if (function_exists('mb_get_info')) {
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env
-     * @param mixed            $thing A variable
-     *
-     * @return int The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        if (null === $thing) {
-            return 0;
-        }
-
-        if (is_scalar($thing)) {
-            return mb_strlen($thing, $env->getCharset());
-        }
-
-        if ($thing instanceof \SimpleXMLElement) {
-            return count($thing);
-        }
-
-        if (is_object($thing) && method_exists($thing, '__toString') && !$thing instanceof \Countable) {
-            return mb_strlen((string) $thing, $env->getCharset());
-        }
-
-        if ($thing instanceof \Countable || is_array($thing)) {
-            return count($thing);
-        }
-
-        if ($thing instanceof \IteratorAggregate) {
-            return iterator_count($thing);
-        }
-
-        return 1;
-    }
-
-    /**
-     * Converts a string to uppercase.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The uppercased string
-     */
-    function twig_upper_filter(Twig_Environment $env, $string)
-    {
-        if (null !== $charset = $env->getCharset()) {
-            return mb_strtoupper($string, $charset);
-        }
-
-        return strtoupper($string);
-    }
-
-    /**
-     * Converts a string to lowercase.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The lowercased string
-     */
-    function twig_lower_filter(Twig_Environment $env, $string)
-    {
-        if (null !== $charset = $env->getCharset()) {
-            return mb_strtolower($string, $charset);
-        }
-
-        return strtolower($string);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== $charset = $env->getCharset()) {
-            return mb_convert_case($string, MB_CASE_TITLE, $charset);
-        }
-
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== $charset = $env->getCharset()) {
-            return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
-        }
-
-        return ucfirst(strtolower($string));
-    }
-}
-// and byte fallback
-else {
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env
-     * @param mixed            $thing A variable
-     *
-     * @return int The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        if (null === $thing) {
-            return 0;
-        }
-
-        if (is_scalar($thing)) {
-            return strlen($thing);
-        }
-
-        if ($thing instanceof \SimpleXMLElement) {
-            return count($thing);
-        }
-
-        if (is_object($thing) && method_exists($thing, '__toString') && !$thing instanceof \Countable) {
-            return strlen((string) $thing);
-        }
-
-        if ($thing instanceof \Countable || is_array($thing)) {
-            return count($thing);
-        }
-
-        if ($thing instanceof \IteratorAggregate) {
-            return iterator_count($thing);
-        }
-
-        return 1;
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        return ucfirst(strtolower($string));
-    }
-}
-
-/**
- * @internal
- */
-function twig_ensure_traversable($seq)
-{
-    if ($seq instanceof Traversable || is_array($seq)) {
-        return $seq;
-    }
-
-    return array();
-}
-
-/**
- * Checks if a variable is empty.
- *
- * <pre>
- * {# evaluates to true if the foo variable is null, false, or the empty string #}
- * {% if foo is empty %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A variable
- *
- * @return bool true if the value is empty, false otherwise
- */
-function twig_test_empty($value)
-{
-    if ($value instanceof Countable) {
-        return 0 == count($value);
-    }
-
-    if (is_object($value) && method_exists($value, '__toString')) {
-        return '' === (string) $value;
-    }
-
-    return '' === $value || false === $value || null === $value || array() === $value;
-}
-
-/**
- * Checks if a variable is traversable.
- *
- * <pre>
- * {# evaluates to true if the foo variable is an array or a traversable object #}
- * {% if foo is iterable %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @param mixed $value A variable
- *
- * @return bool true if the value is traversable
- */
-function twig_test_iterable($value)
-{
-    return $value instanceof Traversable || is_array($value);
-}
-
-/**
- * Renders a template.
- *
- * @param Twig_Environment $env
- * @param array            $context
- * @param string|array     $template      The template to render or an array of templates to try consecutively
- * @param array            $variables     The variables to pass to the template
- * @param bool             $withContext
- * @param bool             $ignoreMissing Whether to ignore missing templates or not
- * @param bool             $sandboxed     Whether to sandbox the template or not
- *
- * @return string The rendered template
- */
-function twig_include(Twig_Environment $env, $context, $template, $variables = array(), $withContext = true, $ignoreMissing = false, $sandboxed = false)
-{
-    $alreadySandboxed = false;
-    $sandbox = null;
-    if ($withContext) {
-        $variables = array_merge($context, $variables);
-    }
-
-    if ($isSandboxed = $sandboxed && $env->hasExtension('Twig_Extension_Sandbox')) {
-        $sandbox = $env->getExtension('Twig_Extension_Sandbox');
-        if (!$alreadySandboxed = $sandbox->isSandboxed()) {
-            $sandbox->enableSandbox();
-        }
-    }
-
-    $result = null;
-    try {
-        $result = $env->resolveTemplate($template)->render($variables);
-    } catch (Twig_Error_Loader $e) {
-        if (!$ignoreMissing) {
-            if ($isSandboxed && !$alreadySandboxed) {
-                $sandbox->disableSandbox();
-            }
-
-            throw $e;
-        }
-    } catch (Throwable $e) {
-        if ($isSandboxed && !$alreadySandboxed) {
-            $sandbox->disableSandbox();
-        }
-
-        throw $e;
-    } catch (Exception $e) {
-        if ($isSandboxed && !$alreadySandboxed) {
-            $sandbox->disableSandbox();
-        }
-
-        throw $e;
-    }
-
-    if ($isSandboxed && !$alreadySandboxed) {
-        $sandbox->disableSandbox();
-    }
-
-    return $result;
-}
-
-/**
- * Returns a template content without rendering it.
- *
- * @param Twig_Environment $env
- * @param string           $name          The template name
- * @param bool             $ignoreMissing Whether to ignore missing templates or not
- *
- * @return string The template source
- */
-function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
-{
-    $loader = $env->getLoader();
-    try {
-        if (!$loader instanceof Twig_SourceContextLoaderInterface) {
-            return $loader->getSource($name);
-        } else {
-            return $loader->getSourceContext($name)->getCode();
-        }
-    } catch (Twig_Error_Loader $e) {
-        if (!$ignoreMissing) {
-            throw $e;
-        }
-    }
-}
-
-/**
- * Provides the ability to get constants from instances as well as class/global constants.
- *
- * @param string      $constant The name of the constant
- * @param null|object $object   The object to get the constant from
- *
- * @return string
- */
-function twig_constant($constant, $object = null)
-{
-    if (null !== $object) {
-        $constant = get_class($object).'::'.$constant;
-    }
-
-    return constant($constant);
-}
-
-/**
- * Checks if a constant exists.
- *
- * @param string      $constant The name of the constant
- * @param null|object $object   The object to get the constant from
- *
- * @return bool
- */
-function twig_constant_is_defined($constant, $object = null)
-{
-    if (null !== $object) {
-        $constant = get_class($object).'::'.$constant;
-    }
-
-    return defined($constant);
-}
-
-/**
- * Batches item.
- *
- * @param array $items An array of items
- * @param int   $size  The size of the batch
- * @param mixed $fill  A value used to fill missing items
- *
- * @return array
- */
-function twig_array_batch($items, $size, $fill = null)
-{
-    if ($items instanceof Traversable) {
-        $items = iterator_to_array($items, false);
-    }
-
-    $size = ceil($size);
-
-    $result = array_chunk($items, $size, true);
-
-    if (null !== $fill && !empty($result)) {
-        $last = count($result) - 1;
-        if ($fillCount = $size - count($result[$last])) {
-            $result[$last] = array_merge(
-                $result[$last],
-                array_fill(0, $fillCount, $fill)
-            );
-        }
-    }
-
-    return $result;
-}
-
-class_alias('Twig_Extension_Core', 'Twig\Extension\CoreExtension', false);
diff --git a/inc/lib/Twig/Extension/Debug.php b/inc/lib/Twig/Extension/Debug.php
deleted file mode 100644
index d0cd1962..00000000
--- a/inc/lib/Twig/Extension/Debug.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_Debug extends Twig_Extension
-{
-    public function getFunctions()
-    {
-        // dump is safe if var_dump is overridden by xdebug
-        $isDumpOutputHtmlSafe = extension_loaded('xdebug')
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            && (false === ini_get('xdebug.overload_var_dump') || ini_get('xdebug.overload_var_dump'))
-            // false means that it was not set (and the default is on) or it explicitly enabled
-            // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
-            && (false === ini_get('html_errors') || ini_get('html_errors'))
-            || 'cli' === PHP_SAPI
-        ;
-
-        return array(
-            new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
-        );
-    }
-
-    public function getName()
-    {
-        return 'debug';
-    }
-}
-
-function twig_var_dump(Twig_Environment $env, $context)
-{
-    if (!$env->isDebug()) {
-        return;
-    }
-
-    ob_start();
-
-    $count = func_num_args();
-    if (2 === $count) {
-        $vars = array();
-        foreach ($context as $key => $value) {
-            if (!$value instanceof Twig_Template) {
-                $vars[$key] = $value;
-            }
-        }
-
-        var_dump($vars);
-    } else {
-        for ($i = 2; $i < $count; ++$i) {
-            var_dump(func_get_arg($i));
-        }
-    }
-
-    return ob_get_clean();
-}
-
-class_alias('Twig_Extension_Debug', 'Twig\Extension\DebugExtension', false);
diff --git a/inc/lib/Twig/Extension/Escaper.php b/inc/lib/Twig/Extension/Escaper.php
deleted file mode 100644
index 46c2d84b..00000000
--- a/inc/lib/Twig/Extension/Escaper.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_Escaper extends Twig_Extension
-{
-    protected $defaultStrategy;
-
-    /**
-     * @param string|false|callable $defaultStrategy An escaping strategy
-     *
-     * @see setDefaultStrategy()
-     */
-    public function __construct($defaultStrategy = 'html')
-    {
-        $this->setDefaultStrategy($defaultStrategy);
-    }
-
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_AutoEscape());
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Escaper());
-    }
-
-    public function getFilters()
-    {
-        return array(
-            new Twig_SimpleFilter('raw', 'twig_raw_filter', array('is_safe' => array('all'))),
-        );
-    }
-
-    /**
-     * Sets the default strategy to use when not defined by the user.
-     *
-     * The strategy can be a valid PHP callback that takes the template
-     * name as an argument and returns the strategy to use.
-     *
-     * @param string|false|callable $defaultStrategy An escaping strategy
-     */
-    public function setDefaultStrategy($defaultStrategy)
-    {
-        // for BC
-        if (true === $defaultStrategy) {
-            @trigger_error('Using "true" as the default strategy is deprecated since version 1.21. Use "html" instead.', E_USER_DEPRECATED);
-
-            $defaultStrategy = 'html';
-        }
-
-        if ('filename' === $defaultStrategy) {
-            @trigger_error('Using "filename" as the default strategy is deprecated since version 1.27. Use "name" instead.', E_USER_DEPRECATED);
-
-            $defaultStrategy = 'name';
-        }
-
-        if ('name' === $defaultStrategy) {
-            $defaultStrategy = array('Twig_FileExtensionEscapingStrategy', 'guess');
-        }
-
-        $this->defaultStrategy = $defaultStrategy;
-    }
-
-    /**
-     * Gets the default strategy to use when not defined by the user.
-     *
-     * @param string $name The template name
-     *
-     * @return string|false The default strategy to use for the template
-     */
-    public function getDefaultStrategy($name)
-    {
-        // disable string callables to avoid calling a function named html or js,
-        // or any other upcoming escaping strategy
-        if (!is_string($this->defaultStrategy) && false !== $this->defaultStrategy) {
-            return call_user_func($this->defaultStrategy, $name);
-        }
-
-        return $this->defaultStrategy;
-    }
-
-    public function getName()
-    {
-        return 'escaper';
-    }
-}
-
-/**
- * Marks a variable as being safe.
- *
- * @param string $string A PHP variable
- *
- * @return string
- */
-function twig_raw_filter($string)
-{
-    return $string;
-}
-
-class_alias('Twig_Extension_Escaper', 'Twig\Extension\EscaperExtension', false);
diff --git a/inc/lib/Twig/Extension/GlobalsInterface.php b/inc/lib/Twig/Extension/GlobalsInterface.php
deleted file mode 100644
index 922cd2c9..00000000
--- a/inc/lib/Twig/Extension/GlobalsInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Enables usage of the deprecated Twig_Extension::getGlobals() method.
- *
- * Explicitly implement this interface if you really need to implement the
- * deprecated getGlobals() method in your extensions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Extension_GlobalsInterface
-{
-}
-
-class_alias('Twig_Extension_GlobalsInterface', 'Twig\Extension\GlobalsInterface', false);
diff --git a/inc/lib/Twig/Extension/InitRuntimeInterface.php b/inc/lib/Twig/Extension/InitRuntimeInterface.php
deleted file mode 100644
index 1549862f..00000000
--- a/inc/lib/Twig/Extension/InitRuntimeInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Enables usage of the deprecated Twig_Extension::initRuntime() method.
- *
- * Explicitly implement this interface if you really need to implement the
- * deprecated initRuntime() method in your extensions.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Extension_InitRuntimeInterface
-{
-}
-
-class_alias('Twig_Extension_InitRuntimeInterface', 'Twig\Extension\InitRuntimeInterface', false);
diff --git a/inc/lib/Twig/Extension/Optimizer.php b/inc/lib/Twig/Extension/Optimizer.php
deleted file mode 100644
index 6c62e3ef..00000000
--- a/inc/lib/Twig/Extension/Optimizer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_Optimizer extends Twig_Extension
-{
-    protected $optimizers;
-
-    public function __construct($optimizers = -1)
-    {
-        $this->optimizers = $optimizers;
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
-    }
-
-    public function getName()
-    {
-        return 'optimizer';
-    }
-}
-
-class_alias('Twig_Extension_Optimizer', 'Twig\Extension\OptimizerExtension', false);
diff --git a/inc/lib/Twig/Extension/Profiler.php b/inc/lib/Twig/Extension/Profiler.php
deleted file mode 100644
index fcfc002b..00000000
--- a/inc/lib/Twig/Extension/Profiler.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Extension_Profiler extends Twig_Extension
-{
-    private $actives = array();
-
-    public function __construct(Twig_Profiler_Profile $profile)
-    {
-        $this->actives[] = $profile;
-    }
-
-    public function enter(Twig_Profiler_Profile $profile)
-    {
-        $this->actives[0]->addProfile($profile);
-        array_unshift($this->actives, $profile);
-    }
-
-    public function leave(Twig_Profiler_Profile $profile)
-    {
-        $profile->leave();
-        array_shift($this->actives);
-
-        if (1 === count($this->actives)) {
-            $this->actives[0]->leave();
-        }
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_Profiler_NodeVisitor_Profiler(get_class($this)));
-    }
-
-    public function getName()
-    {
-        return 'profiler';
-    }
-}
-
-class_alias('Twig_Extension_Profiler', 'Twig\Extension\ProfilerExtension', false);
-class_exists('Twig_Profiler_Profile');
diff --git a/inc/lib/Twig/Extension/Sandbox.php b/inc/lib/Twig/Extension/Sandbox.php
deleted file mode 100644
index 5cb80a71..00000000
--- a/inc/lib/Twig/Extension/Sandbox.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_Sandbox extends Twig_Extension
-{
-    protected $sandboxedGlobally;
-    protected $sandboxed;
-    protected $policy;
-
-    public function __construct(Twig_Sandbox_SecurityPolicyInterface $policy, $sandboxed = false)
-    {
-        $this->policy = $policy;
-        $this->sandboxedGlobally = $sandboxed;
-    }
-
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_Sandbox());
-    }
-
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Sandbox());
-    }
-
-    public function enableSandbox()
-    {
-        $this->sandboxed = true;
-    }
-
-    public function disableSandbox()
-    {
-        $this->sandboxed = false;
-    }
-
-    public function isSandboxed()
-    {
-        return $this->sandboxedGlobally || $this->sandboxed;
-    }
-
-    public function isSandboxedGlobally()
-    {
-        return $this->sandboxedGlobally;
-    }
-
-    public function setSecurityPolicy(Twig_Sandbox_SecurityPolicyInterface $policy)
-    {
-        $this->policy = $policy;
-    }
-
-    public function getSecurityPolicy()
-    {
-        return $this->policy;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkSecurity($tags, $filters, $functions);
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkMethodAllowed($obj, $method);
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkPropertyAllowed($obj, $method);
-        }
-    }
-
-    public function ensureToStringAllowed($obj)
-    {
-        if ($this->isSandboxed() && is_object($obj)) {
-            $this->policy->checkMethodAllowed($obj, '__toString');
-        }
-
-        return $obj;
-    }
-
-    public function getName()
-    {
-        return 'sandbox';
-    }
-}
-
-class_alias('Twig_Extension_Sandbox', 'Twig\Extension\SandboxExtension', false);
diff --git a/inc/lib/Twig/Extension/Staging.php b/inc/lib/Twig/Extension/Staging.php
deleted file mode 100644
index d3a0f9c9..00000000
--- a/inc/lib/Twig/Extension/Staging.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Internal class.
- *
- * This class is used by Twig_Environment as a staging area and must not be used directly.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @internal
- */
-class Twig_Extension_Staging extends Twig_Extension
-{
-    protected $functions = array();
-    protected $filters = array();
-    protected $visitors = array();
-    protected $tokenParsers = array();
-    protected $globals = array();
-    protected $tests = array();
-
-    public function addFunction($name, $function)
-    {
-        if (isset($this->functions[$name])) {
-            @trigger_error(sprintf('Overriding function "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
-        }
-
-        $this->functions[$name] = $function;
-    }
-
-    public function getFunctions()
-    {
-        return $this->functions;
-    }
-
-    public function addFilter($name, $filter)
-    {
-        if (isset($this->filters[$name])) {
-            @trigger_error(sprintf('Overriding filter "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
-        }
-
-        $this->filters[$name] = $filter;
-    }
-
-    public function getFilters()
-    {
-        return $this->filters;
-    }
-
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        $this->visitors[] = $visitor;
-    }
-
-    public function getNodeVisitors()
-    {
-        return $this->visitors;
-    }
-
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        if (isset($this->tokenParsers[$parser->getTag()])) {
-            @trigger_error(sprintf('Overriding tag "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $parser->getTag()), E_USER_DEPRECATED);
-        }
-
-        $this->tokenParsers[$parser->getTag()] = $parser;
-    }
-
-    public function getTokenParsers()
-    {
-        return $this->tokenParsers;
-    }
-
-    public function addGlobal($name, $value)
-    {
-        $this->globals[$name] = $value;
-    }
-
-    public function getGlobals()
-    {
-        return $this->globals;
-    }
-
-    public function addTest($name, $test)
-    {
-        if (isset($this->tests[$name])) {
-            @trigger_error(sprintf('Overriding test "%s" that is already registered is deprecated since version 1.30 and won\'t be possible anymore in 2.0.', $name), E_USER_DEPRECATED);
-        }
-
-        $this->tests[$name] = $test;
-    }
-
-    public function getTests()
-    {
-        return $this->tests;
-    }
-
-    public function getName()
-    {
-        return 'staging';
-    }
-}
-
-class_alias('Twig_Extension_Staging', 'Twig\Extension\StagingExtension', false);
diff --git a/inc/lib/Twig/Extension/StringLoader.php b/inc/lib/Twig/Extension/StringLoader.php
deleted file mode 100644
index 2ce3c992..00000000
--- a/inc/lib/Twig/Extension/StringLoader.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_Extension_StringLoader extends Twig_Extension
-{
-    public function getFunctions()
-    {
-        return array(
-            new Twig_SimpleFunction('template_from_string', 'twig_template_from_string', array('needs_environment' => true)),
-        );
-    }
-
-    public function getName()
-    {
-        return 'string_loader';
-    }
-}
-
-/**
- * Loads a template from a string.
- *
- * <pre>
- * {{ include(template_from_string("Hello {{ name }}")) }}
- * </pre>
- *
- * @param Twig_Environment $env      A Twig_Environment instance
- * @param string           $template A template as a string or object implementing __toString()
- *
- * @return Twig_Template
- */
-function twig_template_from_string(Twig_Environment $env, $template)
-{
-    return $env->createTemplate((string) $template);
-}
-
-class_alias('Twig_Extension_StringLoader', 'Twig\Extension\StringLoaderExtension', false);
diff --git a/inc/lib/Twig/ExtensionInterface.php b/inc/lib/Twig/ExtensionInterface.php
deleted file mode 100644
index 946df500..00000000
--- a/inc/lib/Twig/ExtensionInterface.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by extension classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_ExtensionInterface
-{
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_InitRuntimeInterface instead
-     */
-    public function initRuntime(Twig_Environment $environment);
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return Twig_TokenParserInterface[]
-     */
-    public function getTokenParsers();
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return Twig_NodeVisitorInterface[]
-     */
-    public function getNodeVisitors();
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return Twig_SimpleFilter[]
-     */
-    public function getFilters();
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return Twig_SimpleTest[]
-     */
-    public function getTests();
-
-    /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return Twig_SimpleFunction[]
-     */
-    public function getFunctions();
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array<array> First array of unary operators, second array of binary operators
-     */
-    public function getOperators();
-
-    /**
-     * Returns a list of global variables to add to the existing list.
-     *
-     * @return array An array of global variables
-     *
-     * @deprecated since 1.23 (to be removed in 2.0), implement Twig_Extension_GlobalsInterface instead
-     */
-    public function getGlobals();
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     *
-     * @deprecated since 1.26 (to be removed in 2.0), not used anymore internally
-     */
-    public function getName();
-}
-
-class_alias('Twig_ExtensionInterface', 'Twig\Extension\ExtensionInterface', false);
-class_exists('Twig_Environment');
diff --git a/inc/lib/Twig/FactoryRuntimeLoader.php b/inc/lib/Twig/FactoryRuntimeLoader.php
deleted file mode 100644
index 2cdaded1..00000000
--- a/inc/lib/Twig/FactoryRuntimeLoader.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Lazy loads the runtime implementations for a Twig element.
- *
- * @author Robin Chalas <robin.chalas@gmail.com>
- */
-class Twig_FactoryRuntimeLoader implements Twig_RuntimeLoaderInterface
-{
-    private $map;
-
-    /**
-     * @param array $map An array where keys are class names and values factory callables
-     */
-    public function __construct($map = array())
-    {
-        $this->map = $map;
-    }
-
-    public function load($class)
-    {
-        if (isset($this->map[$class])) {
-            $runtimeFactory = $this->map[$class];
-
-            return $runtimeFactory();
-        }
-    }
-}
-
-class_alias('Twig_FactoryRuntimeLoader', 'Twig\RuntimeLoader\FactoryRuntimeLoader', false);
diff --git a/inc/lib/Twig/FileExtensionEscapingStrategy.php b/inc/lib/Twig/FileExtensionEscapingStrategy.php
deleted file mode 100644
index 8f8cd2ee..00000000
--- a/inc/lib/Twig/FileExtensionEscapingStrategy.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default autoescaping strategy based on file names.
- *
- * This strategy sets the HTML as the default autoescaping strategy,
- * but changes it based on the template name.
- *
- * Note that there is no runtime performance impact as the
- * default autoescaping strategy is set at compilation time.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_FileExtensionEscapingStrategy
-{
-    /**
-     * Guesses the best autoescaping strategy based on the file name.
-     *
-     * @param string $name The template name
-     *
-     * @return string|false The escaping strategy name to use or false to disable
-     */
-    public static function guess($name)
-    {
-        if (in_array(substr($name, -1), array('/', '\\'))) {
-            return 'html'; // return html for directories
-        }
-
-        if ('.twig' === substr($name, -5)) {
-            $name = substr($name, 0, -5);
-        }
-
-        $extension = pathinfo($name, PATHINFO_EXTENSION);
-
-        switch ($extension) {
-            case 'js':
-                return 'js';
-
-            case 'css':
-                return 'css';
-
-            case 'txt':
-                return false;
-
-            default:
-                return 'html';
-        }
-    }
-}
-
-class_alias('Twig_FileExtensionEscapingStrategy', 'Twig\FileExtensionEscapingStrategy', false);
diff --git a/inc/lib/Twig/Filter.php b/inc/lib/Twig/Filter.php
deleted file mode 100644
index 893d75d1..00000000
--- a/inc/lib/Twig/Filter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Filter class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'pre_escape' => null,
-            'preserves_safety' => null,
-            'callable' => null,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-    }
-
-    public function getPreservesSafety()
-    {
-        return $this->options['preserves_safety'];
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/inc/lib/Twig/Filter/Function.php b/inc/lib/Twig/Filter/Function.php
deleted file mode 100644
index 71b16554..00000000
--- a/inc/lib/Twig/Filter/Function.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Filter_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Function extends Twig_Filter
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/lib/Twig/Filter/Method.php b/inc/lib/Twig/Filter/Method.php
deleted file mode 100644
index 1b75676c..00000000
--- a/inc/lib/Twig/Filter/Method.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Method extends Twig_Filter
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
-    }
-}
diff --git a/inc/lib/Twig/Filter/Node.php b/inc/lib/Twig/Filter/Node.php
deleted file mode 100644
index 3e6b12ef..00000000
--- a/inc/lib/Twig/Filter/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Filter_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template filter as a node.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Filter_Node extends Twig_Filter
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/inc/lib/Twig/FilterCallableInterface.php b/inc/lib/Twig/FilterCallableInterface.php
deleted file mode 100644
index 21b028c4..00000000
--- a/inc/lib/Twig/FilterCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterCallableInterface
-{
-    public function getCallable();
-}
diff --git a/inc/lib/Twig/FilterInterface.php b/inc/lib/Twig/FilterInterface.php
deleted file mode 100644
index 9d7e9ab6..00000000
--- a/inc/lib/Twig/FilterInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * Use Twig_SimpleFilter instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FilterInterface
-{
-    /**
-     * Compiles a filter.
-     *
-     * @return string The PHP code for the filter
-     */
-    public function compile();
-
-    public function needsEnvironment();
-
-    public function needsContext();
-
-    public function getSafe(Twig_Node $filterArgs);
-
-    public function getPreservesSafety();
-
-    public function getPreEscape();
-
-    public function setArguments($arguments);
-
-    public function getArguments();
-}
diff --git a/inc/lib/Twig/Function.php b/inc/lib/Twig/Function.php
deleted file mode 100644
index 9dc16e90..00000000
--- a/inc/lib/Twig/Function.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'callable' => null,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/inc/lib/Twig/Function/Function.php b/inc/lib/Twig/Function/Function.php
deleted file mode 100644
index 97c0eb77..00000000
--- a/inc/lib/Twig/Function/Function.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Function extends Twig_Function
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/lib/Twig/Function/Method.php b/inc/lib/Twig/Function/Method.php
deleted file mode 100644
index 4299e118..00000000
--- a/inc/lib/Twig/Function/Method.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-@trigger_error('The Twig_Function_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Method extends Twig_Function
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
-    }
-}
diff --git a/inc/lib/Twig/Function/Node.php b/inc/lib/Twig/Function/Node.php
deleted file mode 100644
index 0adc5d93..00000000
--- a/inc/lib/Twig/Function/Node.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Function_Node class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFunction instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template function as a node.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Function_Node extends Twig_Function
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/inc/lib/Twig/FunctionCallableInterface.php b/inc/lib/Twig/FunctionCallableInterface.php
deleted file mode 100644
index d23d6917..00000000
--- a/inc/lib/Twig/FunctionCallableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionCallableInterface
-{
-    public function getCallable();
-}
diff --git a/inc/lib/Twig/FunctionInterface.php b/inc/lib/Twig/FunctionInterface.php
deleted file mode 100644
index 00d4f95c..00000000
--- a/inc/lib/Twig/FunctionInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * Use Twig_SimpleFunction instead.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_FunctionInterface
-{
-    /**
-     * Compiles a function.
-     *
-     * @return string The PHP code for the function
-     */
-    public function compile();
-
-    public function needsEnvironment();
-
-    public function needsContext();
-
-    public function getSafe(Twig_Node $filterArgs);
-
-    public function setArguments($arguments);
-
-    public function getArguments();
-}
diff --git a/inc/lib/Twig/Lexer.php b/inc/lib/Twig/Lexer.php
deleted file mode 100644
index 41211eb2..00000000
--- a/inc/lib/Twig/Lexer.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Lexes a template string.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Lexer implements Twig_LexerInterface
-{
-    protected $tokens;
-    protected $code;
-    protected $cursor;
-    protected $lineno;
-    protected $end;
-    protected $state;
-    protected $states;
-    protected $brackets;
-    protected $env;
-    // to be renamed to $name in 2.0 (where it is private)
-    protected $filename;
-    protected $options;
-    protected $regexes;
-    protected $position;
-    protected $positions;
-    protected $currentVarBlockLine;
-
-    private $source;
-
-    const STATE_DATA = 0;
-    const STATE_BLOCK = 1;
-    const STATE_VAR = 2;
-    const STATE_STRING = 3;
-    const STATE_INTERPOLATION = 4;
-
-    const REGEX_NAME = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
-    const REGEX_STRING = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
-    const REGEX_DQ_STRING_DELIM = '/"/A';
-    const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
-    const PUNCTUATION = '()[]{}?:.,|';
-
-    public function __construct(Twig_Environment $env, array $options = array())
-    {
-        $this->env = $env;
-
-        $this->options = array_merge(array(
-            'tag_comment' => array('{#', '#}'),
-            'tag_block' => array('{%', '%}'),
-            'tag_variable' => array('{{', '}}'),
-            'whitespace_trim' => '-',
-            'interpolation' => array('#{', '}'),
-        ), $options);
-
-        $this->regexes = array(
-            'lex_var' => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
-            'lex_block' => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
-            'lex_raw_data' => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*(?:end%s)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
-            'operator' => $this->getOperatorRegex(),
-            'lex_comment' => '/(?:'.preg_quote($this->options['whitespace_trim'], '/').preg_quote($this->options['tag_comment'][1], '/').'\s*|'.preg_quote($this->options['tag_comment'][1], '/').')\n?/s',
-            'lex_block_raw' => '/\s*(raw|verbatim)\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
-            'lex_block_line' => '/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As',
-            'lex_tokens_start' => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
-            'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
-            'interpolation_end' => '/\s*'.preg_quote($this->options['interpolation'][1], '/').'/A',
-        );
-    }
-
-    public function tokenize($code, $name = null)
-    {
-        if (!$code instanceof Twig_Source) {
-            @trigger_error(sprintf('Passing a string as the $code argument of %s() is deprecated since version 1.27 and will be removed in 2.0. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            $this->source = new Twig_Source($code, $name);
-        } else {
-            $this->source = $code;
-        }
-
-        if (((int) ini_get('mbstring.func_overload')) & 2) {
-            @trigger_error('Support for having "mbstring.func_overload" different from 0 is deprecated version 1.29 and will be removed in 2.0.', E_USER_DEPRECATED);
-        }
-
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        } else {
-            $mbEncoding = null;
-        }
-
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $this->source->getCode());
-        $this->filename = $this->source->getName();
-        $this->cursor = 0;
-        $this->lineno = 1;
-        $this->end = strlen($this->code);
-        $this->tokens = array();
-        $this->state = self::STATE_DATA;
-        $this->states = array();
-        $this->brackets = array();
-        $this->position = -1;
-
-        // find all token starts in one go
-        preg_match_all($this->regexes['lex_tokens_start'], $this->code, $matches, PREG_OFFSET_CAPTURE);
-        $this->positions = $matches;
-
-        while ($this->cursor < $this->end) {
-            // dispatch to the lexing functions depending
-            // on the current state
-            switch ($this->state) {
-                case self::STATE_DATA:
-                    $this->lexData();
-                    break;
-
-                case self::STATE_BLOCK:
-                    $this->lexBlock();
-                    break;
-
-                case self::STATE_VAR:
-                    $this->lexVar();
-                    break;
-
-                case self::STATE_STRING:
-                    $this->lexString();
-                    break;
-
-                case self::STATE_INTERPOLATION:
-                    $this->lexInterpolation();
-                    break;
-            }
-        }
-
-        $this->pushToken(Twig_Token::EOF_TYPE);
-
-        if (!empty($this->brackets)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
-        }
-
-        if ($mbEncoding) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return new Twig_TokenStream($this->tokens, $this->source);
-    }
-
-    protected function lexData()
-    {
-        // if no matches are left we return the rest of the template as simple text token
-        if ($this->position == count($this->positions[0]) - 1) {
-            $this->pushToken(Twig_Token::TEXT_TYPE, substr($this->code, $this->cursor));
-            $this->cursor = $this->end;
-
-            return;
-        }
-
-        // Find the first token after the current cursor
-        $position = $this->positions[0][++$this->position];
-        while ($position[1] < $this->cursor) {
-            if ($this->position == count($this->positions[0]) - 1) {
-                return;
-            }
-            $position = $this->positions[0][++$this->position];
-        }
-
-        // push the template text first
-        $text = $textContent = substr($this->code, $this->cursor, $position[1] - $this->cursor);
-        if (isset($this->positions[2][$this->position][0])) {
-            $text = rtrim($text);
-        }
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-        $this->moveCursor($textContent.$position[0]);
-
-        switch ($this->positions[1][$this->position][0]) {
-            case $this->options['tag_comment'][0]:
-                $this->lexComment();
-                break;
-
-            case $this->options['tag_block'][0]:
-                // raw data?
-                if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lexRawData($match[1]);
-                // {% line \d+ %}
-                } elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lineno = (int) $match[1];
-                } else {
-                    $this->pushToken(Twig_Token::BLOCK_START_TYPE);
-                    $this->pushState(self::STATE_BLOCK);
-                    $this->currentVarBlockLine = $this->lineno;
-                }
-                break;
-
-            case $this->options['tag_variable'][0]:
-                $this->pushToken(Twig_Token::VAR_START_TYPE);
-                $this->pushState(self::STATE_VAR);
-                $this->currentVarBlockLine = $this->lineno;
-                break;
-        }
-    }
-
-    protected function lexBlock()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::BLOCK_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexVar()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::VAR_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexExpression()
-    {
-        // whitespace
-        if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
-            $this->moveCursor($match[0]);
-
-            if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', self::STATE_BLOCK === $this->state ? 'block' : 'variable'), $this->currentVarBlockLine, $this->source);
-            }
-        }
-
-        // operators
-        if (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::OPERATOR_TYPE, preg_replace('/\s+/', ' ', $match[0]));
-            $this->moveCursor($match[0]);
-        }
-        // names
-        elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::NAME_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // numbers
-        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
-            $number = (float) $match[0];  // floats
-            if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
-                $number = (int) $match[0]; // integers lower than the maximum
-            }
-            $this->pushToken(Twig_Token::NUMBER_TYPE, $number);
-            $this->moveCursor($match[0]);
-        }
-        // punctuation
-        elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
-            // opening bracket
-            if (false !== strpos('([{', $this->code[$this->cursor])) {
-                $this->brackets[] = array($this->code[$this->cursor], $this->lineno);
-            }
-            // closing bracket
-            elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
-                if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
-                }
-
-                list($expect, $lineno) = array_pop($this->brackets);
-                if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
-                }
-            }
-
-            $this->pushToken(Twig_Token::PUNCTUATION_TYPE, $this->code[$this->cursor]);
-            ++$this->cursor;
-        }
-        // strings
-        elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)));
-            $this->moveCursor($match[0]);
-        }
-        // opening double quoted string
-        elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array('"', $this->lineno);
-            $this->pushState(self::STATE_STRING);
-            $this->moveCursor($match[0]);
-        }
-        // unlexable
-        else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
-        }
-    }
-
-    protected function lexRawData($tag)
-    {
-        if ('raw' === $tag) {
-            @trigger_error(sprintf('Twig Tag "raw" is deprecated since version 1.21. Use "verbatim" instead in %s at line %d.', $this->filename, $this->lineno), E_USER_DEPRECATED);
-        }
-
-        if (!preg_match(str_replace('%s', $tag, $this->regexes['lex_raw_data']), $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s" block.', $tag), $this->lineno, $this->source);
-        }
-
-        $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
-        $this->moveCursor($text.$match[0][0]);
-
-        if (false !== strpos($match[1][0], $this->options['whitespace_trim'])) {
-            $text = rtrim($text);
-        }
-
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-    }
-
-    protected function lexComment()
-    {
-        if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment.', $this->lineno, $this->source);
-        }
-
-        $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
-    }
-
-    protected function lexString()
-    {
-        if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array($this->options['interpolation'][0], $this->lineno);
-            $this->pushToken(Twig_Token::INTERPOLATION_START_TYPE);
-            $this->moveCursor($match[0]);
-            $this->pushState(self::STATE_INTERPOLATION);
-        } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor) && strlen($match[0]) > 0) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[0]));
-            $this->moveCursor($match[0]);
-        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            if ('"' != $this->code[$this->cursor]) {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s".', $expect), $lineno, $this->source);
-            }
-
-            $this->popState();
-            ++$this->cursor;
-        } else {
-            // unlexable
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s".', $this->code[$this->cursor]), $this->lineno, $this->source);
-        }
-    }
-
-    protected function lexInterpolation()
-    {
-        $bracket = end($this->brackets);
-        if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, null, $this->cursor)) {
-            array_pop($this->brackets);
-            $this->pushToken(Twig_Token::INTERPOLATION_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function pushToken($type, $value = '')
-    {
-        // do not push empty text tokens
-        if (Twig_Token::TEXT_TYPE === $type && '' === $value) {
-            return;
-        }
-
-        $this->tokens[] = new Twig_Token($type, $value, $this->lineno);
-    }
-
-    protected function moveCursor($text)
-    {
-        $this->cursor += strlen($text);
-        $this->lineno += substr_count($text, "\n");
-    }
-
-    protected function getOperatorRegex()
-    {
-        $operators = array_merge(
-            array('='),
-            array_keys($this->env->getUnaryOperators()),
-            array_keys($this->env->getBinaryOperators())
-        );
-
-        $operators = array_combine($operators, array_map('strlen', $operators));
-        arsort($operators);
-
-        $regex = array();
-        foreach ($operators as $operator => $length) {
-            // an operator that ends with a character must be followed by
-            // a whitespace or a parenthesis
-            if (ctype_alpha($operator[$length - 1])) {
-                $r = preg_quote($operator, '/').'(?=[\s()])';
-            } else {
-                $r = preg_quote($operator, '/');
-            }
-
-            // an operator with a space can be any amount of whitespaces
-            $r = preg_replace('/\s+/', '\s+', $r);
-
-            $regex[] = $r;
-        }
-
-        return '/'.implode('|', $regex).'/A';
-    }
-
-    protected function pushState($state)
-    {
-        $this->states[] = $this->state;
-        $this->state = $state;
-    }
-
-    protected function popState()
-    {
-        if (0 === count($this->states)) {
-            throw new Exception('Cannot pop state without a previous state.');
-        }
-
-        $this->state = array_pop($this->states);
-    }
-}
-
-class_alias('Twig_Lexer', 'Twig\Lexer', false);
diff --git a/inc/lib/Twig/LexerInterface.php b/inc/lib/Twig/LexerInterface.php
deleted file mode 100644
index c10bbfec..00000000
--- a/inc/lib/Twig/LexerInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by lexer classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_LexerInterface
-{
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string|Twig_Source $code The source code
-     * @param string             $name A unique identifier for the source code
-     *
-     * @return Twig_TokenStream
-     *
-     * @throws Twig_Error_Syntax When the code is syntactically wrong
-     */
-    public function tokenize($code, $name = null);
-}
diff --git a/inc/lib/Twig/Loader/Array.php b/inc/lib/Twig/Loader/Array.php
deleted file mode 100644
index 0aac7690..00000000
--- a/inc/lib/Twig/Loader/Array.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads a template from an array.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * This loader should only be used for unit testing.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
-{
-    protected $templates = array();
-
-    /**
-     * @param array $templates An array of templates (keys are the names, and values are the source code)
-     */
-    public function __construct(array $templates = array())
-    {
-        $this->templates = $templates;
-    }
-
-    /**
-     * Adds or overrides a template.
-     *
-     * @param string $name     The template name
-     * @param string $template The template source
-     */
-    public function setTemplate($name, $template)
-    {
-        $this->templates[(string) $name] = $template;
-    }
-
-    public function getSource($name)
-    {
-        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    public function getSourceContext($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return new Twig_Source($this->templates[$name], $name);
-    }
-
-    public function exists($name)
-    {
-        return isset($this->templates[(string) $name]);
-    }
-
-    public function getCacheKey($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $name.':'.$this->templates[$name];
-    }
-
-    public function isFresh($name, $time)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return true;
-    }
-}
-
-class_alias('Twig_Loader_Array', 'Twig\Loader\ArrayLoader', false);
diff --git a/inc/lib/Twig/Loader/Chain.php b/inc/lib/Twig/Loader/Chain.php
deleted file mode 100644
index 59a33796..00000000
--- a/inc/lib/Twig/Loader/Chain.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads templates from other loaders.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
-{
-    private $hasSourceCache = array();
-    protected $loaders = array();
-
-    /**
-     * @param Twig_LoaderInterface[] $loaders
-     */
-    public function __construct(array $loaders = array())
-    {
-        foreach ($loaders as $loader) {
-            $this->addLoader($loader);
-        }
-    }
-
-    public function addLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loaders[] = $loader;
-        $this->hasSourceCache = array();
-    }
-
-    public function getSource($name)
-    {
-        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->getSource($name);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = $e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-
-    public function getSourceContext($name)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                if ($loader instanceof Twig_SourceContextLoaderInterface) {
-                    return $loader->getSourceContext($name);
-                }
-
-                return new Twig_Source($loader->getSource($name), $name);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = $e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-
-    public function exists($name)
-    {
-        $name = (string) $name;
-
-        if (isset($this->hasSourceCache[$name])) {
-            return $this->hasSourceCache[$name];
-        }
-
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface) {
-                if ($loader->exists($name)) {
-                    return $this->hasSourceCache[$name] = true;
-                }
-
-                continue;
-            }
-
-            try {
-                if ($loader instanceof Twig_SourceContextLoaderInterface) {
-                    $loader->getSourceContext($name);
-                } else {
-                    $loader->getSource($name);
-                }
-
-                return $this->hasSourceCache[$name] = true;
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        return $this->hasSourceCache[$name] = false;
-    }
-
-    public function getCacheKey($name)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->getCacheKey($name);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = get_class($loader).': '.$e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-
-    public function isFresh($name, $time)
-    {
-        $exceptions = array();
-        foreach ($this->loaders as $loader) {
-            if ($loader instanceof Twig_ExistsLoaderInterface && !$loader->exists($name)) {
-                continue;
-            }
-
-            try {
-                return $loader->isFresh($name, $time);
-            } catch (Twig_Error_Loader $e) {
-                $exceptions[] = get_class($loader).': '.$e->getMessage();
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
-    }
-}
-
-class_alias('Twig_Loader_Chain', 'Twig\Loader\ChainLoader', false);
diff --git a/inc/lib/Twig/Loader/Filesystem.php b/inc/lib/Twig/Loader/Filesystem.php
deleted file mode 100644
index 4e8be0d5..00000000
--- a/inc/lib/Twig/Loader/Filesystem.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loads template from the filesystem.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
-{
-    /** Identifier of the main namespace. */
-    const MAIN_NAMESPACE = '__main__';
-
-    protected $paths = array();
-    protected $cache = array();
-    protected $errorCache = array();
-
-    private $rootPath;
-
-    /**
-     * @param string|array $paths    A path or an array of paths where to look for templates
-     * @param string|null  $rootPath The root path common to all relative paths (null for getcwd())
-     */
-    public function __construct($paths = array(), $rootPath = null)
-    {
-        $this->rootPath = (null === $rootPath ? getcwd() : $rootPath).DIRECTORY_SEPARATOR;
-        if (false !== $realPath = realpath($rootPath)) {
-            $this->rootPath = $realPath.DIRECTORY_SEPARATOR;
-        }
-
-        if ($paths) {
-            $this->setPaths($paths);
-        }
-    }
-
-    /**
-     * Returns the paths to the templates.
-     *
-     * @param string $namespace A path namespace
-     *
-     * @return array The array of paths where to look for templates
-     */
-    public function getPaths($namespace = self::MAIN_NAMESPACE)
-    {
-        return isset($this->paths[$namespace]) ? $this->paths[$namespace] : array();
-    }
-
-    /**
-     * Returns the path namespaces.
-     *
-     * The main namespace is always defined.
-     *
-     * @return array The array of defined namespaces
-     */
-    public function getNamespaces()
-    {
-        return array_keys($this->paths);
-    }
-
-    /**
-     * Sets the paths where templates are stored.
-     *
-     * @param string|array $paths     A path or an array of paths where to look for templates
-     * @param string       $namespace A path namespace
-     */
-    public function setPaths($paths, $namespace = self::MAIN_NAMESPACE)
-    {
-        if (!is_array($paths)) {
-            $paths = array($paths);
-        }
-
-        $this->paths[$namespace] = array();
-        foreach ($paths as $path) {
-            $this->addPath($path, $namespace);
-        }
-    }
-
-    /**
-     * Adds a path where templates are stored.
-     *
-     * @param string $path      A path where to look for templates
-     * @param string $namespace A path namespace
-     *
-     * @throws Twig_Error_Loader
-     */
-    public function addPath($path, $namespace = self::MAIN_NAMESPACE)
-    {
-        // invalidate the cache
-        $this->cache = $this->errorCache = array();
-
-        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
-        if (!is_dir($checkPath)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
-        }
-
-        $this->paths[$namespace][] = rtrim($path, '/\\');
-    }
-
-    /**
-     * Prepends a path where templates are stored.
-     *
-     * @param string $path      A path where to look for templates
-     * @param string $namespace A path namespace
-     *
-     * @throws Twig_Error_Loader
-     */
-    public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
-    {
-        // invalidate the cache
-        $this->cache = $this->errorCache = array();
-
-        $checkPath = $this->isAbsolutePath($path) ? $path : $this->rootPath.$path;
-        if (!is_dir($checkPath)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist ("%s").', $path, $checkPath));
-        }
-
-        $path = rtrim($path, '/\\');
-
-        if (!isset($this->paths[$namespace])) {
-            $this->paths[$namespace][] = $path;
-        } else {
-            array_unshift($this->paths[$namespace], $path);
-        }
-    }
-
-    public function getSource($name)
-    {
-        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
-        return file_get_contents($this->findTemplate($name));
-    }
-
-    public function getSourceContext($name)
-    {
-        $path = $this->findTemplate($name);
-
-        return new Twig_Source(file_get_contents($path), $name, $path);
-    }
-
-    public function getCacheKey($name)
-    {
-        $path = $this->findTemplate($name);
-        $len = strlen($this->rootPath);
-        if (0 === strncmp($this->rootPath, $path, $len)) {
-            return substr($path, $len);
-        }
-
-        return $path;
-    }
-
-    public function exists($name)
-    {
-        $name = $this->normalizeName($name);
-
-        if (isset($this->cache[$name])) {
-            return true;
-        }
-
-        try {
-            return false !== $this->findTemplate($name, false);
-        } catch (Twig_Error_Loader $exception) {
-            @trigger_error(sprintf('In %s::findTemplate(), you must accept a second argument that when set to "false" returns "false" instead of throwing an exception. Not supporting this argument is deprecated since version 1.27.', get_class($this)), E_USER_DEPRECATED);
-
-            return false;
-        }
-    }
-
-    public function isFresh($name, $time)
-    {
-        return filemtime($this->findTemplate($name)) < $time;
-    }
-
-    protected function findTemplate($name)
-    {
-        $throw = func_num_args() > 1 ? func_get_arg(1) : true;
-        $name = $this->normalizeName($name);
-
-        if (isset($this->cache[$name])) {
-            return $this->cache[$name];
-        }
-
-        if (isset($this->errorCache[$name])) {
-            if (!$throw) {
-                return false;
-            }
-
-            throw new Twig_Error_Loader($this->errorCache[$name]);
-        }
-
-        $this->validateName($name);
-
-        list($namespace, $shortname) = $this->parseName($name);
-
-        if (!isset($this->paths[$namespace])) {
-            $this->errorCache[$name] = sprintf('There are no registered paths for namespace "%s".', $namespace);
-
-            if (!$throw) {
-                return false;
-            }
-
-            throw new Twig_Error_Loader($this->errorCache[$name]);
-        }
-
-        foreach ($this->paths[$namespace] as $path) {
-            if (!$this->isAbsolutePath($path)) {
-                $path = $this->rootPath.'/'.$path;
-            }
-
-            if (is_file($path.'/'.$shortname)) {
-                if (false !== $realpath = realpath($path.'/'.$shortname)) {
-                    return $this->cache[$name] = $realpath;
-                }
-
-                return $this->cache[$name] = $path.'/'.$shortname;
-            }
-        }
-
-        $this->errorCache[$name] = sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace]));
-
-        if (!$throw) {
-            return false;
-        }
-
-        throw new Twig_Error_Loader($this->errorCache[$name]);
-    }
-
-    protected function parseName($name, $default = self::MAIN_NAMESPACE)
-    {
-        if (isset($name[0]) && '@' == $name[0]) {
-            if (false === $pos = strpos($name, '/')) {
-                throw new Twig_Error_Loader(sprintf('Malformed namespaced template name "%s" (expecting "@namespace/template_name").', $name));
-            }
-
-            $namespace = substr($name, 1, $pos - 1);
-            $shortname = substr($name, $pos + 1);
-
-            return array($namespace, $shortname);
-        }
-
-        return array($default, $name);
-    }
-
-    protected function normalizeName($name)
-    {
-        return preg_replace('#/{2,}#', '/', str_replace('\\', '/', (string) $name));
-    }
-
-    protected function validateName($name)
-    {
-        if (false !== strpos($name, "\0")) {
-            throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
-        }
-
-        $name = ltrim($name, '/');
-        $parts = explode('/', $name);
-        $level = 0;
-        foreach ($parts as $part) {
-            if ('..' === $part) {
-                --$level;
-            } elseif ('.' !== $part) {
-                ++$level;
-            }
-
-            if ($level < 0) {
-                throw new Twig_Error_Loader(sprintf('Looks like you try to load a template outside configured directories (%s).', $name));
-            }
-        }
-    }
-
-    private function isAbsolutePath($file)
-    {
-        return strspn($file, '/\\', 0, 1)
-            || (strlen($file) > 3 && ctype_alpha($file[0])
-                && ':' === substr($file, 1, 1)
-                && strspn($file, '/\\', 2, 1)
-            )
-            || null !== parse_url($file, PHP_URL_SCHEME)
-        ;
-    }
-}
-
-class_alias('Twig_Loader_Filesystem', 'Twig\Loader\FilesystemLoader', false);
diff --git a/inc/lib/Twig/Loader/String.php b/inc/lib/Twig/Loader/String.php
deleted file mode 100644
index 950bd35b..00000000
--- a/inc/lib/Twig/Loader/String.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Loader_String class is deprecated since version 1.18.1 and will be removed in 2.0. Use Twig_Loader_Array instead or Twig_Environment::createTemplate().', E_USER_DEPRECATED);
-
-/**
- * Loads a template from a string.
- *
- * This loader should NEVER be used. It only exists for Twig internal purposes.
- *
- * When using this loader with a cache mechanism, you should know that a new cache
- * key is generated each time a template content "changes" (the cache key being the
- * source code of the template). If you don't want to see your cache grows out of
- * control, you need to take care of clearing the old cache file by yourself.
- *
- * @deprecated since 1.18.1 (to be removed in 2.0)
- *
- * @internal
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface, Twig_SourceContextLoaderInterface
-{
-    public function getSource($name)
-    {
-        @trigger_error(sprintf('Calling "getSource" on "%s" is deprecated since 1.27. Use getSourceContext() instead.', get_class($this)), E_USER_DEPRECATED);
-
-        return $name;
-    }
-
-    public function getSourceContext($name)
-    {
-        return new Twig_Source($name, $name);
-    }
-
-    public function exists($name)
-    {
-        return true;
-    }
-
-    public function getCacheKey($name)
-    {
-        return $name;
-    }
-
-    public function isFresh($name, $time)
-    {
-        return true;
-    }
-}
diff --git a/inc/lib/Twig/LoaderInterface.php b/inc/lib/Twig/LoaderInterface.php
deleted file mode 100644
index 459a70ab..00000000
--- a/inc/lib/Twig/LoaderInterface.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface all loaders must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param string $name The name of the template to load
-     *
-     * @return string The template source code
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     *
-     * @deprecated since 1.27 (to be removed in 2.0), implement Twig_SourceContextLoaderInterface
-     */
-    public function getSource($name);
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param string $name The name of the template to load
-     *
-     * @return string The cache key
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function getCacheKey($name);
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string $name The template name
-     * @param int    $time Timestamp of the last modification time of the
-     *                     cached template
-     *
-     * @return bool true if the template is fresh, false otherwise
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function isFresh($name, $time);
-}
-
-class_alias('Twig_LoaderInterface', 'Twig\Loader\LoaderInterface', false);
diff --git a/inc/lib/Twig/Markup.php b/inc/lib/Twig/Markup.php
deleted file mode 100644
index 8591d1f9..00000000
--- a/inc/lib/Twig/Markup.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a content as safe.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Markup implements Countable
-{
-    protected $content;
-    protected $charset;
-
-    public function __construct($content, $charset)
-    {
-        $this->content = (string) $content;
-        $this->charset = $charset;
-    }
-
-    public function __toString()
-    {
-        return $this->content;
-    }
-
-    public function count()
-    {
-        return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
-    }
-}
-
-class_alias('Twig_Markup', 'Twig\Markup', false);
diff --git a/inc/lib/Twig/Node.php b/inc/lib/Twig/Node.php
deleted file mode 100644
index 89ada144..00000000
--- a/inc/lib/Twig/Node.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node implements Twig_NodeInterface
-{
-    protected $nodes;
-    protected $attributes;
-    protected $lineno;
-    protected $tag;
-
-    private $name;
-
-    /**
-     * Constructor.
-     *
-     * The nodes are automatically made available as properties ($this->node).
-     * The attributes are automatically made available as array items ($this['name']).
-     *
-     * @param array  $nodes      An array of named nodes
-     * @param array  $attributes An array of attributes (should not be nodes)
-     * @param int    $lineno     The line number
-     * @param string $tag        The tag name associated with the Node
-     */
-    public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
-    {
-        foreach ($nodes as $name => $node) {
-            if (!$node instanceof Twig_NodeInterface) {
-                @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
-            }
-        }
-        $this->nodes = $nodes;
-        $this->attributes = $attributes;
-        $this->lineno = $lineno;
-        $this->tag = $tag;
-    }
-
-    public function __toString()
-    {
-        $attributes = array();
-        foreach ($this->attributes as $name => $value) {
-            $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
-        }
-
-        $repr = array(get_class($this).'('.implode(', ', $attributes));
-
-        if (count($this->nodes)) {
-            foreach ($this->nodes as $name => $node) {
-                $len = strlen($name) + 4;
-                $noderepr = array();
-                foreach (explode("\n", (string) $node) as $line) {
-                    $noderepr[] = str_repeat(' ', $len).$line;
-                }
-
-                $repr[] = sprintf('  %s: %s', $name, ltrim(implode("\n", $noderepr)));
-            }
-
-            $repr[] = ')';
-        } else {
-            $repr[0] .= ')';
-        }
-
-        return implode("\n", $repr);
-    }
-
-    /**
-     * @deprecated since 1.16.1 (to be removed in 2.0)
-     */
-    public function toXml($asDom = false)
-    {
-        @trigger_error(sprintf('%s is deprecated since version 1.16.1 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-        $dom = new DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($xml = $dom->createElement('twig'));
-
-        $xml->appendChild($node = $dom->createElement('node'));
-        $node->setAttribute('class', get_class($this));
-
-        foreach ($this->attributes as $name => $value) {
-            $node->appendChild($attribute = $dom->createElement('attribute'));
-            $attribute->setAttribute('name', $name);
-            $attribute->appendChild($dom->createTextNode($value));
-        }
-
-        foreach ($this->nodes as $name => $n) {
-            if (null === $n) {
-                continue;
-            }
-
-            $child = $n->toXml(true)->getElementsByTagName('node')->item(0);
-            $child = $dom->importNode($child, true);
-            $child->setAttribute('name', $name);
-
-            $node->appendChild($child);
-        }
-
-        return $asDom ? $dom : $dom->saveXML();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        foreach ($this->nodes as $node) {
-            $node->compile($compiler);
-        }
-    }
-
-    public function getTemplateLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getLine()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateLine() instead.', E_USER_DEPRECATED);
-
-        return $this->lineno;
-    }
-
-    public function getNodeTag()
-    {
-        return $this->tag;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getAttribute($name)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            throw new LogicException(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * @param string $name
-     * @param mixed  $value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasNode($name)
-    {
-        return array_key_exists($name, $this->nodes);
-    }
-
-    /**
-     * @return Twig_Node
-     */
-    public function getNode($name)
-    {
-        if (!array_key_exists($name, $this->nodes)) {
-            throw new LogicException(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->nodes[$name];
-    }
-
-    public function setNode($name, $node = null)
-    {
-        if (!$node instanceof Twig_NodeInterface) {
-            @trigger_error(sprintf('Using "%s" for the value of node "%s" of "%s" is deprecated since version 1.25 and will be removed in 2.0.', is_object($node) ? get_class($node) : null === $node ? 'null' : gettype($node), $name, get_class($this)), E_USER_DEPRECATED);
-        }
-
-        $this->nodes[$name] = $node;
-    }
-
-    public function removeNode($name)
-    {
-        unset($this->nodes[$name]);
-    }
-
-    public function count()
-    {
-        return count($this->nodes);
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->nodes);
-    }
-
-    public function setTemplateName($name)
-    {
-        $this->name = $name;
-        foreach ($this->nodes as $node) {
-            if (null !== $node) {
-                $node->setTemplateName($name);
-            }
-        }
-    }
-
-    public function getTemplateName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function setFilename($name)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use setTemplateName() instead.', E_USER_DEPRECATED);
-
-        $this->setTemplateName($name);
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getFilename()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getTemplateName() instead.', E_USER_DEPRECATED);
-
-        return $this->name;
-    }
-}
-
-class_alias('Twig_Node', 'Twig\Node\Node', false);
-class_exists('Twig_Compiler');
diff --git a/inc/lib/Twig/Node/AutoEscape.php b/inc/lib/Twig/Node/AutoEscape.php
deleted file mode 100644
index 17e4e381..00000000
--- a/inc/lib/Twig/Node/AutoEscape.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an autoescape node.
- *
- * The value is the escaping strategy (can be html, js, ...)
- *
- * The true value is equivalent to html.
- *
- * If autoescaping is disabled, then the value is false.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_AutoEscape extends Twig_Node
-{
-    public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
-    {
-        parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('body'));
-    }
-}
-
-class_alias('Twig_Node_AutoEscape', 'Twig\Node\AutoEscapeNode', false);
diff --git a/inc/lib/Twig/Node/Block.php b/inc/lib/Twig/Node/Block.php
deleted file mode 100644
index 91752ad2..00000000
--- a/inc/lib/Twig/Node/Block.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Block extends Twig_Node
-{
-    public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("public function block_%s(\$context, array \$blocks = array())\n", $this->getAttribute('name')), "{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Block', 'Twig\Node\BlockNode', false);
diff --git a/inc/lib/Twig/Node/BlockReference.php b/inc/lib/Twig/Node/BlockReference.php
deleted file mode 100644
index 92a9f398..00000000
--- a/inc/lib/Twig/Node/BlockReference.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("\$this->displayBlock('%s', \$context, \$blocks);\n", $this->getAttribute('name')))
-        ;
-    }
-}
-
-class_alias('Twig_Node_BlockReference', 'Twig\Node\BlockReferenceNode', false);
diff --git a/inc/lib/Twig/Node/Body.php b/inc/lib/Twig/Node/Body.php
deleted file mode 100644
index 07dfef8b..00000000
--- a/inc/lib/Twig/Node/Body.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a body node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Body extends Twig_Node
-{
-}
-
-class_alias('Twig_Node_Body', 'Twig\Node\BodyNode', false);
diff --git a/inc/lib/Twig/Node/CheckSecurity.php b/inc/lib/Twig/Node/CheckSecurity.php
deleted file mode 100644
index 7258acb6..00000000
--- a/inc/lib/Twig/Node/CheckSecurity.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_CheckSecurity extends Twig_Node
-{
-    protected $usedFilters;
-    protected $usedTags;
-    protected $usedFunctions;
-
-    public function __construct(array $usedFilters, array $usedTags, array $usedFunctions)
-    {
-        $this->usedFilters = $usedFilters;
-        $this->usedTags = $usedTags;
-        $this->usedFunctions = $usedFunctions;
-
-        parent::__construct();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $tags = $filters = $functions = array();
-        foreach (array('tags', 'filters', 'functions') as $type) {
-            foreach ($this->{'used'.ucfirst($type)} as $name => $node) {
-                if ($node instanceof Twig_Node) {
-                    ${$type}[$name] = $node->getTemplateLine();
-                } else {
-                    ${$type}[$node] = null;
-                }
-            }
-        }
-
-        $compiler
-            ->write('$tags = ')->repr(array_filter($tags))->raw(";\n")
-            ->write('$filters = ')->repr(array_filter($filters))->raw(";\n")
-            ->write('$functions = ')->repr(array_filter($functions))->raw(";\n\n")
-            ->write("try {\n")
-            ->indent()
-            ->write("\$this->env->getExtension('Twig_Extension_Sandbox')->checkSecurity(\n")
-            ->indent()
-            ->write(!$tags ? "array(),\n" : "array('".implode("', '", array_keys($tags))."'),\n")
-            ->write(!$filters ? "array(),\n" : "array('".implode("', '", array_keys($filters))."'),\n")
-            ->write(!$functions ? "array()\n" : "array('".implode("', '", array_keys($functions))."')\n")
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->write("} catch (Twig_Sandbox_SecurityError \$e) {\n")
-            ->indent()
-            ->write("\$e->setSourceContext(\$this->getSourceContext());\n\n")
-            ->write("if (\$e instanceof Twig_Sandbox_SecurityNotAllowedTagError && isset(\$tags[\$e->getTagName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$tags[\$e->getTagName()]);\n")
-            ->outdent()
-            ->write("} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFilterError && isset(\$filters[\$e->getFilterName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$filters[\$e->getFilterName()]);\n")
-            ->outdent()
-            ->write("} elseif (\$e instanceof Twig_Sandbox_SecurityNotAllowedFunctionError && isset(\$functions[\$e->getFunctionName()])) {\n")
-            ->indent()
-            ->write("\$e->setTemplateLine(\$functions[\$e->getFunctionName()]);\n")
-            ->outdent()
-            ->write("}\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_CheckSecurity', 'Twig\Node\CheckSecurityNode', false);
diff --git a/inc/lib/Twig/Node/Do.php b/inc/lib/Twig/Node/Do.php
deleted file mode 100644
index cdd7e77a..00000000
--- a/inc/lib/Twig/Node/Do.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a do node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Do extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Do', 'Twig\Node\DoNode', false);
diff --git a/inc/lib/Twig/Node/Embed.php b/inc/lib/Twig/Node/Embed.php
deleted file mode 100644
index 3785d3a9..00000000
--- a/inc/lib/Twig/Node/Embed.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an embed node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Embed extends Twig_Node_Include
-{
-    // we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
-    public function __construct($name, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
-
-        $this->setAttribute('name', $name);
-        // to be removed in 2.0, used name instead
-        $this->setAttribute('filename', $name);
-        $this->setAttribute('index', $index);
-    }
-
-    protected function addGetTemplate(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write('$this->loadTemplate(')
-            ->string($this->getAttribute('name'))
-            ->raw(', ')
-            ->repr($this->getTemplateName())
-            ->raw(', ')
-            ->repr($this->getTemplateLine())
-            ->raw(', ')
-            ->string($this->getAttribute('index'))
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Embed', 'Twig\Node\EmbedNode', false);
diff --git a/inc/lib/Twig/Node/Expression.php b/inc/lib/Twig/Node/Expression.php
deleted file mode 100644
index a99c4e63..00000000
--- a/inc/lib/Twig/Node/Expression.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Abstract class for all nodes that represents an expression.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Node_Expression extends Twig_Node
-{
-}
-
-class_alias('Twig_Node_Expression', 'Twig\Node\Expression\AbstractExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Array.php b/inc/lib/Twig/Node/Expression/Array.php
deleted file mode 100644
index 0e77bb08..00000000
--- a/inc/lib/Twig/Node/Expression/Array.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Array extends Twig_Node_Expression
-{
-    protected $index;
-
-    public function __construct(array $elements, $lineno)
-    {
-        parent::__construct($elements, array(), $lineno);
-
-        $this->index = -1;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if ($pair['key'] instanceof Twig_Node_Expression_Constant && ctype_digit((string) $pair['key']->getAttribute('value')) && $pair['key']->getAttribute('value') > $this->index) {
-                $this->index = $pair['key']->getAttribute('value');
-            }
-        }
-    }
-
-    public function getKeyValuePairs()
-    {
-        $pairs = array();
-
-        foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = array(
-                'key' => $pair[0],
-                'value' => $pair[1],
-            );
-        }
-
-        return $pairs;
-    }
-
-    public function hasElement(Twig_Node_Expression $key)
-    {
-        foreach ($this->getKeyValuePairs() as $pair) {
-            // we compare the string representation of the keys
-            // to avoid comparing the line numbers which are not relevant here.
-            if ((string) $key === (string) $pair['key']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $key = null)
-    {
-        if (null === $key) {
-            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getTemplateLine());
-        }
-
-        array_push($this->nodes, $key, $value);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('array(');
-        $first = true;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler
-                ->subcompile($pair['key'])
-                ->raw(' => ')
-                ->subcompile($pair['value'])
-            ;
-        }
-        $compiler->raw(')');
-    }
-}
-
-class_alias('Twig_Node_Expression_Array', 'Twig\Node\Expression\ArrayExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/AssignName.php b/inc/lib/Twig/Node/Expression/AssignName.php
deleted file mode 100644
index 2e6b4c7c..00000000
--- a/inc/lib/Twig/Node/Expression/AssignName.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('$context[')
-            ->string($this->getAttribute('name'))
-            ->raw(']')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_AssignName', 'Twig\Node\Expression\AssignNameExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary.php b/inc/lib/Twig/Node/Expression/Binary.php
deleted file mode 100644
index 2b545d98..00000000
--- a/inc/lib/Twig/Node/Expression/Binary.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
-    {
-        parent::__construct(array('left' => $left, 'right' => $right), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('left'))
-            ->raw(' ')
-        ;
-        $this->operator($compiler);
-        $compiler
-            ->raw(' ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
-
-class_alias('Twig_Node_Expression_Binary', 'Twig\Node\Expression\Binary\AbstractBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Add.php b/inc/lib/Twig/Node/Expression/Binary/Add.php
deleted file mode 100644
index 5a09d836..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Add.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('+');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Add', 'Twig\Node\Expression\Binary\AddBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/And.php b/inc/lib/Twig/Node/Expression/Binary/And.php
deleted file mode 100644
index 9ffddce6..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/And.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&&');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_And', 'Twig\Node\Expression\Binary\AndBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
deleted file mode 100644
index e46e9ebf..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('&');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_BitwiseAnd', 'Twig\Node\Expression\Binary\BitwiseAndBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php
deleted file mode 100644
index 5d7f1b7c..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('|');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_BitwiseOr', 'Twig\Node\Expression\Binary\BitwiseOrBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php
deleted file mode 100644
index 82edf516..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('^');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_BitwiseXor', 'Twig\Node\Expression\Binary\BitwiseXorBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Concat.php b/inc/lib/Twig/Node/Expression/Binary/Concat.php
deleted file mode 100644
index 91abca60..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Concat.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('.');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Concat', 'Twig\Node\Expression\Binary\ConcatBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Div.php b/inc/lib/Twig/Node/Expression/Binary/Div.php
deleted file mode 100644
index 38ffa30c..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Div.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Div extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Div', 'Twig\Node\Expression\Binary\DivBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/EndsWith.php b/inc/lib/Twig/Node/Expression/Binary/EndsWith.php
deleted file mode 100644
index 85c52937..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/EndsWith.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_EndsWith extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $left = $compiler->getVarName();
-        $right = $compiler->getVarName();
-        $compiler
-            ->raw(sprintf('(is_string($%s = ', $left))
-            ->subcompile($this->getNode('left'))
-            ->raw(sprintf(') && is_string($%s = ', $right))
-            ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || $%2$s === substr($%1$s, -strlen($%2$s))))', $left, $right))
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_EndsWith', 'Twig\Node\Expression\Binary\EndsWithBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Equal.php b/inc/lib/Twig/Node/Expression/Binary/Equal.php
deleted file mode 100644
index a6a6946b..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Equal.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Equal extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('==');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Equal', 'Twig\Node\Expression\Binary\EqualBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php b/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php
deleted file mode 100644
index 7393bcb8..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('(int) floor(');
-        parent::compile($compiler);
-        $compiler->raw(')');
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_FloorDiv', 'Twig\Node\Expression\Binary\FloorDivBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Greater.php b/inc/lib/Twig/Node/Expression/Binary/Greater.php
deleted file mode 100644
index 832f9797..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Greater.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Greater extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Greater', 'Twig\Node\Expression\Binary\GreaterBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php
deleted file mode 100644
index c5f76245..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_GreaterEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('>=');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_GreaterEqual', 'Twig\Node\Expression\Binary\GreaterEqualBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/In.php b/inc/lib/Twig/Node/Expression/Binary/In.php
deleted file mode 100644
index af112448..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/In.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('in');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_In', 'Twig\Node\Expression\Binary\InBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Less.php b/inc/lib/Twig/Node/Expression/Binary/Less.php
deleted file mode 100644
index ab8fc1f9..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Less.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Less extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Less', 'Twig\Node\Expression\Binary\LessBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/LessEqual.php b/inc/lib/Twig/Node/Expression/Binary/LessEqual.php
deleted file mode 100644
index 71a279e9..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_LessEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('<=');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_LessEqual', 'Twig\Node\Expression\Binary\LessEqualBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Matches.php b/inc/lib/Twig/Node/Expression/Binary/Matches.php
deleted file mode 100644
index 5cb85584..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Matches.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Matches extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('preg_match(')
-            ->subcompile($this->getNode('right'))
-            ->raw(', ')
-            ->subcompile($this->getNode('left'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Matches', 'Twig\Node\Expression\Binary\MatchesBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Mod.php b/inc/lib/Twig/Node/Expression/Binary/Mod.php
deleted file mode 100644
index 28109633..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Mod.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mod extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('%');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Mod', 'Twig\Node\Expression\Binary\ModBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Mul.php b/inc/lib/Twig/Node/Expression/Binary/Mul.php
deleted file mode 100644
index 790c6a22..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Mul.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Mul extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('*');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Mul', 'Twig\Node\Expression\Binary\MulBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/NotEqual.php b/inc/lib/Twig/Node/Expression/Binary/NotEqual.php
deleted file mode 100644
index bb45c9ed..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotEqual extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('!=');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_NotEqual', 'Twig\Node\Expression\Binary\NotEqualBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/NotIn.php b/inc/lib/Twig/Node/Expression/Binary/NotIn.php
deleted file mode 100644
index 9dedf92f..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/NotIn.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('!twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('not in');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_NotIn', 'Twig\Node\Expression\Binary\NotInBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Or.php b/inc/lib/Twig/Node/Expression/Binary/Or.php
deleted file mode 100644
index dc9eece1..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Or.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Or extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('||');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Or', 'Twig\Node\Expression\Binary\OrBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Power.php b/inc/lib/Twig/Node/Expression/Binary/Power.php
deleted file mode 100644
index d24777bd..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Power.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        if (PHP_VERSION_ID >= 50600) {
-            return parent::compile($compiler);
-        }
-
-        $compiler
-            ->raw('pow(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('**');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Power', 'Twig\Node\Expression\Binary\PowerBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Range.php b/inc/lib/Twig/Node/Expression/Binary/Range.php
deleted file mode 100644
index 187f6765..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Range.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('range(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('..');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Range', 'Twig\Node\Expression\Binary\RangeBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/StartsWith.php b/inc/lib/Twig/Node/Expression/Binary/StartsWith.php
deleted file mode 100644
index 7e43b8de..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/StartsWith.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_StartsWith extends Twig_Node_Expression_Binary
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $left = $compiler->getVarName();
-        $right = $compiler->getVarName();
-        $compiler
-            ->raw(sprintf('(is_string($%s = ', $left))
-            ->subcompile($this->getNode('left'))
-            ->raw(sprintf(') && is_string($%s = ', $right))
-            ->subcompile($this->getNode('right'))
-            ->raw(sprintf(') && (\'\' === $%2$s || 0 === strpos($%1$s, $%2$s)))', $left, $right))
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_StartsWith', 'Twig\Node\Expression\Binary\StartsWithBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/Binary/Sub.php b/inc/lib/Twig/Node/Expression/Binary/Sub.php
deleted file mode 100644
index cff8ed07..00000000
--- a/inc/lib/Twig/Node/Expression/Binary/Sub.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Binary_Sub extends Twig_Node_Expression_Binary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('-');
-    }
-}
-
-class_alias('Twig_Node_Expression_Binary_Sub', 'Twig\Node\Expression\Binary\SubBinary', false);
diff --git a/inc/lib/Twig/Node/Expression/BlockReference.php b/inc/lib/Twig/Node/Expression/BlockReference.php
deleted file mode 100644
index 37a3983d..00000000
--- a/inc/lib/Twig/Node/Expression/BlockReference.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a block call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
-{
-    /**
-     * @param Twig_Node|null $template
-     */
-    public function __construct(Twig_NodeInterface $name, $template = null, $lineno, $tag = null)
-    {
-        if (is_bool($template)) {
-            @trigger_error(sprintf('The %s method "$asString" argument is deprecated since version 1.28 and will be removed in 2.0.', __METHOD__), E_USER_DEPRECATED);
-
-            $template = null;
-        }
-
-        $nodes = array('name' => $name);
-        if (null !== $template) {
-            $nodes['template'] = $template;
-        }
-
-        parent::__construct($nodes, array('is_defined_test' => false, 'output' => false), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('is_defined_test')) {
-            $this->compileTemplateCall($compiler, 'hasBlock');
-        } else {
-            if ($this->getAttribute('output')) {
-                $compiler->addDebugInfo($this);
-
-                $this
-                    ->compileTemplateCall($compiler, 'displayBlock')
-                    ->raw(";\n");
-            } else {
-                $this->compileTemplateCall($compiler, 'renderBlock');
-            }
-        }
-    }
-
-    private function compileTemplateCall(Twig_Compiler $compiler, $method)
-    {
-        if (!$this->hasNode('template')) {
-            $compiler->write('$this');
-        } else {
-            $compiler
-                ->write('$this->loadTemplate(')
-                ->subcompile($this->getNode('template'))
-                ->raw(', ')
-                ->repr($this->getTemplateName())
-                ->raw(', ')
-                ->repr($this->getTemplateLine())
-                ->raw(')')
-            ;
-        }
-
-        $compiler->raw(sprintf('->%s', $method));
-        $this->compileBlockArguments($compiler);
-
-        return $compiler;
-    }
-
-    private function compileBlockArguments(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('name'))
-            ->raw(', $context');
-
-        if (!$this->hasNode('template')) {
-            $compiler->raw(', $blocks');
-        }
-
-        return $compiler->raw(')');
-    }
-}
-
-class_alias('Twig_Node_Expression_BlockReference', 'Twig\Node\Expression\BlockReferenceExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Call.php b/inc/lib/Twig/Node/Expression/Call.php
deleted file mode 100644
index d962b6a5..00000000
--- a/inc/lib/Twig/Node/Expression/Call.php
+++ /dev/null
@@ -1,291 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
-{
-    private $reflector;
-
-    protected function compileCallable(Twig_Compiler $compiler)
-    {
-        $closingParenthesis = false;
-        if ($this->hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
-            if (is_string($callable) && false === strpos($callable, '::')) {
-                $compiler->raw($callable);
-            } else {
-                list($r, $callable) = $this->reflectCallable($callable);
-                if ($r instanceof ReflectionMethod && is_string($callable[0])) {
-                    if ($r->isStatic()) {
-                        $compiler->raw(sprintf('%s::%s', $callable[0], $callable[1]));
-                    } else {
-                        $compiler->raw(sprintf('$this->env->getRuntime(\'%s\')->%s', $callable[0], $callable[1]));
-                    }
-                } elseif ($r instanceof ReflectionMethod && $callable[0] instanceof Twig_ExtensionInterface) {
-                    $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', get_class($callable[0]), $callable[1]));
-                } else {
-                    $type = ucfirst($this->getAttribute('type'));
-                    $compiler->raw(sprintf('call_user_func_array($this->env->get%s(\'%s\')->getCallable(), array', $type, $this->getAttribute('name')));
-                    $closingParenthesis = true;
-                }
-            }
-        } else {
-            $compiler->raw($this->getAttribute('thing')->compile());
-        }
-
-        $this->compileArguments($compiler);
-
-        if ($closingParenthesis) {
-            $compiler->raw(')');
-        }
-    }
-
-    protected function compileArguments(Twig_Compiler $compiler)
-    {
-        $compiler->raw('(');
-
-        $first = true;
-
-        if ($this->hasAttribute('needs_environment') && $this->getAttribute('needs_environment')) {
-            $compiler->raw('$this->env');
-            $first = false;
-        }
-
-        if ($this->hasAttribute('needs_context') && $this->getAttribute('needs_context')) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->raw('$context');
-            $first = false;
-        }
-
-        if ($this->hasAttribute('arguments')) {
-            foreach ($this->getAttribute('arguments') as $argument) {
-                if (!$first) {
-                    $compiler->raw(', ');
-                }
-                $compiler->string($argument);
-                $first = false;
-            }
-        }
-
-        if ($this->hasNode('node')) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->subcompile($this->getNode('node'));
-            $first = false;
-        }
-
-        if ($this->hasNode('arguments')) {
-            $callable = $this->hasAttribute('callable') ? $this->getAttribute('callable') : null;
-
-            $arguments = $this->getArguments($callable, $this->getNode('arguments'));
-
-            foreach ($arguments as $node) {
-                if (!$first) {
-                    $compiler->raw(', ');
-                }
-                $compiler->subcompile($node);
-                $first = false;
-            }
-        }
-
-        $compiler->raw(')');
-    }
-
-    protected function getArguments($callable, $arguments)
-    {
-        $callType = $this->getAttribute('type');
-        $callName = $this->getAttribute('name');
-
-        $parameters = array();
-        $named = false;
-        foreach ($arguments as $name => $node) {
-            if (!is_int($name)) {
-                $named = true;
-                $name = $this->normalizeName($name);
-            } elseif ($named) {
-                throw new Twig_Error_Syntax(sprintf('Positional arguments cannot be used after named arguments for %s "%s".', $callType, $callName));
-            }
-
-            $parameters[$name] = $node;
-        }
-
-        $isVariadic = $this->hasAttribute('is_variadic') && $this->getAttribute('is_variadic');
-        if (!$named && !$isVariadic) {
-            return $parameters;
-        }
-
-        if (!$callable) {
-            if ($named) {
-                $message = sprintf('Named arguments are not supported for %s "%s".', $callType, $callName);
-            } else {
-                $message = sprintf('Arbitrary positional arguments are not supported for %s "%s".', $callType, $callName);
-            }
-
-            throw new LogicException($message);
-        }
-
-        $callableParameters = $this->getCallableParameters($callable, $isVariadic);
-        $arguments = array();
-        $names = array();
-        $missingArguments = array();
-        $optionalArguments = array();
-        $pos = 0;
-        foreach ($callableParameters as $callableParameter) {
-            $names[] = $name = $this->normalizeName($callableParameter->name);
-
-            if (array_key_exists($name, $parameters)) {
-                if (array_key_exists($pos, $parameters)) {
-                    throw new Twig_Error_Syntax(sprintf('Argument "%s" is defined twice for %s "%s".', $name, $callType, $callName));
-                }
-
-                if (count($missingArguments)) {
-                    throw new Twig_Error_Syntax(sprintf(
-                        'Argument "%s" could not be assigned for %s "%s(%s)" because it is mapped to an internal PHP function which cannot determine default value for optional argument%s "%s".',
-                        $name, $callType, $callName, implode(', ', $names), count($missingArguments) > 1 ? 's' : '', implode('", "', $missingArguments))
-                    );
-                }
-
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $parameters[$name];
-                unset($parameters[$name]);
-                $optionalArguments = array();
-            } elseif (array_key_exists($pos, $parameters)) {
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $parameters[$pos];
-                unset($parameters[$pos]);
-                $optionalArguments = array();
-                ++$pos;
-            } elseif ($callableParameter->isDefaultValueAvailable()) {
-                $optionalArguments[] = new Twig_Node_Expression_Constant($callableParameter->getDefaultValue(), -1);
-            } elseif ($callableParameter->isOptional()) {
-                if (empty($parameters)) {
-                    break;
-                } else {
-                    $missingArguments[] = $name;
-                }
-            } else {
-                throw new Twig_Error_Syntax(sprintf('Value for argument "%s" is required for %s "%s".', $name, $callType, $callName));
-            }
-        }
-
-        if ($isVariadic) {
-            $arbitraryArguments = new Twig_Node_Expression_Array(array(), -1);
-            foreach ($parameters as $key => $value) {
-                if (is_int($key)) {
-                    $arbitraryArguments->addElement($value);
-                } else {
-                    $arbitraryArguments->addElement($value, new Twig_Node_Expression_Constant($key, -1));
-                }
-                unset($parameters[$key]);
-            }
-
-            if ($arbitraryArguments->count()) {
-                $arguments = array_merge($arguments, $optionalArguments);
-                $arguments[] = $arbitraryArguments;
-            }
-        }
-
-        if (!empty($parameters)) {
-            $unknownParameter = null;
-            foreach ($parameters as $parameter) {
-                if ($parameter instanceof Twig_Node) {
-                    $unknownParameter = $parameter;
-                    break;
-                }
-            }
-
-            throw new Twig_Error_Syntax(sprintf(
-                'Unknown argument%s "%s" for %s "%s(%s)".',
-                count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $callType, $callName, implode(', ', $names)
-            ), $unknownParameter ? $unknownParameter->getTemplateLine() : -1);
-        }
-
-        return $arguments;
-    }
-
-    protected function normalizeName($name)
-    {
-        return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('\\1_\\2', '\\1_\\2'), $name));
-    }
-
-    private function getCallableParameters($callable, $isVariadic)
-    {
-        list($r) = $this->reflectCallable($callable);
-        if (null === $r) {
-            return array();
-        }
-
-        $parameters = $r->getParameters();
-        if ($this->hasNode('node')) {
-            array_shift($parameters);
-        }
-        if ($this->hasAttribute('needs_environment') && $this->getAttribute('needs_environment')) {
-            array_shift($parameters);
-        }
-        if ($this->hasAttribute('needs_context') && $this->getAttribute('needs_context')) {
-            array_shift($parameters);
-        }
-        if ($this->hasAttribute('arguments') && null !== $this->getAttribute('arguments')) {
-            foreach ($this->getAttribute('arguments') as $argument) {
-                array_shift($parameters);
-            }
-        }
-        if ($isVariadic) {
-            $argument = end($parameters);
-            if ($argument && $argument->isArray() && $argument->isDefaultValueAvailable() && array() === $argument->getDefaultValue()) {
-                array_pop($parameters);
-            } else {
-                $callableName = $r->name;
-                if ($r instanceof ReflectionMethod) {
-                    $callableName = $r->getDeclaringClass()->name.'::'.$callableName;
-                }
-
-                throw new LogicException(sprintf('The last parameter of "%s" for %s "%s" must be an array with default value, eg. "array $arg = array()".', $callableName, $this->getAttribute('type'), $this->getAttribute('name')));
-            }
-        }
-
-        return $parameters;
-    }
-
-    private function reflectCallable($callable)
-    {
-        if (null !== $this->reflector) {
-            return $this->reflector;
-        }
-
-        if (is_array($callable)) {
-            if (!method_exists($callable[0], $callable[1])) {
-                // __call()
-                return array(null, array());
-            }
-            $r = new ReflectionMethod($callable[0], $callable[1]);
-        } elseif (is_object($callable) && !$callable instanceof Closure) {
-            $r = new ReflectionObject($callable);
-            $r = $r->getMethod('__invoke');
-            $callable = array($callable, '__invoke');
-        } elseif (is_string($callable) && false !== $pos = strpos($callable, '::')) {
-            $class = substr($callable, 0, $pos);
-            $method = substr($callable, $pos + 2);
-            if (!method_exists($class, $method)) {
-                // __staticCall()
-                return array(null, array());
-            }
-            $r = new ReflectionMethod($callable);
-            $callable = array($class, $method);
-        } else {
-            $r = new ReflectionFunction($callable);
-        }
-
-        return $this->reflector = array($r, $callable);
-    }
-}
-
-class_alias('Twig_Node_Expression_Call', 'Twig\Node\Expression\CallExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Conditional.php b/inc/lib/Twig/Node/Expression/Conditional.php
deleted file mode 100644
index c339d773..00000000
--- a/inc/lib/Twig/Node/Expression/Conditional.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Conditional extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $expr1, Twig_Node_Expression $expr2, Twig_Node_Expression $expr3, $lineno)
-    {
-        parent::__construct(array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('((')
-            ->subcompile($this->getNode('expr1'))
-            ->raw(') ? (')
-            ->subcompile($this->getNode('expr2'))
-            ->raw(') : (')
-            ->subcompile($this->getNode('expr3'))
-            ->raw('))')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Conditional', 'Twig\Node\Expression\ConditionalExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Constant.php b/inc/lib/Twig/Node/Expression/Constant.php
deleted file mode 100644
index bf4d031c..00000000
--- a/inc/lib/Twig/Node/Expression/Constant.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Constant extends Twig_Node_Expression
-{
-    public function __construct($value, $lineno)
-    {
-        parent::__construct(array(), array('value' => $value), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->repr($this->getAttribute('value'));
-    }
-}
-
-class_alias('Twig_Node_Expression_Constant', 'Twig\Node\Expression\ConstantExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/ExtensionReference.php b/inc/lib/Twig/Node/Expression/ExtensionReference.php
deleted file mode 100644
index 114b5cd9..00000000
--- a/inc/lib/Twig/Node/Expression/ExtensionReference.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Node_Expression_ExtensionReference class is deprecated since version 1.23 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-/**
- * Represents an extension call node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.23 and will be removed in 2.0.
- */
-class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(sprintf("\$this->env->getExtension('%s')", $this->getAttribute('name')));
-    }
-}
diff --git a/inc/lib/Twig/Node/Expression/Filter.php b/inc/lib/Twig/Node/Expression/Filter.php
deleted file mode 100644
index 12da1d67..00000000
--- a/inc/lib/Twig/Node/Expression/Filter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        parent::__construct(array('node' => $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getNode('filter')->getAttribute('value');
-        $filter = $compiler->getEnvironment()->getFilter($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'filter');
-        $this->setAttribute('thing', $filter);
-        $this->setAttribute('needs_environment', $filter->needsEnvironment());
-        $this->setAttribute('needs_context', $filter->needsContext());
-        $this->setAttribute('arguments', $filter->getArguments());
-        if ($filter instanceof Twig_FilterCallableInterface || $filter instanceof Twig_SimpleFilter) {
-            $this->setAttribute('callable', $filter->getCallable());
-        }
-        if ($filter instanceof Twig_SimpleFilter) {
-            $this->setAttribute('is_variadic', $filter->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
-
-class_alias('Twig_Node_Expression_Filter', 'Twig\Node\Expression\FilterExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Filter/Default.php b/inc/lib/Twig/Node/Expression/Filter/Default.php
deleted file mode 100644
index d2e19d54..00000000
--- a/inc/lib/Twig/Node/Expression/Filter/Default.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Returns the value or the default value when it is undefined or empty.
- *
- * <pre>
- *  {{ var.foo|default('foo item on var is not defined') }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getTemplateLine()), $arguments, $node->getTemplateLine());
-
-        if ('default' === $filterName->getAttribute('value') && ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr)) {
-            $test = new Twig_Node_Expression_Test_Defined(clone $node, 'defined', new Twig_Node(), $node->getTemplateLine());
-            $false = count($arguments) ? $arguments->getNode(0) : new Twig_Node_Expression_Constant('', $node->getTemplateLine());
-
-            $node = new Twig_Node_Expression_Conditional($test, $default, $false, $node->getTemplateLine());
-        } else {
-            $node = $default;
-        }
-
-        parent::__construct($node, $filterName, $arguments, $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('node'));
-    }
-}
-
-class_alias('Twig_Node_Expression_Filter_Default', 'Twig\Node\Expression\Filter\DefaultFilter', false);
diff --git a/inc/lib/Twig/Node/Expression/Function.php b/inc/lib/Twig/Node/Expression/Function.php
deleted file mode 100644
index cdee7c97..00000000
--- a/inc/lib/Twig/Node/Expression/Function.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
-{
-    public function __construct($name, Twig_NodeInterface $arguments, $lineno)
-    {
-        parent::__construct(array('arguments' => $arguments), array('name' => $name, 'is_defined_test' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $function = $compiler->getEnvironment()->getFunction($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'function');
-        $this->setAttribute('thing', $function);
-        $this->setAttribute('needs_environment', $function->needsEnvironment());
-        $this->setAttribute('needs_context', $function->needsContext());
-        $this->setAttribute('arguments', $function->getArguments());
-        if ($function instanceof Twig_FunctionCallableInterface || $function instanceof Twig_SimpleFunction) {
-            $callable = $function->getCallable();
-            if ('constant' === $name && $this->getAttribute('is_defined_test')) {
-                $callable = 'twig_constant_is_defined';
-            }
-
-            $this->setAttribute('callable', $callable);
-        }
-        if ($function instanceof Twig_SimpleFunction) {
-            $this->setAttribute('is_variadic', $function->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
-
-class_alias('Twig_Node_Expression_Function', 'Twig\Node\Expression\FunctionExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/GetAttr.php b/inc/lib/Twig/Node/Expression/GetAttr.php
deleted file mode 100644
index b7823acc..00000000
--- a/inc/lib/Twig/Node/Expression/GetAttr.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_Node_Expression $arguments = null, $type, $lineno)
-    {
-        $nodes = array('node' => $node, 'attribute' => $attribute);
-        if (null !== $arguments) {
-            $nodes['arguments'] = $arguments;
-        }
-
-        parent::__construct($nodes, array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('disable_c_ext')) {
-            @trigger_error(sprintf('Using the "disable_c_ext" attribute on %s is deprecated since version 1.30 and will be removed in 2.0.', __CLASS__), E_USER_DEPRECATED);
-        }
-
-        if (function_exists('twig_template_get_attributes') && !$this->getAttribute('disable_c_ext')) {
-            $compiler->raw('twig_template_get_attributes($this, ');
-        } else {
-            $compiler->raw('$this->getAttribute(');
-        }
-
-        if ($this->getAttribute('ignore_strict_check')) {
-            $this->getNode('node')->setAttribute('ignore_strict_check', true);
-        }
-
-        $compiler->subcompile($this->getNode('node'));
-
-        $compiler->raw(', ')->subcompile($this->getNode('attribute'));
-
-        // only generate optional arguments when needed (to make generated code more readable)
-        $needFourth = $this->getAttribute('ignore_strict_check');
-        $needThird = $needFourth || $this->getAttribute('is_defined_test');
-        $needSecond = $needThird || Twig_Template::ANY_CALL !== $this->getAttribute('type');
-        $needFirst = $needSecond || $this->hasNode('arguments');
-
-        if ($needFirst) {
-            if ($this->hasNode('arguments')) {
-                $compiler->raw(', ')->subcompile($this->getNode('arguments'));
-            } else {
-                $compiler->raw(', array()');
-            }
-        }
-
-        if ($needSecond) {
-            $compiler->raw(', ')->repr($this->getAttribute('type'));
-        }
-
-        if ($needThird) {
-            $compiler->raw(', ')->repr($this->getAttribute('is_defined_test'));
-        }
-
-        if ($needFourth) {
-            $compiler->raw(', ')->repr($this->getAttribute('ignore_strict_check'));
-        }
-
-        $compiler->raw(')');
-    }
-}
-
-class_alias('Twig_Node_Expression_GetAttr', 'Twig\Node\Expression\GetAttrExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/MacroCall.php b/inc/lib/Twig/Node/Expression/MacroCall.php
deleted file mode 100644
index 3e6b8c12..00000000
--- a/inc/lib/Twig/Node/Expression/MacroCall.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2012 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a macro call node.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Node_Expression_MacroCall extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $template, $name, Twig_Node_Expression_Array $arguments, $lineno)
-    {
-        parent::__construct(array('template' => $template, 'arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $namedNames = array();
-        $namedCount = 0;
-        $positionalCount = 0;
-        foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
-            $name = $pair['key']->getAttribute('value');
-            if (!is_int($name)) {
-                $namedCount++;
-                $namedNames[$name] = 1;
-            } elseif ($namedCount > 0) {
-                throw new Twig_Error_Syntax(sprintf('Positional arguments cannot be used after named arguments for macro "%s".', $this->getAttribute('name')), $this->lineno);
-            } else {
-                $positionalCount++;
-            }
-        }
-
-        $compiler
-            ->raw('$this->callMacro(')
-            ->subcompile($this->getNode('template'))
-            ->raw(', ')->repr($this->getAttribute('name'))
-            ->raw(', ')->subcompile($this->getNode('arguments'))
-        ;
-
-        if ($namedCount > 0) {
-            $compiler
-                ->raw(', ')->repr($namedNames)
-                ->raw(', ')->repr($namedCount)
-                ->raw(', ')->repr($positionalCount)
-            ;
-        }
-
-        $compiler
-            ->raw(')')
-        ;
-    }
-}
diff --git a/inc/lib/Twig/Node/Expression/MethodCall.php b/inc/lib/Twig/Node/Expression/MethodCall.php
deleted file mode 100644
index 709016eb..00000000
--- a/inc/lib/Twig/Node/Expression/MethodCall.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_MethodCall extends Twig_Node_Expression
-{
-    public function __construct(Twig_Node_Expression $node, $method, Twig_Node_Expression_Array $arguments, $lineno)
-    {
-        parent::__construct(array('node' => $node, 'arguments' => $arguments), array('method' => $method, 'safe' => false), $lineno);
-
-        if ($node instanceof Twig_Node_Expression_Name) {
-            $node->setAttribute('always_defined', true);
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->subcompile($this->getNode('node'))
-            ->raw('->')
-            ->raw($this->getAttribute('method'))
-            ->raw('(')
-        ;
-        $first = true;
-        foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler->subcompile($pair['value']);
-        }
-        $compiler->raw(')');
-    }
-}
-
-class_alias('Twig_Node_Expression_MethodCall', 'Twig\Node\Expression\MethodCallExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Name.php b/inc/lib/Twig/Node/Expression/Name.php
deleted file mode 100644
index 9d5a21f8..00000000
--- a/inc/lib/Twig/Node/Expression/Name.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Name extends Twig_Node_Expression
-{
-    protected $specialVars = array(
-        '_self' => '$this',
-        '_context' => '$context',
-        '_charset' => '$this->env->getCharset()',
-    );
-
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false, 'always_defined' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-
-        $compiler->addDebugInfo($this);
-
-        if ($this->getAttribute('is_defined_test')) {
-            if ($this->isSpecial()) {
-                $compiler->repr(true);
-            } else {
-                $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
-            }
-        } elseif ($this->isSpecial()) {
-            $compiler->raw($this->specialVars[$name]);
-        } elseif ($this->getAttribute('always_defined')) {
-            $compiler
-                ->raw('$context[')
-                ->string($name)
-                ->raw(']')
-            ;
-        } else {
-            if (PHP_VERSION_ID >= 70000) {
-                // use PHP 7 null coalescing operator
-                $compiler
-                    ->raw('($context[')
-                    ->string($name)
-                    ->raw('] ?? ')
-                ;
-
-                if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
-                    $compiler->raw('null)');
-                } else {
-                    $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
-                }
-            } elseif (PHP_VERSION_ID >= 50400) {
-                // PHP 5.4 ternary operator performance was optimized
-                $compiler
-                    ->raw('(isset($context[')
-                    ->string($name)
-                    ->raw(']) ? $context[')
-                    ->string($name)
-                    ->raw('] : ')
-                ;
-
-                if ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables()) {
-                    $compiler->raw('null)');
-                } else {
-                    $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
-                }
-            } else {
-                $compiler
-                    ->raw('$this->getContext($context, ')
-                    ->string($name)
-                ;
-
-                if ($this->getAttribute('ignore_strict_check')) {
-                    $compiler->raw(', true');
-                }
-
-                $compiler
-                    ->raw(')')
-                ;
-            }
-        }
-    }
-
-    public function isSpecial()
-    {
-        return isset($this->specialVars[$this->getAttribute('name')]);
-    }
-
-    public function isSimple()
-    {
-        return !$this->isSpecial() && !$this->getAttribute('is_defined_test');
-    }
-}
-
-class_alias('Twig_Node_Expression_Name', 'Twig\Node\Expression\NameExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/NullCoalesce.php b/inc/lib/Twig/Node/Expression/NullCoalesce.php
deleted file mode 100644
index eaafa4c9..00000000
--- a/inc/lib/Twig/Node/Expression/NullCoalesce.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_NullCoalesce extends Twig_Node_Expression_Conditional
-{
-    public function __construct(Twig_NodeInterface $left, Twig_NodeInterface $right, $lineno)
-    {
-        $test = new Twig_Node_Expression_Binary_And(
-            new Twig_Node_Expression_Test_Defined(clone $left, 'defined', new Twig_Node(), $left->getTemplateLine()),
-            new Twig_Node_Expression_Unary_Not(new Twig_Node_Expression_Test_Null($left, 'null', new Twig_Node(), $left->getTemplateLine()), $left->getTemplateLine()),
-            $left->getTemplateLine()
-        );
-
-        parent::__construct($test, $left, $right, $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        /*
-         * This optimizes only one case. PHP 7 also supports more complex expressions
-         * that can return null. So, for instance, if log is defined, log("foo") ?? "..." works,
-         * but log($a["foo"]) ?? "..." does not if $a["foo"] is not defined. More advanced
-         * cases might be implemented as an optimizer node visitor, but has not been done
-         * as benefits are probably not worth the added complexity.
-         */
-        if (PHP_VERSION_ID >= 70000 && $this->getNode('expr2') instanceof Twig_Node_Expression_Name) {
-            $this->getNode('expr2')->setAttribute('always_defined', true);
-            $compiler
-                ->raw('((')
-                ->subcompile($this->getNode('expr2'))
-                ->raw(') ?? (')
-                ->subcompile($this->getNode('expr3'))
-                ->raw('))')
-            ;
-        } else {
-            parent::compile($compiler);
-        }
-    }
-}
-
-class_alias('Twig_Node_Expression_NullCoalesce', 'Twig\Node\Expression\NullCoalesceExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Parent.php b/inc/lib/Twig/Node/Expression/Parent.php
deleted file mode 100644
index 78692db2..00000000
--- a/inc/lib/Twig/Node/Expression/Parent.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a parent node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Parent extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('output' => false, 'name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write('$this->displayParentBlock(')
-                ->string($this->getAttribute('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw('$this->renderParentBlock(')
-                ->string($this->getAttribute('name'))
-                ->raw(', $context, $blocks)')
-            ;
-        }
-    }
-}
-
-class_alias('Twig_Node_Expression_Parent', 'Twig\Node\Expression\ParentExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/TempName.php b/inc/lib/Twig/Node/Expression/TempName.php
deleted file mode 100644
index 0a86e003..00000000
--- a/inc/lib/Twig/Node/Expression/TempName.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_TempName extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('$_')
-            ->raw($this->getAttribute('name'))
-            ->raw('_')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_TempName', 'Twig\Node\Expression\TempNameExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Test.php b/inc/lib/Twig/Node/Expression/Test.php
deleted file mode 100644
index ad102ba6..00000000
--- a/inc/lib/Twig/Node/Expression/Test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
-{
-    public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
-    {
-        $nodes = array('node' => $node);
-        if (null !== $arguments) {
-            $nodes['arguments'] = $arguments;
-        }
-
-        parent::__construct($nodes, array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $test = $compiler->getEnvironment()->getTest($name);
-
-        $this->setAttribute('name', $name);
-        $this->setAttribute('type', 'test');
-        $this->setAttribute('thing', $test);
-        if ($test instanceof Twig_TestCallableInterface || $test instanceof Twig_SimpleTest) {
-            $this->setAttribute('callable', $test->getCallable());
-        }
-        if ($test instanceof Twig_SimpleTest) {
-            $this->setAttribute('is_variadic', $test->isVariadic());
-        }
-
-        $this->compileCallable($compiler);
-    }
-}
-
-class_alias('Twig_Node_Expression_Test', 'Twig\Node\Expression\TestExpression', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Constant.php b/inc/lib/Twig/Node/Expression/Test/Constant.php
deleted file mode 100644
index a51a4ba1..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Constant.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is the exact same value as a constant.
- *
- * <pre>
- *  {% if post.status is constant('Post::PUBLISHED') %}
- *    the status attribute is exactly the same as Post::PUBLISHED
- *  {% endif %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' === constant(')
-        ;
-
-        if ($this->getNode('arguments')->hasNode(1)) {
-            $compiler
-                ->raw('get_class(')
-                ->subcompile($this->getNode('arguments')->getNode(1))
-                ->raw(')."::".')
-            ;
-        }
-
-        $compiler
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw('))')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Constant', 'Twig\Node\Expression\Test\ConstantTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Defined.php b/inc/lib/Twig/Node/Expression/Test/Defined.php
deleted file mode 100644
index 2136c390..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Defined.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is defined in the current context.
- *
- * <pre>
- * {# defined works with variable names and variable attributes #}
- * {% if foo is defined %}
- *     {# ... #}
- * {% endif %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
-{
-    public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno)
-    {
-        if ($node instanceof Twig_Node_Expression_Name) {
-            $node->setAttribute('is_defined_test', true);
-        } elseif ($node instanceof Twig_Node_Expression_GetAttr) {
-            $node->setAttribute('is_defined_test', true);
-            $this->changeIgnoreStrictCheck($node);
-        } elseif ($node instanceof Twig_Node_Expression_BlockReference) {
-            $node->setAttribute('is_defined_test', true);
-        } elseif ($node instanceof Twig_Node_Expression_Function && 'constant' === $node->getAttribute('name')) {
-            $node->setAttribute('is_defined_test', true);
-        } elseif ($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array) {
-            $node = new Twig_Node_Expression_Constant(true, $node->getTemplateLine());
-        } else {
-            throw new Twig_Error_Syntax('The "defined" test only works with simple variables.', $this->getTemplateLine());
-        }
-
-        parent::__construct($node, $name, $arguments, $lineno);
-    }
-
-    protected function changeIgnoreStrictCheck(Twig_Node_Expression_GetAttr $node)
-    {
-        $node->setAttribute('ignore_strict_check', true);
-
-        if ($node->getNode('node') instanceof Twig_Node_Expression_GetAttr) {
-            $this->changeIgnoreStrictCheck($node->getNode('node'));
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('node'));
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Defined', 'Twig\Node\Expression\Test\DefinedTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Divisibleby.php b/inc/lib/Twig/Node/Expression/Test/Divisibleby.php
deleted file mode 100644
index a5d71961..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Divisibleby.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is divisible by a number.
- *
- * <pre>
- *  {% if loop.index is divisible by(3) %}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(0 == ')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % ')
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Divisibleby', 'Twig\Node\Expression\Test\DivisiblebyTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Even.php b/inc/lib/Twig/Node/Expression/Test/Even.php
deleted file mode 100644
index 7e198bea..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Even.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a number is even.
- *
- * <pre>
- *  {{ var is even }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % 2 == 0')
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Even', 'Twig\Node\Expression\Test\EvenTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Null.php b/inc/lib/Twig/Node/Expression/Test/Null.php
deleted file mode 100644
index 3746e4cb..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Null.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks that a variable is null.
- *
- * <pre>
- *  {{ var is none }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(null === ')
-            ->subcompile($this->getNode('node'))
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Null', 'Twig\Node\Expression\Test\NullTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Odd.php b/inc/lib/Twig/Node/Expression/Test/Odd.php
deleted file mode 100644
index 0c6c099b..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Odd.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a number is odd.
- *
- * <pre>
- *  {{ var is odd }}
- * </pre>
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' % 2 == 1')
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Odd', 'Twig\Node\Expression\Test\OddTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Test/Sameas.php b/inc/lib/Twig/Node/Expression/Test/Sameas.php
deleted file mode 100644
index e95ff1f2..00000000
--- a/inc/lib/Twig/Node/Expression/Test/Sameas.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Checks if a variable is the same as another one (=== in PHP).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('node'))
-            ->raw(' === ')
-            ->subcompile($this->getNode('arguments')->getNode(0))
-            ->raw(')')
-        ;
-    }
-}
-
-class_alias('Twig_Node_Expression_Test_Sameas', 'Twig\Node\Expression\Test\SameasTest', false);
diff --git a/inc/lib/Twig/Node/Expression/Unary.php b/inc/lib/Twig/Node/Expression/Unary.php
deleted file mode 100644
index 5804485e..00000000
--- a/inc/lib/Twig/Node/Expression/Unary.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $node, $lineno)
-    {
-        parent::__construct(array('node' => $node), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(' ');
-        $this->operator($compiler);
-        $compiler->subcompile($this->getNode('node'));
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
-
-class_alias('Twig_Node_Expression_Unary', 'Twig\Node\Expression\Unary\AbstractUnary', false);
diff --git a/inc/lib/Twig/Node/Expression/Unary/Neg.php b/inc/lib/Twig/Node/Expression/Unary/Neg.php
deleted file mode 100644
index 039d933d..00000000
--- a/inc/lib/Twig/Node/Expression/Unary/Neg.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Neg extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('-');
-    }
-}
-
-class_alias('Twig_Node_Expression_Unary_Neg', 'Twig\Node\Expression\Unary\NegUnary', false);
diff --git a/inc/lib/Twig/Node/Expression/Unary/Not.php b/inc/lib/Twig/Node/Expression/Unary/Not.php
deleted file mode 100644
index a0860b18..00000000
--- a/inc/lib/Twig/Node/Expression/Unary/Not.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Not extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('!');
-    }
-}
-
-class_alias('Twig_Node_Expression_Unary_Not', 'Twig\Node\Expression\Unary\NotUnary', false);
diff --git a/inc/lib/Twig/Node/Expression/Unary/Pos.php b/inc/lib/Twig/Node/Expression/Unary/Pos.php
deleted file mode 100644
index eeff5452..00000000
--- a/inc/lib/Twig/Node/Expression/Unary/Pos.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-class Twig_Node_Expression_Unary_Pos extends Twig_Node_Expression_Unary
-{
-    public function operator(Twig_Compiler $compiler)
-    {
-        $compiler->raw('+');
-    }
-}
-
-class_alias('Twig_Node_Expression_Unary_Pos', 'Twig\Node\Expression\Unary\PosUnary', false);
diff --git a/inc/lib/Twig/Node/Flush.php b/inc/lib/Twig/Node/Flush.php
deleted file mode 100644
index fcc461ac..00000000
--- a/inc/lib/Twig/Node/Flush.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a flush node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Flush extends Twig_Node
-{
-    public function __construct($lineno, $tag)
-    {
-        parent::__construct(array(), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("flush();\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Flush', 'Twig\Node\FlushNode', false);
diff --git a/inc/lib/Twig/Node/For.php b/inc/lib/Twig/Node/For.php
deleted file mode 100644
index 914b70c9..00000000
--- a/inc/lib/Twig/Node/For.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a for node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_For extends Twig_Node
-{
-    protected $loop;
-
-    public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        $body = new Twig_Node(array($body, $this->loop = new Twig_Node_ForLoop($lineno, $tag)));
-
-        if (null !== $ifexpr) {
-            $body = new Twig_Node_If(new Twig_Node(array($ifexpr, $body)), null, $lineno, $tag);
-        }
-
-        $nodes = array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body);
-        if (null !== $else) {
-            $nodes['else'] = $else;
-        }
-
-        parent::__construct($nodes, array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("\$context['_parent'] = \$context;\n")
-            ->write("\$context['_seq'] = twig_ensure_traversable(")
-            ->subcompile($this->getNode('seq'))
-            ->raw(");\n")
-        ;
-
-        if ($this->hasNode('else')) {
-            $compiler->write("\$context['_iterated'] = false;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("\$context['loop'] = array(\n")
-                ->write("  'parent' => \$context['_parent'],\n")
-                ->write("  'index0' => 0,\n")
-                ->write("  'index'  => 1,\n")
-                ->write("  'first'  => true,\n")
-                ->write(");\n")
-            ;
-
-            if (!$this->getAttribute('ifexpr')) {
-                $compiler
-                    ->write("if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable)) {\n")
-                    ->indent()
-                    ->write("\$length = count(\$context['_seq']);\n")
-                    ->write("\$context['loop']['revindex0'] = \$length - 1;\n")
-                    ->write("\$context['loop']['revindex'] = \$length;\n")
-                    ->write("\$context['loop']['length'] = \$length;\n")
-                    ->write("\$context['loop']['last'] = 1 === \$length;\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-
-        $this->loop->setAttribute('else', $this->hasNode('else'));
-        $this->loop->setAttribute('with_loop', $this->getAttribute('with_loop'));
-        $this->loop->setAttribute('ifexpr', $this->getAttribute('ifexpr'));
-
-        $compiler
-            ->write("foreach (\$context['_seq'] as ")
-            ->subcompile($this->getNode('key_target'))
-            ->raw(' => ')
-            ->subcompile($this->getNode('value_target'))
-            ->raw(") {\n")
-            ->indent()
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n")
-        ;
-
-        if ($this->hasNode('else')) {
-            $compiler
-                ->write("if (!\$context['_iterated']) {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-                ->outdent()
-                ->write("}\n")
-            ;
-        }
-
-        $compiler->write("\$_parent = \$context['_parent'];\n");
-
-        // remove some "private" loop variables (needed for nested loops)
-        $compiler->write('unset($context[\'_seq\'], $context[\'_iterated\'], $context[\''.$this->getNode('key_target')->getAttribute('name').'\'], $context[\''.$this->getNode('value_target')->getAttribute('name').'\'], $context[\'_parent\'], $context[\'loop\']);'."\n");
-
-        // keep the values set in the inner context for variables defined in the outer context
-        $compiler->write("\$context = array_intersect_key(\$context, \$_parent) + \$_parent;\n");
-    }
-}
-
-class_alias('Twig_Node_For', 'Twig\Node\ForNode', false);
diff --git a/inc/lib/Twig/Node/ForLoop.php b/inc/lib/Twig/Node/ForLoop.php
deleted file mode 100644
index 06477cf1..00000000
--- a/inc/lib/Twig/Node/ForLoop.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Internal node used by the for node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_ForLoop extends Twig_Node
-{
-    public function __construct($lineno, $tag = null)
-    {
-        parent::__construct(array(), array('with_loop' => false, 'ifexpr' => false, 'else' => false), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('else')) {
-            $compiler->write("\$context['_iterated'] = true;\n");
-        }
-
-        if ($this->getAttribute('with_loop')) {
-            $compiler
-                ->write("++\$context['loop']['index0'];\n")
-                ->write("++\$context['loop']['index'];\n")
-                ->write("\$context['loop']['first'] = false;\n")
-            ;
-
-            if (!$this->getAttribute('ifexpr')) {
-                $compiler
-                    ->write("if (isset(\$context['loop']['length'])) {\n")
-                    ->indent()
-                    ->write("--\$context['loop']['revindex0'];\n")
-                    ->write("--\$context['loop']['revindex'];\n")
-                    ->write("\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];\n")
-                    ->outdent()
-                    ->write("}\n")
-                ;
-            }
-        }
-    }
-}
-
-class_alias('Twig_Node_ForLoop', 'Twig\Node\ForLoopNode', false);
diff --git a/inc/lib/Twig/Node/If.php b/inc/lib/Twig/Node/If.php
deleted file mode 100644
index d82edec7..00000000
--- a/inc/lib/Twig/Node/If.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an if node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_If extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null)
-    {
-        $nodes = array('tests' => $tests);
-        if (null !== $else) {
-            $nodes['else'] = $else;
-        }
-
-        parent::__construct($nodes, array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-        for ($i = 0, $count = count($this->getNode('tests')); $i < $count; $i += 2) {
-            if ($i > 0) {
-                $compiler
-                    ->outdent()
-                    ->write('} elseif (')
-                ;
-            } else {
-                $compiler
-                    ->write('if (')
-                ;
-            }
-
-            $compiler
-                ->subcompile($this->getNode('tests')->getNode($i))
-                ->raw(") {\n")
-                ->indent()
-                ->subcompile($this->getNode('tests')->getNode($i + 1))
-            ;
-        }
-
-        if ($this->hasNode('else')) {
-            $compiler
-                ->outdent()
-                ->write("} else {\n")
-                ->indent()
-                ->subcompile($this->getNode('else'))
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("}\n");
-    }
-}
-
-class_alias('Twig_Node_If', 'Twig\Node\IfNode', false);
diff --git a/inc/lib/Twig/Node/Import.php b/inc/lib/Twig/Node/Import.php
deleted file mode 100644
index c77e320b..00000000
--- a/inc/lib/Twig/Node/Import.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an import node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Import extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $var, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr, 'var' => $var), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('var'))
-            ->raw(' = ')
-        ;
-
-        if ($this->getNode('expr') instanceof Twig_Node_Expression_Name && '_self' === $this->getNode('expr')->getAttribute('name')) {
-            $compiler->raw('$this');
-        } else {
-            $compiler
-                ->raw('$this->loadTemplate(')
-                ->subcompile($this->getNode('expr'))
-                ->raw(', ')
-                ->repr($this->getTemplateName())
-                ->raw(', ')
-                ->repr($this->getTemplateLine())
-                ->raw(')')
-            ;
-        }
-
-        $compiler->raw(";\n");
-    }
-}
-
-class_alias('Twig_Node_Import', 'Twig\Node\ImportNode', false);
diff --git a/inc/lib/Twig/Node/Include.php b/inc/lib/Twig/Node/Include.php
deleted file mode 100644
index 2a5114cb..00000000
--- a/inc/lib/Twig/Node/Include.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents an include node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        $nodes = array('expr' => $expr);
-        if (null !== $variables) {
-            $nodes['variables'] = $variables;
-        }
-
-        parent::__construct($nodes, array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->write("try {\n")
-                ->indent()
-            ;
-        }
-
-        $this->addGetTemplate($compiler);
-
-        $compiler->raw('->display(');
-
-        $this->addTemplateArguments($compiler);
-
-        $compiler->raw(");\n");
-
-        if ($this->getAttribute('ignore_missing')) {
-            $compiler
-                ->outdent()
-                ->write("} catch (Twig_Error_Loader \$e) {\n")
-                ->indent()
-                ->write("// ignore missing template\n")
-                ->outdent()
-                ->write("}\n\n")
-            ;
-        }
-    }
-
-    protected function addGetTemplate(Twig_Compiler $compiler)
-    {
-        $compiler
-             ->write('$this->loadTemplate(')
-             ->subcompile($this->getNode('expr'))
-             ->raw(', ')
-             ->repr($this->getTemplateName())
-             ->raw(', ')
-             ->repr($this->getTemplateLine())
-             ->raw(')')
-         ;
-    }
-
-    protected function addTemplateArguments(Twig_Compiler $compiler)
-    {
-        if (!$this->hasNode('variables')) {
-            $compiler->raw(false === $this->getAttribute('only') ? '$context' : 'array()');
-        } elseif (false === $this->getAttribute('only')) {
-            $compiler
-                ->raw('array_merge($context, ')
-                ->subcompile($this->getNode('variables'))
-                ->raw(')')
-            ;
-        } else {
-            $compiler->subcompile($this->getNode('variables'));
-        }
-    }
-}
-
-class_alias('Twig_Node_Include', 'Twig\Node\IncludeNode', false);
diff --git a/inc/lib/Twig/Node/Macro.php b/inc/lib/Twig/Node/Macro.php
deleted file mode 100644
index 3cf54977..00000000
--- a/inc/lib/Twig/Node/Macro.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a macro node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Macro extends Twig_Node
-{
-    const VARARGS_NAME = 'varargs';
-
-    public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        foreach ($arguments as $argumentName => $argument) {
-            if (self::VARARGS_NAME === $argumentName) {
-                throw new Twig_Error_Syntax(sprintf('The argument "%s" in macro "%s" cannot be defined because the variable "%s" is reserved for arbitrary arguments.', self::VARARGS_NAME, $name, self::VARARGS_NAME), $argument->getTemplateLine());
-            }
-        }
-
-        parent::__construct(array('body' => $body, 'arguments' => $arguments), array('name' => $name), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf('public function get%s(', $this->getAttribute('name')))
-        ;
-
-        $count = count($this->getNode('arguments'));
-        $pos = 0;
-        foreach ($this->getNode('arguments') as $name => $default) {
-            $compiler
-                ->raw('$__'.$name.'__ = ')
-                ->subcompile($default)
-            ;
-
-            if (++$pos < $count) {
-                $compiler->raw(', ');
-            }
-        }
-
-        if (PHP_VERSION_ID >= 50600) {
-            if ($count) {
-                $compiler->raw(', ');
-            }
-
-            $compiler->raw('...$__varargs__');
-        }
-
-        $compiler
-            ->raw(")\n")
-            ->write("{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->write("\$context = \$this->env->mergeGlobals(array(\n")
-            ->indent()
-        ;
-
-        foreach ($this->getNode('arguments') as $name => $default) {
-            $compiler
-                ->write('')
-                ->string($name)
-                ->raw(' => $__'.$name.'__')
-                ->raw(",\n")
-            ;
-        }
-
-        $compiler
-            ->write('')
-            ->string(self::VARARGS_NAME)
-            ->raw(' => ')
-        ;
-
-        if (PHP_VERSION_ID >= 50600) {
-            $compiler->raw("\$__varargs__,\n");
-        } else {
-            $compiler
-                ->raw('func_num_args() > ')
-                ->repr($count)
-                ->raw(' ? array_slice(func_get_args(), ')
-                ->repr($count)
-                ->raw(") : array(),\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write("));\n\n")
-            ->write("\$blocks = array();\n\n")
-            ->write("ob_start();\n")
-            ->write("try {\n")
-            ->indent()
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("} catch (Exception \$e) {\n")
-            ->indent()
-            ->write("ob_end_clean();\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("} catch (Throwable \$e) {\n")
-            ->indent()
-            ->write("ob_end_clean();\n\n")
-            ->write("throw \$e;\n")
-            ->outdent()
-            ->write("}\n\n")
-            ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Macro', 'Twig\Node\MacroNode', false);
diff --git a/inc/lib/Twig/Node/Module.php b/inc/lib/Twig/Node/Module.php
deleted file mode 100644
index 5cd8d050..00000000
--- a/inc/lib/Twig/Node/Module.php
+++ /dev/null
@@ -1,461 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a module node.
- *
- * Consider this class as being final. If you need to customize the behavior of
- * the generated class, consider adding nodes to the following nodes: display_start,
- * display_end, constructor_start, constructor_end, and class_end.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Module extends Twig_Node
-{
-    private $source;
-
-    public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $name, $source = '')
-    {
-        if (!$name instanceof Twig_Source) {
-            @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            $this->source = new Twig_Source($source, $name);
-        } else {
-            $this->source = $name;
-        }
-
-        $nodes = array(
-            'body' => $body,
-            'blocks' => $blocks,
-            'macros' => $macros,
-            'traits' => $traits,
-            'display_start' => new Twig_Node(),
-            'display_end' => new Twig_Node(),
-            'constructor_start' => new Twig_Node(),
-            'constructor_end' => new Twig_Node(),
-            'class_end' => new Twig_Node(),
-        );
-        if (null !== $parent) {
-            $nodes['parent'] = $parent;
-        }
-
-        // embedded templates are set as attributes so that they are only visited once by the visitors
-        parent::__construct($nodes, array(
-            // source to be remove in 2.0
-            'source' => $this->source->getCode(),
-            // filename to be remove in 2.0 (use getTemplateName() instead)
-            'filename' => $this->source->getName(),
-            'index' => null,
-            'embedded_templates' => $embeddedTemplates,
-        ), 1);
-
-        // populate the template name of all node children
-        $this->setTemplateName($this->source->getName());
-    }
-
-    public function setIndex($index)
-    {
-        $this->setAttribute('index', $index);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $this->compileTemplate($compiler);
-
-        foreach ($this->getAttribute('embedded_templates') as $template) {
-            $compiler->subcompile($template);
-        }
-    }
-
-    protected function compileTemplate(Twig_Compiler $compiler)
-    {
-        if (!$this->getAttribute('index')) {
-            $compiler->write('<?php');
-        }
-
-        $this->compileClassHeader($compiler);
-
-        if (
-            count($this->getNode('blocks'))
-            || count($this->getNode('traits'))
-            || !$this->hasNode('parent')
-            || $this->getNode('parent') instanceof Twig_Node_Expression_Constant
-            || count($this->getNode('constructor_start'))
-            || count($this->getNode('constructor_end'))
-        ) {
-            $this->compileConstructor($compiler);
-        }
-
-        $this->compileGetParent($compiler);
-
-        $this->compileDisplay($compiler);
-
-        $compiler->subcompile($this->getNode('blocks'));
-
-        $this->compileMacros($compiler);
-
-        $this->compileGetTemplateName($compiler);
-
-        $this->compileIsTraitable($compiler);
-
-        $this->compileDebugInfo($compiler);
-
-        $this->compileGetSource($compiler);
-
-        $this->compileGetSourceContext($compiler);
-
-        $this->compileClassFooter($compiler);
-    }
-
-    protected function compileGetParent(Twig_Compiler $compiler)
-    {
-        if (!$this->hasNode('parent')) {
-            return;
-        }
-        $parent = $this->getNode('parent');
-
-        $compiler
-            ->write("protected function doGetParent(array \$context)\n", "{\n")
-            ->indent()
-            ->addDebugInfo($parent)
-            ->write('return ')
-        ;
-
-        if ($parent instanceof Twig_Node_Expression_Constant) {
-            $compiler->subcompile($parent);
-        } else {
-            $compiler
-                ->raw('$this->loadTemplate(')
-                ->subcompile($parent)
-                ->raw(', ')
-                ->repr($this->source->getName())
-                ->raw(', ')
-                ->repr($parent->getTemplateLine())
-                ->raw(')')
-            ;
-        }
-
-        $compiler
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileClassHeader(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("\n\n")
-            // if the template name contains */, add a blank to avoid a PHP parse error
-            ->write('/* '.str_replace('*/', '* /', $this->source->getName())." */\n")
-            ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->source->getName(), $this->getAttribute('index')))
-            ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
-            ->write("{\n")
-            ->indent()
-        ;
-    }
-
-    protected function compileConstructor(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function __construct(Twig_Environment \$env)\n", "{\n")
-            ->indent()
-            ->subcompile($this->getNode('constructor_start'))
-            ->write("parent::__construct(\$env);\n\n")
-        ;
-
-        // parent
-        if (!$this->hasNode('parent')) {
-            $compiler->write("\$this->parent = false;\n\n");
-        } elseif (($parent = $this->getNode('parent')) && $parent instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->addDebugInfo($parent)
-                ->write('$this->parent = $this->loadTemplate(')
-                ->subcompile($parent)
-                ->raw(', ')
-                ->repr($this->source->getName())
-                ->raw(', ')
-                ->repr($parent->getTemplateLine())
-                ->raw(");\n")
-            ;
-        }
-
-        $countTraits = count($this->getNode('traits'));
-        if ($countTraits) {
-            // traits
-            foreach ($this->getNode('traits') as $i => $trait) {
-                $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i));
-
-                $compiler
-                    ->addDebugInfo($trait->getNode('template'))
-                    ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i))
-                    ->indent()
-                    ->write("throw new Twig_Error_Runtime('Template \"'.")
-                    ->subcompile($trait->getNode('template'))
-                    ->raw(".'\" cannot be used as a trait.');\n")
-                    ->outdent()
-                    ->write("}\n")
-                    ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i))
-                ;
-
-                foreach ($trait->getNode('targets') as $key => $value) {
-                    $compiler
-                        ->write(sprintf('if (!isset($_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw("])) {\n")
-                        ->indent()
-                        ->write("throw new Twig_Error_Runtime(sprintf('Block ")
-                        ->string($key)
-                        ->raw(' is not defined in trait ')
-                        ->subcompile($trait->getNode('template'))
-                        ->raw(".'));\n")
-                        ->outdent()
-                        ->write("}\n\n")
-
-                        ->write(sprintf('$_trait_%s_blocks[', $i))
-                        ->subcompile($value)
-                        ->raw(sprintf('] = $_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw(sprintf(']; unset($_trait_%s_blocks[', $i))
-                        ->string($key)
-                        ->raw("]);\n\n")
-                    ;
-                }
-            }
-
-            if ($countTraits > 1) {
-                $compiler
-                    ->write("\$this->traits = array_merge(\n")
-                    ->indent()
-                ;
-
-                for ($i = 0; $i < $countTraits; ++$i) {
-                    $compiler
-                        ->write(sprintf('$_trait_%s_blocks'.($i == $countTraits - 1 ? '' : ',')."\n", $i))
-                    ;
-                }
-
-                $compiler
-                    ->outdent()
-                    ->write(");\n\n")
-                ;
-            } else {
-                $compiler
-                    ->write("\$this->traits = \$_trait_0_blocks;\n\n")
-                ;
-            }
-
-            $compiler
-                ->write("\$this->blocks = array_merge(\n")
-                ->indent()
-                ->write("\$this->traits,\n")
-                ->write("array(\n")
-            ;
-        } else {
-            $compiler
-                ->write("\$this->blocks = array(\n")
-            ;
-        }
-
-        // blocks
-        $compiler
-            ->indent()
-        ;
-
-        foreach ($this->getNode('blocks') as $name => $node) {
-            $compiler
-                ->write(sprintf("'%s' => array(\$this, 'block_%s'),\n", $name, $name))
-            ;
-        }
-
-        if ($countTraits) {
-            $compiler
-                ->outdent()
-                ->write(")\n")
-            ;
-        }
-
-        $compiler
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->subcompile($this->getNode('constructor_end'))
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileDisplay(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("protected function doDisplay(array \$context, array \$blocks = array())\n", "{\n")
-            ->indent()
-            ->subcompile($this->getNode('display_start'))
-            ->subcompile($this->getNode('body'))
-        ;
-
-        if ($this->hasNode('parent')) {
-            $parent = $this->getNode('parent');
-            $compiler->addDebugInfo($parent);
-            if ($parent instanceof Twig_Node_Expression_Constant) {
-                $compiler->write('$this->parent');
-            } else {
-                $compiler->write('$this->getParent($context)');
-            }
-            $compiler->raw("->display(\$context, array_merge(\$this->blocks, \$blocks));\n");
-        }
-
-        $compiler
-            ->subcompile($this->getNode('display_end'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileClassFooter(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->subcompile($this->getNode('class_end'))
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    protected function compileMacros(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('macros'));
-    }
-
-    protected function compileGetTemplateName(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getTemplateName()\n", "{\n")
-            ->indent()
-            ->write('return ')
-            ->repr($this->source->getName())
-            ->raw(";\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileIsTraitable(Twig_Compiler $compiler)
-    {
-        // A template can be used as a trait if:
-        //   * it has no parent
-        //   * it has no macros
-        //   * it has no body
-        //
-        // Put another way, a template can be used as a trait if it
-        // only contains blocks and use statements.
-        $traitable = !$this->hasNode('parent') && 0 === count($this->getNode('macros'));
-        if ($traitable) {
-            if ($this->getNode('body') instanceof Twig_Node_Body) {
-                $nodes = $this->getNode('body')->getNode(0);
-            } else {
-                $nodes = $this->getNode('body');
-            }
-
-            if (!count($nodes)) {
-                $nodes = new Twig_Node(array($nodes));
-            }
-
-            foreach ($nodes as $node) {
-                if (!count($node)) {
-                    continue;
-                }
-
-                if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) {
-                    continue;
-                }
-
-                if ($node instanceof Twig_Node_BlockReference) {
-                    continue;
-                }
-
-                $traitable = false;
-                break;
-            }
-        }
-
-        if ($traitable) {
-            return;
-        }
-
-        $compiler
-            ->write("public function isTraitable()\n", "{\n")
-            ->indent()
-            ->write(sprintf("return %s;\n", $traitable ? 'true' : 'false'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileDebugInfo(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getDebugInfo()\n", "{\n")
-            ->indent()
-            ->write(sprintf("return %s;\n", str_replace("\n", '', var_export(array_reverse($compiler->getDebugInfo(), true), true))))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileGetSource(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("/** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */\n")
-            ->write("public function getSource()\n", "{\n")
-            ->indent()
-            ->write("@trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);\n\n")
-            ->write('return $this->getSourceContext()->getCode();')
-            ->raw("\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-
-    protected function compileGetSourceContext(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("public function getSourceContext()\n", "{\n")
-            ->indent()
-            ->write('return new Twig_Source(')
-            ->string($compiler->getEnvironment()->isDebug() ? $this->source->getCode() : '')
-            ->raw(', ')
-            ->string($this->source->getName())
-            ->raw(', ')
-            ->string($this->source->getPath())
-            ->raw(");\n")
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-
-    protected function compileLoadTemplate(Twig_Compiler $compiler, $node, $var)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            $compiler
-                ->write(sprintf('%s = $this->loadTemplate(', $var))
-                ->subcompile($node)
-                ->raw(', ')
-                ->repr($node->getTemplateName())
-                ->raw(', ')
-                ->repr($node->getTemplateLine())
-                ->raw(");\n")
-            ;
-        } else {
-            throw new LogicException('Trait templates can only be constant nodes.');
-        }
-    }
-}
-
-class_alias('Twig_Node_Module', 'Twig\Node\ModuleNode', false);
diff --git a/inc/lib/Twig/Node/Print.php b/inc/lib/Twig/Node/Print.php
deleted file mode 100644
index 374db89b..00000000
--- a/inc/lib/Twig/Node/Print.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node that outputs an expression.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Print', 'Twig\Node\PrintNode', false);
diff --git a/inc/lib/Twig/Node/Sandbox.php b/inc/lib/Twig/Node/Sandbox.php
deleted file mode 100644
index 44b30ab9..00000000
--- a/inc/lib/Twig/Node/Sandbox.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a sandbox node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Sandbox extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("\$sandbox = \$this->env->getExtension('Twig_Extension_Sandbox');\n")
-            ->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n")
-            ->indent()
-            ->write("\$sandbox->enableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-            ->subcompile($this->getNode('body'))
-            ->write("if (!\$alreadySandboxed) {\n")
-            ->indent()
-            ->write("\$sandbox->disableSandbox();\n")
-            ->outdent()
-            ->write("}\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Sandbox', 'Twig\Node\SandboxNode', false);
diff --git a/inc/lib/Twig/Node/SandboxedModule.php b/inc/lib/Twig/Node/SandboxedModule.php
deleted file mode 100644
index be1f5daa..00000000
--- a/inc/lib/Twig/Node/SandboxedModule.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) 2009 Fabien Potencier
- * (c) 2009 Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a module node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_SandboxedModule extends Twig_Node_Module
-{
-    protected $usedFilters;
-    protected $usedTags;
-    protected $usedFunctions;
-
-    public function __construct(Twig_Node_Module $node, array $usedFilters, array $usedTags, array $usedFunctions)
-    {
-        parent::__construct($node->getNode('body'), $node->getNode('parent'), $node->getNode('blocks'), $node->getNode('macros'), $node->getNode('traits'), $node->getAttribute('embedded_templates'), $node->getAttribute('filename'), $node->getLine(), $node->getNodeTag());
-
-        $this->setAttribute('index', $node->getAttribute('index'));
-
-        $this->usedFilters = $usedFilters;
-        $this->usedTags = $usedTags;
-        $this->usedFunctions = $usedFunctions;
-    }
-
-    protected function compileDisplayBody(Twig_Compiler $compiler)
-    {
-        $compiler->write("\$this->checkSecurity();\n");
-
-        parent::compileDisplayBody($compiler);
-    }
-
-    protected function compileDisplayFooter(Twig_Compiler $compiler)
-    {
-        parent::compileDisplayFooter($compiler);
-
-        $compiler
-            ->write("protected function checkSecurity()\n", "{\n")
-            ->indent()
-            ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
-            ->indent()
-            ->write(!$this->usedTags ? "array(),\n" : "array('".implode('\', \'', $this->usedTags)."'),\n")
-            ->write(!$this->usedFilters ? "array(),\n" : "array('".implode('\', \'', $this->usedFilters)."'),\n")
-            ->write(!$this->usedFunctions ? "array()\n" : "array('".implode('\', \'', $this->usedFunctions)."')\n")
-            ->outdent()
-            ->write(");\n")
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/inc/lib/Twig/Node/SandboxedPrint.php b/inc/lib/Twig/Node/SandboxedPrint.php
deleted file mode 100644
index a08f21f5..00000000
--- a/inc/lib/Twig/Node/SandboxedPrint.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_Node_SandboxedPrint adds a check for the __toString() method
- * when the variable is an object and the sandbox is activated.
- *
- * When there is a simple Print statement, like {{ article }},
- * and if the sandbox is enabled, we need to check that the __toString()
- * method is allowed if 'article' is an object.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_SandboxedPrint extends Twig_Node_Print
-{
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo $this->env->getExtension(\'Twig_Extension_Sandbox\')->ensureToStringAllowed(')
-            ->subcompile($this->getNode('expr'))
-            ->raw(");\n")
-        ;
-    }
-
-    /**
-     * Removes node filters.
-     *
-     * This is mostly needed when another visitor adds filters (like the escaper one).
-     *
-     * @return Twig_Node
-     */
-    protected function removeNodeFilter(Twig_Node $node)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->removeNodeFilter($node->getNode('node'));
-        }
-
-        return $node;
-    }
-}
-
-class_alias('Twig_Node_SandboxedPrint', 'Twig\Node\SandboxedPrintNode', false);
diff --git a/inc/lib/Twig/Node/Set.php b/inc/lib/Twig/Node/Set.php
deleted file mode 100644
index 6c6743ee..00000000
--- a/inc/lib/Twig/Node/Set.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a set node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Set extends Twig_Node implements Twig_NodeCaptureInterface
-{
-    public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null)
-    {
-        parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag);
-
-        /*
-         * Optimizes the node when capture is used for a large block of text.
-         *
-         * {% set foo %}foo{% endset %} is compiled to $context['foo'] = new Twig_Markup("foo");
-         */
-        if ($this->getAttribute('capture')) {
-            $this->setAttribute('safe', true);
-
-            $values = $this->getNode('values');
-            if ($values instanceof Twig_Node_Text) {
-                $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getTemplateLine()));
-                $this->setAttribute('capture', false);
-            }
-        }
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if (count($this->getNode('names')) > 1) {
-            $compiler->write('list(');
-            foreach ($this->getNode('names') as $idx => $node) {
-                if ($idx) {
-                    $compiler->raw(', ');
-                }
-
-                $compiler->subcompile($node);
-            }
-            $compiler->raw(')');
-        } else {
-            if ($this->getAttribute('capture')) {
-                $compiler
-                    ->write("ob_start();\n")
-                    ->subcompile($this->getNode('values'))
-                ;
-            }
-
-            $compiler->subcompile($this->getNode('names'), false);
-
-            if ($this->getAttribute('capture')) {
-                $compiler->raw(" = ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())");
-            }
-        }
-
-        if (!$this->getAttribute('capture')) {
-            $compiler->raw(' = ');
-
-            if (count($this->getNode('names')) > 1) {
-                $compiler->write('array(');
-                foreach ($this->getNode('values') as $idx => $value) {
-                    if ($idx) {
-                        $compiler->raw(', ');
-                    }
-
-                    $compiler->subcompile($value);
-                }
-                $compiler->raw(')');
-            } else {
-                if ($this->getAttribute('safe')) {
-                    $compiler
-                        ->raw("('' === \$tmp = ")
-                        ->subcompile($this->getNode('values'))
-                        ->raw(") ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())")
-                    ;
-                } else {
-                    $compiler->subcompile($this->getNode('values'));
-                }
-            }
-        }
-
-        $compiler->raw(";\n");
-    }
-}
-
-class_alias('Twig_Node_Set', 'Twig\Node\SetNode', false);
diff --git a/inc/lib/Twig/Node/SetTemp.php b/inc/lib/Twig/Node/SetTemp.php
deleted file mode 100644
index 996fdcde..00000000
--- a/inc/lib/Twig/Node/SetTemp.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @internal
- */
-class Twig_Node_SetTemp extends Twig_Node
-{
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $compiler
-            ->addDebugInfo($this)
-            ->write('if (isset($context[')
-            ->string($name)
-            ->raw('])) { $_')
-            ->raw($name)
-            ->raw('_ = $context[')
-            ->repr($name)
-            ->raw(']; } else { $_')
-            ->raw($name)
-            ->raw("_ = null; }\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_SetTemp', 'Twig\Node\SetTempNode', false);
diff --git a/inc/lib/Twig/Node/Spaceless.php b/inc/lib/Twig/Node/Spaceless.php
deleted file mode 100644
index 76f90cde..00000000
--- a/inc/lib/Twig/Node/Spaceless.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a spaceless node.
- *
- * It removes spaces between HTML tags.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Spaceless extends Twig_Node
-{
-    public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless')
-    {
-        parent::__construct(array('body' => $body), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write("ob_start();\n")
-            ->subcompile($this->getNode('body'))
-            ->write("echo trim(preg_replace('/>\s+</', '><', ob_get_clean()));\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Spaceless', 'Twig\Node\SpacelessNode', false);
diff --git a/inc/lib/Twig/Node/Text.php b/inc/lib/Twig/Node/Text.php
deleted file mode 100644
index f4577fee..00000000
--- a/inc/lib/Twig/Node/Text.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a text node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($data, $lineno)
-    {
-        parent::__construct(array(), array('data' => $data), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('echo ')
-            ->string($this->getAttribute('data'))
-            ->raw(";\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_Text', 'Twig\Node\TextNode', false);
diff --git a/inc/lib/Twig/Node/With.php b/inc/lib/Twig/Node/With.php
deleted file mode 100644
index 2ab0ea5d..00000000
--- a/inc/lib/Twig/Node/With.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a nested "with" scope.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Node_With extends Twig_Node
-{
-    public function __construct(Twig_Node $body, Twig_Node $variables = null, $only = false, $lineno, $tag = null)
-    {
-        $nodes = array('body' => $body);
-        if (null !== $variables) {
-            $nodes['variables'] = $variables;
-        }
-
-        parent::__construct($nodes, array('only' => (bool) $only), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->addDebugInfo($this);
-
-        if ($this->hasNode('variables')) {
-            $varsName = $compiler->getVarName();
-            $compiler
-                ->write(sprintf('$%s = ', $varsName))
-                ->subcompile($this->getNode('variables'))
-                ->raw(";\n")
-                ->write(sprintf("if (!is_array(\$%s)) {\n", $varsName))
-                ->indent()
-                ->write("throw new Twig_Error_Runtime('Variables passed to the \"with\" tag must be a hash.');\n")
-                ->outdent()
-                ->write("}\n")
-            ;
-
-            if ($this->getAttribute('only')) {
-                $compiler->write("\$context = array('_parent' => \$context);\n");
-            } else {
-                $compiler->write("\$context['_parent'] = \$context;\n");
-            }
-
-            $compiler->write(sprintf("\$context = array_merge(\$context, \$%s);\n", $varsName));
-        } else {
-            $compiler->write("\$context['_parent'] = \$context;\n");
-        }
-
-        $compiler
-            ->subcompile($this->getNode('body'))
-            ->write("\$context = \$context['_parent'];\n")
-        ;
-    }
-}
-
-class_alias('Twig_Node_With', 'Twig\Node\WithNode', false);
diff --git a/inc/lib/Twig/NodeCaptureInterface.php b/inc/lib/Twig/NodeCaptureInterface.php
deleted file mode 100644
index 6638834b..00000000
--- a/inc/lib/Twig/NodeCaptureInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node that captures any nested displayable nodes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeCaptureInterface
-{
-}
-
-class_alias('Twig_NodeCaptureInterface', 'Twig\Node\NodeCaptureInterface', false);
diff --git a/inc/lib/Twig/NodeInterface.php b/inc/lib/Twig/NodeInterface.php
deleted file mode 100644
index 78e758bd..00000000
--- a/inc/lib/Twig/NodeInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_NodeInterface extends Countable, IteratorAggregate
-{
-    /**
-     * Compiles the node to PHP.
-     */
-    public function compile(Twig_Compiler $compiler);
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getLine();
-
-    public function getNodeTag();
-}
diff --git a/inc/lib/Twig/NodeOutputInterface.php b/inc/lib/Twig/NodeOutputInterface.php
deleted file mode 100644
index 5a8eaa9c..00000000
--- a/inc/lib/Twig/NodeOutputInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a displayable node in the AST.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeOutputInterface
-{
-}
-
-class_alias('Twig_NodeOutputInterface', 'Twig\Node\NodeOutputInterface', false);
diff --git a/inc/lib/Twig/NodeTraverser.php b/inc/lib/Twig/NodeTraverser.php
deleted file mode 100644
index f00a0bf5..00000000
--- a/inc/lib/Twig/NodeTraverser.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeTraverser is a node traverser.
- *
- * It visits all nodes and their children and calls the given visitor for each.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeTraverser
-{
-    protected $env;
-    protected $visitors = array();
-
-    /**
-     * @param Twig_Environment            $env
-     * @param Twig_NodeVisitorInterface[] $visitors
-     */
-    public function __construct(Twig_Environment $env, array $visitors = array())
-    {
-        $this->env = $env;
-        foreach ($visitors as $visitor) {
-            $this->addVisitor($visitor);
-        }
-    }
-
-    public function addVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        if (!isset($this->visitors[$visitor->getPriority()])) {
-            $this->visitors[$visitor->getPriority()] = array();
-        }
-
-        $this->visitors[$visitor->getPriority()][] = $visitor;
-    }
-
-    /**
-     * Traverses a node and calls the registered visitors.
-     *
-     * @return Twig_NodeInterface
-     */
-    public function traverse(Twig_NodeInterface $node)
-    {
-        ksort($this->visitors);
-        foreach ($this->visitors as $visitors) {
-            foreach ($visitors as $visitor) {
-                $node = $this->traverseForVisitor($visitor, $node);
-            }
-        }
-
-        return $node;
-    }
-
-    protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
-    {
-        if (null === $node) {
-            return;
-        }
-
-        $node = $visitor->enterNode($node, $this->env);
-
-        foreach ($node as $k => $n) {
-            if (false !== $m = $this->traverseForVisitor($visitor, $n)) {
-                if ($m !== $n) {
-                    $node->setNode($k, $m);
-                }
-            } else {
-                $node->removeNode($k);
-            }
-        }
-
-        return $visitor->leaveNode($node, $this->env);
-    }
-}
-
-class_alias('Twig_NodeTraverser', 'Twig\NodeTraverser', false);
diff --git a/inc/lib/Twig/NodeVisitor/Escaper.php b/inc/lib/Twig/NodeVisitor/Escaper.php
deleted file mode 100644
index 1a1ae66f..00000000
--- a/inc/lib/Twig/NodeVisitor/Escaper.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Escaper implements output escaping.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
-{
-    protected $statusStack = array();
-    protected $blocks = array();
-    protected $safeAnalysis;
-    protected $traverser;
-    protected $defaultStrategy = false;
-    protected $safeVars = array();
-
-    public function __construct()
-    {
-        $this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
-    }
-
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            if ($env->hasExtension('Twig_Extension_Escaper') && $defaultStrategy = $env->getExtension('Twig_Extension_Escaper')->getDefaultStrategy($node->getTemplateName())) {
-                $this->defaultStrategy = $defaultStrategy;
-            }
-            $this->safeVars = array();
-            $this->blocks = array();
-        } elseif ($node instanceof Twig_Node_AutoEscape) {
-            $this->statusStack[] = $node->getAttribute('value');
-        } elseif ($node instanceof Twig_Node_Block) {
-            $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ? $this->blocks[$node->getAttribute('name')] : $this->needEscaping($env);
-        } elseif ($node instanceof Twig_Node_Import) {
-            $this->safeVars[] = $node->getNode('var')->getAttribute('name');
-        }
-
-        return $node;
-    }
-
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->defaultStrategy = false;
-            $this->safeVars = array();
-            $this->blocks = array();
-        } elseif ($node instanceof Twig_Node_Expression_Filter) {
-            return $this->preEscapeFilterNode($node, $env);
-        } elseif ($node instanceof Twig_Node_Print) {
-            return $this->escapePrintNode($node, $env, $this->needEscaping($env));
-        }
-
-        if ($node instanceof Twig_Node_AutoEscape || $node instanceof Twig_Node_Block) {
-            array_pop($this->statusStack);
-        } elseif ($node instanceof Twig_Node_BlockReference) {
-            $this->blocks[$node->getAttribute('name')] = $this->needEscaping($env);
-        }
-
-        return $node;
-    }
-
-    protected function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type)
-    {
-        if (false === $type) {
-            return $node;
-        }
-
-        $expression = $node->getNode('expr');
-
-        if ($this->isSafeFor($type, $expression, $env)) {
-            return $node;
-        }
-
-        $class = get_class($node);
-
-        return new $class(
-            $this->getEscaperFilter($type, $expression),
-            $node->getTemplateLine()
-        );
-    }
-
-    protected function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env)
-    {
-        $name = $filter->getNode('filter')->getAttribute('value');
-
-        $type = $env->getFilter($name)->getPreEscape();
-        if (null === $type) {
-            return $filter;
-        }
-
-        $node = $filter->getNode('node');
-        if ($this->isSafeFor($type, $node, $env)) {
-            return $filter;
-        }
-
-        $filter->setNode('node', $this->getEscaperFilter($type, $node));
-
-        return $filter;
-    }
-
-    protected function isSafeFor($type, Twig_NodeInterface $expression, $env)
-    {
-        $safe = $this->safeAnalysis->getSafe($expression);
-
-        if (null === $safe) {
-            if (null === $this->traverser) {
-                $this->traverser = new Twig_NodeTraverser($env, array($this->safeAnalysis));
-            }
-
-            $this->safeAnalysis->setSafeVars($this->safeVars);
-
-            $this->traverser->traverse($expression);
-            $safe = $this->safeAnalysis->getSafe($expression);
-        }
-
-        return in_array($type, $safe) || in_array('all', $safe);
-    }
-
-    protected function needEscaping(Twig_Environment $env)
-    {
-        if (count($this->statusStack)) {
-            return $this->statusStack[count($this->statusStack) - 1];
-        }
-
-        return $this->defaultStrategy ? $this->defaultStrategy : false;
-    }
-
-    protected function getEscaperFilter($type, Twig_NodeInterface $node)
-    {
-        $line = $node->getTemplateLine();
-        $name = new Twig_Node_Expression_Constant('escape', $line);
-        $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line)));
-
-        return new Twig_Node_Expression_Filter($node, $name, $args, $line);
-    }
-
-    public function getPriority()
-    {
-        return 0;
-    }
-}
-
-class_alias('Twig_NodeVisitor_Escaper', 'Twig\NodeVisitor\EscaperNodeVisitor', false);
diff --git a/inc/lib/Twig/NodeVisitor/Optimizer.php b/inc/lib/Twig/NodeVisitor/Optimizer.php
deleted file mode 100644
index c55e40ff..00000000
--- a/inc/lib/Twig/NodeVisitor/Optimizer.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Optimizer tries to optimizes the AST.
- *
- * This visitor is always the last registered one.
- *
- * You can configure which optimizations you want to activate via the
- * optimizer mode.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
-{
-    const OPTIMIZE_ALL = -1;
-    const OPTIMIZE_NONE = 0;
-    const OPTIMIZE_FOR = 2;
-    const OPTIMIZE_RAW_FILTER = 4;
-    const OPTIMIZE_VAR_ACCESS = 8;
-
-    protected $loops = array();
-    protected $loopsTargets = array();
-    protected $optimizers;
-    protected $prependedNodes = array();
-    protected $inABody = false;
-
-    /**
-     * @param int $optimizers The optimizer mode
-     */
-    public function __construct($optimizers = -1)
-    {
-        if (!is_int($optimizers) || $optimizers > (self::OPTIMIZE_FOR | self::OPTIMIZE_RAW_FILTER | self::OPTIMIZE_VAR_ACCESS)) {
-            throw new InvalidArgumentException(sprintf('Optimizer mode "%s" is not valid.', $optimizers));
-        }
-
-        $this->optimizers = $optimizers;
-    }
-
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->enterOptimizeFor($node, $env);
-        }
-
-        if (PHP_VERSION_ID < 50400 && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
-            if ($this->inABody) {
-                if (!$node instanceof Twig_Node_Expression) {
-                    if ('Twig_Node' !== get_class($node)) {
-                        array_unshift($this->prependedNodes, array());
-                    }
-                } else {
-                    $node = $this->optimizeVariables($node, $env);
-                }
-            } elseif ($node instanceof Twig_Node_Body) {
-                $this->inABody = true;
-            }
-        }
-
-        return $node;
-    }
-
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        $expression = $node instanceof Twig_Node_Expression;
-
-        if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) {
-            $this->leaveOptimizeFor($node, $env);
-        }
-
-        if (self::OPTIMIZE_RAW_FILTER === (self::OPTIMIZE_RAW_FILTER & $this->optimizers)) {
-            $node = $this->optimizeRawFilter($node, $env);
-        }
-
-        $node = $this->optimizePrintNode($node, $env);
-
-        if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('Twig_Extension_Sandbox')) {
-            if ($node instanceof Twig_Node_Body) {
-                $this->inABody = false;
-            } elseif ($this->inABody) {
-                if (!$expression && 'Twig_Node' !== get_class($node) && $prependedNodes = array_shift($this->prependedNodes)) {
-                    $nodes = array();
-                    foreach (array_unique($prependedNodes) as $name) {
-                        $nodes[] = new Twig_Node_SetTemp($name, $node->getTemplateLine());
-                    }
-
-                    $nodes[] = $node;
-                    $node = new Twig_Node($nodes);
-                }
-            }
-        }
-
-        return $node;
-    }
-
-    protected function optimizeVariables(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ('Twig_Node_Expression_Name' === get_class($node) && $node->isSimple()) {
-            $this->prependedNodes[0][] = $node->getAttribute('name');
-
-            return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getTemplateLine());
-        }
-
-        return $node;
-    }
-
-    /**
-     * Optimizes print nodes.
-     *
-     * It replaces:
-     *
-     *   * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()"
-     *
-     * @return Twig_NodeInterface
-     */
-    protected function optimizePrintNode(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if (!$node instanceof Twig_Node_Print) {
-            return $node;
-        }
-
-        $exprNode = $node->getNode('expr');
-        if (
-            $exprNode instanceof Twig_Node_Expression_BlockReference ||
-            $exprNode instanceof Twig_Node_Expression_Parent
-        ) {
-            $exprNode->setAttribute('output', true);
-
-            return $exprNode;
-        }
-
-        return $node;
-    }
-
-    /**
-     * Removes "raw" filters.
-     *
-     * @return Twig_NodeInterface
-     */
-    protected function optimizeRawFilter(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Filter && 'raw' == $node->getNode('filter')->getAttribute('value')) {
-            return $node->getNode('node');
-        }
-
-        return $node;
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     */
-    protected function enterOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            // disable the loop variable by default
-            $node->setAttribute('with_loop', false);
-            array_unshift($this->loops, $node);
-            array_unshift($this->loopsTargets, $node->getNode('value_target')->getAttribute('name'));
-            array_unshift($this->loopsTargets, $node->getNode('key_target')->getAttribute('name'));
-        } elseif (!$this->loops) {
-            // we are outside a loop
-            return;
-        }
-
-        // when do we need to add the loop variable back?
-
-        // the loop variable is referenced for the current loop
-        elseif ($node instanceof Twig_Node_Expression_Name && 'loop' === $node->getAttribute('name')) {
-            $node->setAttribute('always_defined', true);
-            $this->addLoopToCurrent();
-        }
-
-        // optimize access to loop targets
-        elseif ($node instanceof Twig_Node_Expression_Name && in_array($node->getAttribute('name'), $this->loopsTargets)) {
-            $node->setAttribute('always_defined', true);
-        }
-
-        // block reference
-        elseif ($node instanceof Twig_Node_BlockReference || $node instanceof Twig_Node_Expression_BlockReference) {
-            $this->addLoopToCurrent();
-        }
-
-        // include without the only attribute
-        elseif ($node instanceof Twig_Node_Include && !$node->getAttribute('only')) {
-            $this->addLoopToAll();
-        }
-
-        // include function without the with_context=false parameter
-        elseif ($node instanceof Twig_Node_Expression_Function
-            && 'include' === $node->getAttribute('name')
-            && (!$node->getNode('arguments')->hasNode('with_context')
-                 || false !== $node->getNode('arguments')->getNode('with_context')->getAttribute('value')
-               )
-        ) {
-            $this->addLoopToAll();
-        }
-
-        // the loop variable is referenced via an attribute
-        elseif ($node instanceof Twig_Node_Expression_GetAttr
-            && (!$node->getNode('attribute') instanceof Twig_Node_Expression_Constant
-                || 'parent' === $node->getNode('attribute')->getAttribute('value')
-               )
-            && (true === $this->loops[0]->getAttribute('with_loop')
-                || ($node->getNode('node') instanceof Twig_Node_Expression_Name
-                    && 'loop' === $node->getNode('node')->getAttribute('name')
-                   )
-               )
-        ) {
-            $this->addLoopToAll();
-        }
-    }
-
-    /**
-     * Optimizes "for" tag by removing the "loop" variable creation whenever possible.
-     */
-    protected function leaveOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_For) {
-            array_shift($this->loops);
-            array_shift($this->loopsTargets);
-            array_shift($this->loopsTargets);
-        }
-    }
-
-    protected function addLoopToCurrent()
-    {
-        $this->loops[0]->setAttribute('with_loop', true);
-    }
-
-    protected function addLoopToAll()
-    {
-        foreach ($this->loops as $loop) {
-            $loop->setAttribute('with_loop', true);
-        }
-    }
-
-    public function getPriority()
-    {
-        return 255;
-    }
-}
-
-class_alias('Twig_NodeVisitor_Optimizer', 'Twig\NodeVisitor\OptimizerNodeVisitor', false);
diff --git a/inc/lib/Twig/NodeVisitor/SafeAnalysis.php b/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
deleted file mode 100644
index ca31c8fc..00000000
--- a/inc/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @final
- */
-class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
-{
-    protected $data = array();
-    protected $safeVars = array();
-
-    public function setSafeVars($safeVars)
-    {
-        $this->safeVars = $safeVars;
-    }
-
-    public function getSafe(Twig_NodeInterface $node)
-    {
-        $hash = spl_object_hash($node);
-        if (!isset($this->data[$hash])) {
-            return;
-        }
-
-        foreach ($this->data[$hash] as $bucket) {
-            if ($bucket['key'] !== $node) {
-                continue;
-            }
-
-            if (in_array('html_attr', $bucket['value'])) {
-                $bucket['value'][] = 'html';
-            }
-
-            return $bucket['value'];
-        }
-    }
-
-    protected function setSafe(Twig_NodeInterface $node, array $safe)
-    {
-        $hash = spl_object_hash($node);
-        if (isset($this->data[$hash])) {
-            foreach ($this->data[$hash] as &$bucket) {
-                if ($bucket['key'] === $node) {
-                    $bucket['value'] = $safe;
-
-                    return;
-                }
-            }
-        }
-        $this->data[$hash][] = array(
-            'key' => $node,
-            'value' => $safe,
-        );
-    }
-
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        return $node;
-    }
-
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Expression_Constant) {
-            // constants are marked safe for all
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_BlockReference) {
-            // blocks are safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Parent) {
-            // parent block is safe by definition
-            $this->setSafe($node, array('all'));
-        } elseif ($node instanceof Twig_Node_Expression_Conditional) {
-            // intersect safeness of both operands
-            $safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3')));
-            $this->setSafe($node, $safe);
-        } elseif ($node instanceof Twig_Node_Expression_Filter) {
-            // filter expression is safe when the filter is safe
-            $name = $node->getNode('filter')->getAttribute('value');
-            $args = $node->getNode('arguments');
-            if (false !== $filter = $env->getFilter($name)) {
-                $safe = $filter->getSafe($args);
-                if (null === $safe) {
-                    $safe = $this->intersectSafe($this->getSafe($node->getNode('node')), $filter->getPreservesSafety());
-                }
-                $this->setSafe($node, $safe);
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_Function) {
-            // function expression is safe when the function is safe
-            $name = $node->getAttribute('name');
-            $args = $node->getNode('arguments');
-            $function = $env->getFunction($name);
-            if (false !== $function) {
-                $this->setSafe($node, $function->getSafe($args));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_MethodCall) {
-            if ($node->getAttribute('safe')) {
-                $this->setSafe($node, array('all'));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } elseif ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name) {
-            $name = $node->getNode('node')->getAttribute('name');
-            // attributes on template instances are safe
-            if ('_self' == $name || in_array($name, $this->safeVars)) {
-                $this->setSafe($node, array('all'));
-            } else {
-                $this->setSafe($node, array());
-            }
-        } else {
-            $this->setSafe($node, array());
-        }
-
-        return $node;
-    }
-
-    protected function intersectSafe(array $a = null, array $b = null)
-    {
-        if (null === $a || null === $b) {
-            return array();
-        }
-
-        if (in_array('all', $a)) {
-            return $b;
-        }
-
-        if (in_array('all', $b)) {
-            return $a;
-        }
-
-        return array_intersect($a, $b);
-    }
-
-    public function getPriority()
-    {
-        return 0;
-    }
-}
-
-class_alias('Twig_NodeVisitor_SafeAnalysis', 'Twig\NodeVisitor\SafeAnalysisNodeVisitor', false);
diff --git a/inc/lib/Twig/NodeVisitor/Sandbox.php b/inc/lib/Twig/NodeVisitor/Sandbox.php
deleted file mode 100644
index 71aa4f02..00000000
--- a/inc/lib/Twig/NodeVisitor/Sandbox.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitor_Sandbox implements sandboxing.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
-{
-    protected $inAModule = false;
-    protected $tags;
-    protected $filters;
-    protected $functions;
-
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = true;
-            $this->tags = array();
-            $this->filters = array();
-            $this->functions = array();
-
-            return $node;
-        } elseif ($this->inAModule) {
-            // look for tags
-            if ($node->getNodeTag() && !isset($this->tags[$node->getNodeTag()])) {
-                $this->tags[$node->getNodeTag()] = $node;
-            }
-
-            // look for filters
-            if ($node instanceof Twig_Node_Expression_Filter && !isset($this->filters[$node->getNode('filter')->getAttribute('value')])) {
-                $this->filters[$node->getNode('filter')->getAttribute('value')] = $node;
-            }
-
-            // look for functions
-            if ($node instanceof Twig_Node_Expression_Function && !isset($this->functions[$node->getAttribute('name')])) {
-                $this->functions[$node->getAttribute('name')] = $node;
-            }
-
-            // the .. operator is equivalent to the range() function
-            if ($node instanceof Twig_Node_Expression_Binary_Range && !isset($this->functions['range'])) {
-                $this->functions['range'] = $node;
-            }
-
-            // wrap print to check __toString() calls
-            if ($node instanceof Twig_Node_Print) {
-                return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getTemplateLine(), $node->getNodeTag());
-            }
-        }
-
-        return $node;
-    }
-
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $this->inAModule = false;
-
-            $node->setNode('display_start', new Twig_Node(array(new Twig_Node_CheckSecurity($this->filters, $this->tags, $this->functions), $node->getNode('display_start'))));
-        }
-
-        return $node;
-    }
-
-    public function getPriority()
-    {
-        return 0;
-    }
-}
-
-class_alias('Twig_NodeVisitor_Sandbox', 'Twig\NodeVisitor\SandboxNodeVisitor', false);
diff --git a/inc/lib/Twig/NodeVisitorInterface.php b/inc/lib/Twig/NodeVisitorInterface.php
deleted file mode 100644
index 1270a372..00000000
--- a/inc/lib/Twig/NodeVisitorInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Twig_NodeVisitorInterface is the interface the all node visitor classes must implement.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_NodeVisitorInterface
-{
-    /**
-     * Called before child nodes are visited.
-     *
-     * @return Twig_NodeInterface The modified node
-     */
-    public function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Called after child nodes are visited.
-     *
-     * @return Twig_NodeInterface|false The modified node or false if the node must be removed
-     */
-    public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
-
-    /**
-     * Returns the priority for this visitor.
-     *
-     * Priority should be between -10 and 10 (0 is the default).
-     *
-     * @return int The priority level
-     */
-    public function getPriority();
-}
-
-class_alias('Twig_NodeVisitorInterface', 'Twig\NodeVisitor\NodeVisitorInterface', false);
-class_exists('Twig_Environment');
-class_exists('Twig_Node');
diff --git a/inc/lib/Twig/Parser.php b/inc/lib/Twig/Parser.php
deleted file mode 100644
index 6de879a5..00000000
--- a/inc/lib/Twig/Parser.php
+++ /dev/null
@@ -1,412 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default parser implementation.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Parser implements Twig_ParserInterface
-{
-    protected $stack = array();
-    protected $stream;
-    protected $parent;
-    protected $handlers;
-    protected $visitors;
-    protected $expressionParser;
-    protected $blocks;
-    protected $blockStack;
-    protected $macros;
-    protected $env;
-    protected $reservedMacroNames;
-    protected $importedSymbols;
-    protected $traits;
-    protected $embeddedTemplates = array();
-    private $varNameSalt = 0;
-
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getEnvironment()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-        return $this->env;
-    }
-
-    public function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', __METHOD__.$this->stream->getSourceContext()->getCode().$this->varNameSalt++));
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0). Use $parser->getStream()->getSourceContext()->getPath() instead.
-     */
-    public function getFilename()
-    {
-        @trigger_error(sprintf('The "%s" method is deprecated since version 1.27 and will be removed in 2.0. Use $parser->getStream()->getSourceContext()->getPath() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->stream->getSourceContext()->getName();
-    }
-
-    public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false)
-    {
-        // push all variables into the stack to keep the current state of the parser
-        // using get_object_vars() instead of foreach would lead to https://bugs.php.net/71336
-        // This hack can be removed when min version if PHP 7.0
-        $vars = array();
-        foreach ($this as $k => $v) {
-            $vars[$k] = $v;
-        }
-
-        unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser'], $vars['reservedMacroNames']);
-        $this->stack[] = $vars;
-
-        // tag handlers
-        if (null === $this->handlers) {
-            $this->handlers = $this->env->getTokenParsers();
-            $this->handlers->setParser($this);
-        }
-
-        // node visitors
-        if (null === $this->visitors) {
-            $this->visitors = $this->env->getNodeVisitors();
-        }
-
-        if (null === $this->expressionParser) {
-            $this->expressionParser = new Twig_ExpressionParser($this, $this->env);
-        }
-
-        $this->stream = $stream;
-        $this->parent = null;
-        $this->blocks = array();
-        $this->macros = array();
-        $this->traits = array();
-        $this->blockStack = array();
-        $this->importedSymbols = array(array());
-        $this->embeddedTemplates = array();
-        $this->varNameSalt = 0;
-
-        try {
-            $body = $this->subparse($test, $dropNeedle);
-
-            if (null !== $this->parent && null === $body = $this->filterBodyNodes($body)) {
-                $body = new Twig_Node();
-            }
-        } catch (Twig_Error_Syntax $e) {
-            if (!$e->getSourceContext()) {
-                $e->setSourceContext($this->stream->getSourceContext());
-            }
-
-            if (!$e->getTemplateLine()) {
-                $e->setTemplateLine($this->stream->getCurrent()->getLine());
-            }
-
-            throw $e;
-        }
-
-        $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $stream->getSourceContext());
-
-        $traverser = new Twig_NodeTraverser($this->env, $this->visitors);
-
-        $node = $traverser->traverse($node);
-
-        // restore previous stack so previous parse() call can resume working
-        foreach (array_pop($this->stack) as $key => $val) {
-            $this->$key = $val;
-        }
-
-        return $node;
-    }
-
-    public function subparse($test, $dropNeedle = false)
-    {
-        $lineno = $this->getCurrentToken()->getLine();
-        $rv = array();
-        while (!$this->stream->isEOF()) {
-            switch ($this->getCurrentToken()->getType()) {
-                case Twig_Token::TEXT_TYPE:
-                    $token = $this->stream->next();
-                    $rv[] = new Twig_Node_Text($token->getValue(), $token->getLine());
-                    break;
-
-                case Twig_Token::VAR_START_TYPE:
-                    $token = $this->stream->next();
-                    $expr = $this->expressionParser->parseExpression();
-                    $this->stream->expect(Twig_Token::VAR_END_TYPE);
-                    $rv[] = new Twig_Node_Print($expr, $token->getLine());
-                    break;
-
-                case Twig_Token::BLOCK_START_TYPE:
-                    $this->stream->next();
-                    $token = $this->getCurrentToken();
-
-                    if (Twig_Token::NAME_TYPE !== $token->getType()) {
-                        throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext());
-                    }
-
-                    if (null !== $test && call_user_func($test, $token)) {
-                        if ($dropNeedle) {
-                            $this->stream->next();
-                        }
-
-                        if (1 === count($rv)) {
-                            return $rv[0];
-                        }
-
-                        return new Twig_Node($rv, array(), $lineno);
-                    }
-
-                    $subparser = $this->handlers->getTokenParser($token->getValue());
-                    if (null === $subparser) {
-                        if (null !== $test) {
-                            $e = new Twig_Error_Syntax(sprintf('Unexpected "%s" tag', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
-
-                            if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {
-                                $e->appendMessage(sprintf(' (expecting closing tag for the "%s" tag defined near line %s).', $test[0]->getTag(), $lineno));
-                            }
-                        } else {
-                            $e = new Twig_Error_Syntax(sprintf('Unknown "%s" tag.', $token->getValue()), $token->getLine(), $this->stream->getSourceContext());
-                            $e->addSuggestions($token->getValue(), array_keys($this->env->getTags()));
-                        }
-
-                        throw $e;
-                    }
-
-                    $this->stream->next();
-
-                    $node = $subparser->parse($token);
-                    if (null !== $node) {
-                        $rv[] = $node;
-                    }
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', $this->getCurrentToken()->getLine(), $this->stream->getSourceContext());
-            }
-        }
-
-        if (1 === count($rv)) {
-            return $rv[0];
-        }
-
-        return new Twig_Node($rv, array(), $lineno);
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function addHandler($name, $class)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-        $this->handlers[$name] = $class;
-    }
-
-    /**
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-        $this->visitors[] = $visitor;
-    }
-
-    public function getBlockStack()
-    {
-        return $this->blockStack;
-    }
-
-    public function peekBlockStack()
-    {
-        return $this->blockStack[count($this->blockStack) - 1];
-    }
-
-    public function popBlockStack()
-    {
-        array_pop($this->blockStack);
-    }
-
-    public function pushBlockStack($name)
-    {
-        $this->blockStack[] = $name;
-    }
-
-    public function hasBlock($name)
-    {
-        return isset($this->blocks[$name]);
-    }
-
-    public function getBlock($name)
-    {
-        return $this->blocks[$name];
-    }
-
-    public function setBlock($name, Twig_Node_Block $value)
-    {
-        $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getTemplateLine());
-    }
-
-    public function hasMacro($name)
-    {
-        return isset($this->macros[$name]);
-    }
-
-    public function setMacro($name, Twig_Node_Macro $node)
-    {
-        if ($this->isReservedMacroName($name)) {
-            throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword.', $name), $node->getTemplateLine(), $this->stream->getSourceContext());
-        }
-
-        $this->macros[$name] = $node;
-    }
-
-    public function isReservedMacroName($name)
-    {
-        if (null === $this->reservedMacroNames) {
-            $this->reservedMacroNames = array();
-            $r = new ReflectionClass($this->env->getBaseTemplateClass());
-            foreach ($r->getMethods() as $method) {
-                $methodName = strtolower($method->getName());
-
-                if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) {
-                    $this->reservedMacroNames[] = substr($methodName, 3);
-                }
-            }
-        }
-
-        return in_array(strtolower($name), $this->reservedMacroNames);
-    }
-
-    public function addTrait($trait)
-    {
-        $this->traits[] = $trait;
-    }
-
-    public function hasTraits()
-    {
-        return count($this->traits) > 0;
-    }
-
-    public function embedTemplate(Twig_Node_Module $template)
-    {
-        $template->setIndex(mt_rand());
-
-        $this->embeddedTemplates[] = $template;
-    }
-
-    public function addImportedSymbol($type, $alias, $name = null, Twig_Node_Expression $node = null)
-    {
-        $this->importedSymbols[0][$type][$alias] = array('name' => $name, 'node' => $node);
-    }
-
-    public function getImportedSymbol($type, $alias)
-    {
-        foreach ($this->importedSymbols as $functions) {
-            if (isset($functions[$type][$alias])) {
-                return $functions[$type][$alias];
-            }
-        }
-    }
-
-    public function isMainScope()
-    {
-        return 1 === count($this->importedSymbols);
-    }
-
-    public function pushLocalScope()
-    {
-        array_unshift($this->importedSymbols, array());
-    }
-
-    public function popLocalScope()
-    {
-        array_shift($this->importedSymbols);
-    }
-
-    /**
-     * @return Twig_ExpressionParser
-     */
-    public function getExpressionParser()
-    {
-        return $this->expressionParser;
-    }
-
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    public function setParent($parent)
-    {
-        $this->parent = $parent;
-    }
-
-    /**
-     * @return Twig_TokenStream
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * @return Twig_Token
-     */
-    public function getCurrentToken()
-    {
-        return $this->stream->getCurrent();
-    }
-
-    protected function filterBodyNodes(Twig_NodeInterface $node)
-    {
-        // check that the body does not contain non-empty output nodes
-        if (
-            ($node instanceof Twig_Node_Text && !ctype_space($node->getAttribute('data')))
-            ||
-            (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface)
-        ) {
-            if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) {
-                throw new Twig_Error_Syntax('A template that extends another one cannot start with a byte order mark (BOM); it must be removed.', $node->getTemplateLine(), $this->stream->getSourceContext());
-            }
-
-            throw new Twig_Error_Syntax('A template that extends another one cannot include content outside Twig blocks. Did you forget to put the content inside a {% block %} tag?', $node->getTemplateLine(), $this->stream->getSourceContext());
-        }
-
-        // bypass nodes that will "capture" the output
-        if ($node instanceof Twig_NodeCaptureInterface) {
-            return $node;
-        }
-
-        if ($node instanceof Twig_NodeOutputInterface) {
-            return;
-        }
-
-        foreach ($node as $k => $n) {
-            if (null !== $n && null === $this->filterBodyNodes($n)) {
-                $node->removeNode($k);
-            }
-        }
-
-        return $node;
-    }
-}
-
-class_alias('Twig_Parser', 'Twig\Parser', false);
-class_exists('Twig_Node');
-class_exists('Twig_TokenStream');
diff --git a/inc/lib/Twig/ParserInterface.php b/inc/lib/Twig/ParserInterface.php
deleted file mode 100644
index 85c6e67b..00000000
--- a/inc/lib/Twig/ParserInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by parser classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_ParserInterface
-{
-    /**
-     * Converts a token stream to a node tree.
-     *
-     * @return Twig_Node_Module
-     *
-     * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
-     */
-    public function parse(Twig_TokenStream $stream);
-}
diff --git a/inc/lib/Twig/Profiler/Dumper/Base.php b/inc/lib/Twig/Profiler/Dumper/Base.php
deleted file mode 100644
index 913afd4f..00000000
--- a/inc/lib/Twig/Profiler/Dumper/Base.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_Profiler_Dumper_Base
-{
-    private $root;
-
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        return $this->dumpProfile($profile);
-    }
-
-    abstract protected function formatTemplate(Twig_Profiler_Profile $profile, $prefix);
-
-    abstract protected function formatNonTemplate(Twig_Profiler_Profile $profile, $prefix);
-
-    abstract protected function formatTime(Twig_Profiler_Profile $profile, $percent);
-
-    private function dumpProfile(Twig_Profiler_Profile $profile, $prefix = '', $sibling = false)
-    {
-        if ($profile->isRoot()) {
-            $this->root = $profile->getDuration();
-            $start = $profile->getName();
-        } else {
-            if ($profile->isTemplate()) {
-                $start = $this->formatTemplate($profile, $prefix);
-            } else {
-                $start = $this->formatNonTemplate($profile, $prefix);
-            }
-            $prefix .= $sibling ? '│ ' : '  ';
-        }
-
-        $percent = $this->root ? $profile->getDuration() / $this->root * 100 : 0;
-
-        if ($profile->getDuration() * 1000 < 1) {
-            $str = $start."\n";
-        } else {
-            $str = sprintf("%s %s\n", $start, $this->formatTime($profile, $percent));
-        }
-
-        $nCount = count($profile->getProfiles());
-        foreach ($profile as $i => $p) {
-            $str .= $this->dumpProfile($p, $prefix, $i + 1 !== $nCount);
-        }
-
-        return $str;
-    }
-}
-
-class_alias('Twig_Profiler_Dumper_Base', 'Twig\Profiler\Dumper\BaseDumper', false);
-class_exists('Twig_Profiler_Profile');
diff --git a/inc/lib/Twig/Profiler/Dumper/Blackfire.php b/inc/lib/Twig/Profiler/Dumper/Blackfire.php
deleted file mode 100644
index 7a33baf2..00000000
--- a/inc/lib/Twig/Profiler/Dumper/Blackfire.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Profiler_Dumper_Blackfire
-{
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        $data = array();
-        $this->dumpProfile('main()', $profile, $data);
-        $this->dumpChildren('main()', $profile, $data);
-
-        $start = sprintf('%f', microtime(true));
-        $str = <<<EOF
-file-format: BlackfireProbe
-cost-dimensions: wt mu pmu
-request-start: {$start}
-
-
-EOF;
-
-        foreach ($data as $name => $values) {
-            $str .= "{$name}//{$values['ct']} {$values['wt']} {$values['mu']} {$values['pmu']}\n";
-        }
-
-        return $str;
-    }
-
-    private function dumpChildren($parent, Twig_Profiler_Profile $profile, &$data)
-    {
-        foreach ($profile as $p) {
-            if ($p->isTemplate()) {
-                $name = $p->getTemplate();
-            } else {
-                $name = sprintf('%s::%s(%s)', $p->getTemplate(), $p->getType(), $p->getName());
-            }
-            $this->dumpProfile(sprintf('%s==>%s', $parent, $name), $p, $data);
-            $this->dumpChildren($name, $p, $data);
-        }
-    }
-
-    private function dumpProfile($edge, Twig_Profiler_Profile $profile, &$data)
-    {
-        if (isset($data[$edge])) {
-            $data[$edge]['ct'] += 1;
-            $data[$edge]['wt'] += floor($profile->getDuration() * 1000000);
-            $data[$edge]['mu'] += $profile->getMemoryUsage();
-            $data[$edge]['pmu'] += $profile->getPeakMemoryUsage();
-        } else {
-            $data[$edge] = array(
-                'ct' => 1,
-                'wt' => floor($profile->getDuration() * 1000000),
-                'mu' => $profile->getMemoryUsage(),
-                'pmu' => $profile->getPeakMemoryUsage(),
-            );
-        }
-    }
-}
-
-class_alias('Twig_Profiler_Dumper_Blackfire', 'Twig\Profiler\Dumper\BlackfireDumper', false);
diff --git a/inc/lib/Twig/Profiler/Dumper/Html.php b/inc/lib/Twig/Profiler/Dumper/Html.php
deleted file mode 100644
index b57a2551..00000000
--- a/inc/lib/Twig/Profiler/Dumper/Html.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Base
-{
-    private static $colors = array(
-        'block' => '#dfd',
-        'macro' => '#ddf',
-        'template' => '#ffd',
-        'big' => '#d44',
-    );
-
-    public function dump(Twig_Profiler_Profile $profile)
-    {
-        return '<pre>'.parent::dump($profile).'</pre>';
-    }
-
-    protected function formatTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ <span style="background-color: %s">%s</span>', $prefix, self::$colors['template'], $profile->getTemplate());
-    }
-
-    protected function formatNonTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s::%s(<span style="background-color: %s">%s</span>)', $prefix, $profile->getTemplate(), $profile->getType(), isset(self::$colors[$profile->getType()]) ? self::$colors[$profile->getType()] : 'auto', $profile->getName());
-    }
-
-    protected function formatTime(Twig_Profiler_Profile $profile, $percent)
-    {
-        return sprintf('<span style="color: %s">%.2fms/%.0f%%</span>', $percent > 20 ? self::$colors['big'] : 'auto', $profile->getDuration() * 1000, $percent);
-    }
-}
-
-class_alias('Twig_Profiler_Dumper_Html', 'Twig\Profiler\Dumper\HtmlDumper', false);
diff --git a/inc/lib/Twig/Profiler/Dumper/Text.php b/inc/lib/Twig/Profiler/Dumper/Text.php
deleted file mode 100644
index 69d2c4bf..00000000
--- a/inc/lib/Twig/Profiler/Dumper/Text.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Profiler_Dumper_Text extends Twig_Profiler_Dumper_Base
-{
-    protected function formatTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s', $prefix, $profile->getTemplate());
-    }
-
-    protected function formatNonTemplate(Twig_Profiler_Profile $profile, $prefix)
-    {
-        return sprintf('%s└ %s::%s(%s)', $prefix, $profile->getTemplate(), $profile->getType(), $profile->getName());
-    }
-
-    protected function formatTime(Twig_Profiler_Profile $profile, $percent)
-    {
-        return sprintf('%.2fms/%.0f%%', $profile->getDuration() * 1000, $percent);
-    }
-}
-
-class_alias('Twig_Profiler_Dumper_Text', 'Twig\Profiler\Dumper\TextDumper', false);
diff --git a/inc/lib/Twig/Profiler/Node/EnterProfile.php b/inc/lib/Twig/Profiler/Node/EnterProfile.php
deleted file mode 100644
index 69c8f797..00000000
--- a/inc/lib/Twig/Profiler/Node/EnterProfile.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a profile enter node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Node_EnterProfile extends Twig_Node
-{
-    public function __construct($extensionName, $type, $name, $varName)
-    {
-        parent::__construct(array(), array('extension_name' => $extensionName, 'name' => $name, 'type' => $type, 'var_name' => $varName));
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write(sprintf('$%s = $this->env->getExtension(', $this->getAttribute('var_name')))
-            ->repr($this->getAttribute('extension_name'))
-            ->raw(");\n")
-            ->write(sprintf('$%s->enter($%s = new Twig_Profiler_Profile($this->getTemplateName(), ', $this->getAttribute('var_name'), $this->getAttribute('var_name').'_prof'))
-            ->repr($this->getAttribute('type'))
-            ->raw(', ')
-            ->repr($this->getAttribute('name'))
-            ->raw("));\n\n")
-        ;
-    }
-}
-
-class_alias('Twig_Profiler_Node_EnterProfile', 'Twig\Profiler\Node\EnterProfileNode', false);
diff --git a/inc/lib/Twig/Profiler/Node/LeaveProfile.php b/inc/lib/Twig/Profiler/Node/LeaveProfile.php
deleted file mode 100644
index d1d6a7cc..00000000
--- a/inc/lib/Twig/Profiler/Node/LeaveProfile.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a profile leave node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Profiler_Node_LeaveProfile extends Twig_Node
-{
-    public function __construct($varName)
-    {
-        parent::__construct(array(), array('var_name' => $varName));
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("\n")
-            ->write(sprintf("\$%s->leave(\$%s);\n\n", $this->getAttribute('var_name'), $this->getAttribute('var_name').'_prof'))
-        ;
-    }
-}
-
-class_alias('Twig_Profiler_Node_LeaveProfile', 'Twig\Profiler\Node\LeaveProfileNode', false);
diff --git a/inc/lib/Twig/Profiler/NodeVisitor/Profiler.php b/inc/lib/Twig/Profiler/NodeVisitor/Profiler.php
deleted file mode 100644
index 5db41fea..00000000
--- a/inc/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
-{
-    private $extensionName;
-
-    public function __construct($extensionName)
-    {
-        $this->extensionName = $extensionName;
-    }
-
-    protected function doEnterNode(Twig_Node $node, Twig_Environment $env)
-    {
-        return $node;
-    }
-
-    protected function doLeaveNode(Twig_Node $node, Twig_Environment $env)
-    {
-        if ($node instanceof Twig_Node_Module) {
-            $varName = $this->getVarName();
-            $node->setNode('display_start', new Twig_Node(array(new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::TEMPLATE, $node->getTemplateName(), $varName), $node->getNode('display_start'))));
-            $node->setNode('display_end', new Twig_Node(array(new Twig_Profiler_Node_LeaveProfile($varName), $node->getNode('display_end'))));
-        } elseif ($node instanceof Twig_Node_Block) {
-            $varName = $this->getVarName();
-            $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::BLOCK, $node->getAttribute('name'), $varName),
-                $node->getNode('body'),
-                new Twig_Profiler_Node_LeaveProfile($varName),
-            )));
-        } elseif ($node instanceof Twig_Node_Macro) {
-            $varName = $this->getVarName();
-            $node->setNode('body', new Twig_Node_Body(array(
-                new Twig_Profiler_Node_EnterProfile($this->extensionName, Twig_Profiler_Profile::MACRO, $node->getAttribute('name'), $varName),
-                $node->getNode('body'),
-                new Twig_Profiler_Node_LeaveProfile($varName),
-            )));
-        }
-
-        return $node;
-    }
-
-    private function getVarName()
-    {
-        return sprintf('__internal_%s', hash('sha256', $this->extensionName));
-    }
-
-    public function getPriority()
-    {
-        return 0;
-    }
-}
-
-class_alias('Twig_Profiler_NodeVisitor_Profiler', 'Twig\Profiler\NodeVisitor\ProfilerNodeVisitor', false);
diff --git a/inc/lib/Twig/Profiler/Profile.php b/inc/lib/Twig/Profiler/Profile.php
deleted file mode 100644
index 3fdc1a8a..00000000
--- a/inc/lib/Twig/Profiler/Profile.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Profiler_Profile implements IteratorAggregate, Serializable
-{
-    const ROOT = 'ROOT';
-    const BLOCK = 'block';
-    const TEMPLATE = 'template';
-    const MACRO = 'macro';
-
-    private $template;
-    private $name;
-    private $type;
-    private $starts = array();
-    private $ends = array();
-    private $profiles = array();
-
-    public function __construct($template = 'main', $type = self::ROOT, $name = 'main')
-    {
-        $this->template = $template;
-        $this->type = $type;
-        $this->name = 0 === strpos($name, '__internal_') ? 'INTERNAL' : $name;
-        $this->enter();
-    }
-
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function isRoot()
-    {
-        return self::ROOT === $this->type;
-    }
-
-    public function isTemplate()
-    {
-        return self::TEMPLATE === $this->type;
-    }
-
-    public function isBlock()
-    {
-        return self::BLOCK === $this->type;
-    }
-
-    public function isMacro()
-    {
-        return self::MACRO === $this->type;
-    }
-
-    public function getProfiles()
-    {
-        return $this->profiles;
-    }
-
-    public function addProfile(Twig_Profiler_Profile $profile)
-    {
-        $this->profiles[] = $profile;
-    }
-
-    /**
-     * Returns the duration in microseconds.
-     *
-     * @return int
-     */
-    public function getDuration()
-    {
-        if ($this->isRoot() && $this->profiles) {
-            // for the root node with children, duration is the sum of all child durations
-            $duration = 0;
-            foreach ($this->profiles as $profile) {
-                $duration += $profile->getDuration();
-            }
-
-            return $duration;
-        }
-
-        return isset($this->ends['wt']) && isset($this->starts['wt']) ? $this->ends['wt'] - $this->starts['wt'] : 0;
-    }
-
-    /**
-     * Returns the memory usage in bytes.
-     *
-     * @return int
-     */
-    public function getMemoryUsage()
-    {
-        return isset($this->ends['mu']) && isset($this->starts['mu']) ? $this->ends['mu'] - $this->starts['mu'] : 0;
-    }
-
-    /**
-     * Returns the peak memory usage in bytes.
-     *
-     * @return int
-     */
-    public function getPeakMemoryUsage()
-    {
-        return isset($this->ends['pmu']) && isset($this->starts['pmu']) ? $this->ends['pmu'] - $this->starts['pmu'] : 0;
-    }
-
-    /**
-     * Starts the profiling.
-     */
-    public function enter()
-    {
-        $this->starts = array(
-            'wt' => microtime(true),
-            'mu' => memory_get_usage(),
-            'pmu' => memory_get_peak_usage(),
-        );
-    }
-
-    /**
-     * Stops the profiling.
-     */
-    public function leave()
-    {
-        $this->ends = array(
-            'wt' => microtime(true),
-            'mu' => memory_get_usage(),
-            'pmu' => memory_get_peak_usage(),
-        );
-    }
-
-    public function reset()
-    {
-        $this->starts = $this->ends = $this->profiles = array();
-        $this->enter();
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->profiles);
-    }
-
-    public function serialize()
-    {
-        return serialize(array($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles));
-    }
-
-    public function unserialize($data)
-    {
-        list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = unserialize($data);
-    }
-}
-
-class_alias('Twig_Profiler_Profile', 'Twig\Profiler\Profile', false);
diff --git a/inc/lib/Twig/RuntimeLoaderInterface.php b/inc/lib/Twig/RuntimeLoaderInterface.php
deleted file mode 100644
index f5eb14e0..00000000
--- a/inc/lib/Twig/RuntimeLoaderInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Creates runtime implementations for Twig elements (filters/functions/tests).
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_RuntimeLoaderInterface
-{
-    /**
-     * Creates the runtime implementation of a Twig element (filter/function/test).
-     *
-     * @param string $class A runtime class
-     *
-     * @return object|null The runtime instance or null if the loader does not know how to create the runtime for this class
-     */
-    public function load($class);
-}
-
-class_alias('Twig_RuntimeLoaderInterface', 'Twig\RuntimeLoader\RuntimeLoaderInterface', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityError.php b/inc/lib/Twig/Sandbox/SecurityError.php
deleted file mode 100644
index b6707e38..00000000
--- a/inc/lib/Twig/Sandbox/SecurityError.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a security error occurs at runtime.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityError extends Twig_Error
-{
-}
-
-class_alias('Twig_Sandbox_SecurityError', 'Twig\Sandbox\SecurityError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/inc/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
deleted file mode 100644
index 0ba33276..00000000
--- a/inc/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed filter is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedFilterError extends Twig_Sandbox_SecurityError
-{
-    private $filterName;
-
-    public function __construct($message, $functionName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->filterName = $functionName;
-    }
-
-    public function getFilterName()
-    {
-        return $this->filterName;
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityNotAllowedFilterError', 'Twig\Sandbox\SecurityNotAllowedFilterError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/inc/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
deleted file mode 100644
index aa391429..00000000
--- a/inc/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed function is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedFunctionError extends Twig_Sandbox_SecurityError
-{
-    private $functionName;
-
-    public function __construct($message, $functionName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->functionName = $functionName;
-    }
-
-    public function getFunctionName()
-    {
-        return $this->functionName;
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityNotAllowedFunctionError', 'Twig\Sandbox\SecurityNotAllowedFunctionError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php b/inc/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
deleted file mode 100644
index 93012fe9..00000000
--- a/inc/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed class method is used in a template.
- *
- * @author Kit Burton-Senior <mail@kitbs.com>
- */
-class Twig_Sandbox_SecurityNotAllowedMethodError extends Twig_Sandbox_SecurityError
-{
-    private $className;
-    private $methodName;
-
-    public function __construct($message, $className, $methodName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->className = $className;
-        $this->methodName = $methodName;
-    }
-
-    public function getClassName()
-    {
-        return $this->className;
-    }
-
-    public function getMethodName()
-    {
-        return $this->methodName;
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityNotAllowedMethodError', 'Twig\Sandbox\SecurityNotAllowedMethodError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php b/inc/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
deleted file mode 100644
index f27969c1..00000000
--- a/inc/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed class property is used in a template.
- *
- * @author Kit Burton-Senior <mail@kitbs.com>
- */
-class Twig_Sandbox_SecurityNotAllowedPropertyError extends Twig_Sandbox_SecurityError
-{
-    private $className;
-    private $propertyName;
-
-    public function __construct($message, $className, $propertyName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->className = $className;
-        $this->propertyName = $propertyName;
-    }
-
-    public function getClassName()
-    {
-        return $this->className;
-    }
-
-    public function getPropertyName()
-    {
-        return $this->propertyName;
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityNotAllowedPropertyError', 'Twig\Sandbox\SecurityNotAllowedPropertyError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/inc/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
deleted file mode 100644
index 4bbd2238..00000000
--- a/inc/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exception thrown when a not allowed tag is used in a template.
- *
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class Twig_Sandbox_SecurityNotAllowedTagError extends Twig_Sandbox_SecurityError
-{
-    private $tagName;
-
-    public function __construct($message, $tagName, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        parent::__construct($message, $lineno, $filename, $previous);
-        $this->tagName = $tagName;
-    }
-
-    public function getTagName()
-    {
-        return $this->tagName;
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityNotAllowedTagError', 'Twig\Sandbox\SecurityNotAllowedTagError', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityPolicy.php b/inc/lib/Twig/Sandbox/SecurityPolicy.php
deleted file mode 100644
index dca0b82b..00000000
--- a/inc/lib/Twig/Sandbox/SecurityPolicy.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a security policy which need to be enforced when sandbox mode is enabled.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
-{
-    protected $allowedTags;
-    protected $allowedFilters;
-    protected $allowedMethods;
-    protected $allowedProperties;
-    protected $allowedFunctions;
-
-    public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array())
-    {
-        $this->allowedTags = $allowedTags;
-        $this->allowedFilters = $allowedFilters;
-        $this->setAllowedMethods($allowedMethods);
-        $this->allowedProperties = $allowedProperties;
-        $this->allowedFunctions = $allowedFunctions;
-    }
-
-    public function setAllowedTags(array $tags)
-    {
-        $this->allowedTags = $tags;
-    }
-
-    public function setAllowedFilters(array $filters)
-    {
-        $this->allowedFilters = $filters;
-    }
-
-    public function setAllowedMethods(array $methods)
-    {
-        $this->allowedMethods = array();
-        foreach ($methods as $class => $m) {
-            $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : array($m));
-        }
-    }
-
-    public function setAllowedProperties(array $properties)
-    {
-        $this->allowedProperties = $properties;
-    }
-
-    public function setAllowedFunctions(array $functions)
-    {
-        $this->allowedFunctions = $functions;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        foreach ($tags as $tag) {
-            if (!in_array($tag, $this->allowedTags)) {
-                throw new Twig_Sandbox_SecurityNotAllowedTagError(sprintf('Tag "%s" is not allowed.', $tag), $tag);
-            }
-        }
-
-        foreach ($filters as $filter) {
-            if (!in_array($filter, $this->allowedFilters)) {
-                throw new Twig_Sandbox_SecurityNotAllowedFilterError(sprintf('Filter "%s" is not allowed.', $filter), $filter);
-            }
-        }
-
-        foreach ($functions as $function) {
-            if (!in_array($function, $this->allowedFunctions)) {
-                throw new Twig_Sandbox_SecurityNotAllowedFunctionError(sprintf('Function "%s" is not allowed.', $function), $function);
-            }
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($obj instanceof Twig_TemplateInterface || $obj instanceof Twig_Markup) {
-            return true;
-        }
-
-        $allowed = false;
-        $method = strtolower($method);
-        foreach ($this->allowedMethods as $class => $methods) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($method, $methods);
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            $class = get_class($obj);
-            throw new Twig_Sandbox_SecurityNotAllowedMethodError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, $class), $class, $method);
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $property)
-    {
-        $allowed = false;
-        foreach ($this->allowedProperties as $class => $properties) {
-            if ($obj instanceof $class) {
-                $allowed = in_array($property, is_array($properties) ? $properties : array($properties));
-
-                break;
-            }
-        }
-
-        if (!$allowed) {
-            $class = get_class($obj);
-            throw new Twig_Sandbox_SecurityNotAllowedPropertyError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, $class), $class, $property);
-        }
-    }
-}
-
-class_alias('Twig_Sandbox_SecurityPolicy', 'Twig\Sandbox\SecurityPolicy', false);
diff --git a/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php b/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php
deleted file mode 100644
index 88f64447..00000000
--- a/inc/lib/Twig/Sandbox/SecurityPolicyInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interfaces that all security policy classes must implements.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_Sandbox_SecurityPolicyInterface
-{
-    public function checkSecurity($tags, $filters, $functions);
-
-    public function checkMethodAllowed($obj, $method);
-
-    public function checkPropertyAllowed($obj, $method);
-}
-
-class_alias('Twig_Sandbox_SecurityPolicyInterface', 'Twig\Sandbox\SecurityPolicyInterface', false);
diff --git a/inc/lib/Twig/SimpleFilter.php b/inc/lib/Twig/SimpleFilter.php
deleted file mode 100644
index ee4c0aeb..00000000
--- a/inc/lib/Twig/SimpleFilter.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template filter.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleFilter
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'is_variadic' => false,
-            'is_safe' => null,
-            'is_safe_callback' => null,
-            'pre_escape' => null,
-            'preserves_safety' => null,
-            'node_class' => 'Twig_Node_Expression_Filter',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (null !== $this->options['is_safe']) {
-            return $this->options['is_safe'];
-        }
-
-        if (null !== $this->options['is_safe_callback']) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-    }
-
-    public function getPreservesSafety()
-    {
-        return $this->options['preserves_safety'];
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return (bool) $this->options['deprecated'];
-    }
-
-    public function getDeprecatedVersion()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
-
-class_alias('Twig_SimpleFilter', 'Twig\TwigFilter', false);
diff --git a/inc/lib/Twig/SimpleFunction.php b/inc/lib/Twig/SimpleFunction.php
deleted file mode 100644
index a6aa7ca7..00000000
--- a/inc/lib/Twig/SimpleFunction.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template function.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleFunction
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context' => false,
-            'is_variadic' => false,
-            'is_safe' => null,
-            'is_safe_callback' => null,
-            'node_class' => 'Twig_Node_Expression_Function',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (null !== $this->options['is_safe']) {
-            return $this->options['is_safe'];
-        }
-
-        if (null !== $this->options['is_safe_callback']) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return (bool) $this->options['deprecated'];
-    }
-
-    public function getDeprecatedVersion()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
-
-class_alias('Twig_SimpleFunction', 'Twig\TwigFunction', false);
diff --git a/inc/lib/Twig/SimpleTest.php b/inc/lib/Twig/SimpleTest.php
deleted file mode 100644
index fee5778b..00000000
--- a/inc/lib/Twig/SimpleTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_SimpleTest
-{
-    protected $name;
-    protected $callable;
-    protected $options;
-
-    public function __construct($name, $callable, array $options = array())
-    {
-        $this->name = $name;
-        $this->callable = $callable;
-        $this->options = array_merge(array(
-            'is_variadic' => false,
-            'node_class' => 'Twig_Node_Expression_Test',
-            'deprecated' => false,
-            'alternative' => null,
-        ), $options);
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    public function getNodeClass()
-    {
-        return $this->options['node_class'];
-    }
-
-    public function isVariadic()
-    {
-        return $this->options['is_variadic'];
-    }
-
-    public function isDeprecated()
-    {
-        return (bool) $this->options['deprecated'];
-    }
-
-    public function getDeprecatedVersion()
-    {
-        return $this->options['deprecated'];
-    }
-
-    public function getAlternative()
-    {
-        return $this->options['alternative'];
-    }
-}
-
-class_alias('Twig_SimpleTest', 'Twig\TwigTest', false);
diff --git a/inc/lib/Twig/Source.php b/inc/lib/Twig/Source.php
deleted file mode 100644
index bd8d869f..00000000
--- a/inc/lib/Twig/Source.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Holds information about a non-compiled Twig template.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Source
-{
-    private $code;
-    private $name;
-    private $path;
-
-    /**
-     * @param string $code The template source code
-     * @param string $name The template logical name
-     * @param string $path The filesystem path of the template if any
-     */
-    public function __construct($code, $name, $path = '')
-    {
-        $this->code = $code;
-        $this->name = $name;
-        $this->path = $path;
-    }
-
-    public function getCode()
-    {
-        return $this->code;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getPath()
-    {
-        return $this->path;
-    }
-}
-
-class_alias('Twig_Source', 'Twig\Source', false);
diff --git a/inc/lib/Twig/SourceContextLoaderInterface.php b/inc/lib/Twig/SourceContextLoaderInterface.php
deleted file mode 100644
index a6e8c425..00000000
--- a/inc/lib/Twig/SourceContextLoaderInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Adds a getSourceContext() method for loaders.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.27 (to be removed in 3.0)
- */
-interface Twig_SourceContextLoaderInterface
-{
-    /**
-     * Returns the source context for a given template logical name.
-     *
-     * @param string $name The template logical name
-     *
-     * @return Twig_Source
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    public function getSourceContext($name);
-}
-
-class_alias('Twig_SourceContextLoaderInterface', 'Twig\Loader\SourceContextLoaderInterface', false);
diff --git a/inc/lib/Twig/Template.php b/inc/lib/Twig/Template.php
deleted file mode 100644
index 3709232a..00000000
--- a/inc/lib/Twig/Template.php
+++ /dev/null
@@ -1,708 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default base class for compiled templates.
- *
- * This class is an implementation detail of how template compilation currently
- * works, which might change. It should never be used directly. Use $twig->load()
- * instead, which returns an instance of Twig_TemplateWrapper.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @internal
- */
-abstract class Twig_Template implements Twig_TemplateInterface
-{
-    /**
-     * @internal
-     */
-    protected static $cache = array();
-
-    protected $parent;
-    protected $parents = array();
-    protected $env;
-    protected $blocks = array();
-    protected $traits = array();
-
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-    }
-
-    /**
-     * @internal this method will be removed in 2.0 and is only used internally to provide an upgrade path from 1.x to 2.0
-     */
-    public function __toString()
-    {
-        return $this->getTemplateName();
-    }
-
-    /**
-     * Returns the template name.
-     *
-     * @return string The template name
-     */
-    abstract public function getTemplateName();
-
-    /**
-     * Returns debug information about the template.
-     *
-     * @return array Debug information
-     *
-     * @internal
-     */
-    public function getDebugInfo()
-    {
-        return array();
-    }
-
-    /**
-     * Returns the template source code.
-     *
-     * @return string The template source code
-     *
-     * @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead
-     */
-    public function getSource()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
-
-        return '';
-    }
-
-    /**
-     * Returns information about the original template source code.
-     *
-     * @return Twig_Source
-     */
-    public function getSourceContext()
-    {
-        return new Twig_Source('', $this->getTemplateName());
-    }
-
-    /**
-     * @deprecated since 1.20 (to be removed in 2.0)
-     */
-    public function getEnvironment()
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.20 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-        return $this->env;
-    }
-
-    /**
-     * Returns the parent template.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param array $context
-     *
-     * @return Twig_TemplateInterface|false The parent template or false if there is no parent
-     *
-     * @internal
-     */
-    public function getParent(array $context)
-    {
-        if (null !== $this->parent) {
-            return $this->parent;
-        }
-
-        try {
-            $parent = $this->doGetParent($context);
-
-            if (false === $parent) {
-                return false;
-            }
-
-            if ($parent instanceof self) {
-                return $this->parents[$parent->getTemplateName()] = $parent;
-            }
-
-            if (!isset($this->parents[$parent])) {
-                $this->parents[$parent] = $this->loadTemplate($parent);
-            }
-        } catch (Twig_Error_Loader $e) {
-            $e->setSourceContext(null);
-            $e->guess();
-
-            throw $e;
-        }
-
-        return $this->parents[$parent];
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return false;
-    }
-
-    public function isTraitable()
-    {
-        return true;
-    }
-
-    /**
-     * Displays a parent block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name    The block name to display from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @internal
-     */
-    public function displayParentBlock($name, array $context, array $blocks = array())
-    {
-        $name = (string) $name;
-
-        if (isset($this->traits[$name])) {
-            $this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
-        } elseif (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, $blocks, false);
-        } else {
-            throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
-        }
-    }
-
-    /**
-     * Displays a block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name      The block name to display
-     * @param array  $context   The context
-     * @param array  $blocks    The current set of blocks
-     * @param bool   $useBlocks Whether to use the current set of blocks
-     *
-     * @internal
-     */
-    public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
-    {
-        $name = (string) $name;
-
-        if ($useBlocks && isset($blocks[$name])) {
-            $template = $blocks[$name][0];
-            $block = $blocks[$name][1];
-        } elseif (isset($this->blocks[$name])) {
-            $template = $this->blocks[$name][0];
-            $block = $this->blocks[$name][1];
-        } else {
-            $template = null;
-            $block = null;
-        }
-
-        // avoid RCEs when sandbox is enabled
-        if (null !== $template && !$template instanceof self) {
-            throw new LogicException('A block must be a method on a Twig_Template instance.');
-        }
-
-        if (null !== $template) {
-            try {
-                $template->$block($context, $blocks);
-            } catch (Twig_Error $e) {
-                if (!$e->getSourceContext()) {
-                    $e->setSourceContext($template->getSourceContext());
-                }
-
-                // this is mostly useful for Twig_Error_Loader exceptions
-                // see Twig_Error_Loader
-                if (false === $e->getTemplateLine()) {
-                    $e->setTemplateLine(-1);
-                    $e->guess();
-                }
-
-                throw $e;
-            } catch (Exception $e) {
-                throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
-            }
-        } elseif (false !== $parent = $this->getParent($context)) {
-            $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
-        } else {
-            @trigger_error(sprintf('Silent display of undefined block "%s" in template "%s" is deprecated since version 1.29 and will throw an exception in 2.0. Use the "block(\'%s\') is defined" expression to test for block existence.', $name, $this->getTemplateName(), $name), E_USER_DEPRECATED);
-        }
-    }
-
-    /**
-     * Renders a parent block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name    The block name to render from the parent
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @return string The rendered block
-     *
-     * @internal
-     */
-    public function renderParentBlock($name, array $context, array $blocks = array())
-    {
-        ob_start();
-        $this->displayParentBlock($name, $context, $blocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Renders a block.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @param string $name      The block name to render
-     * @param array  $context   The context
-     * @param array  $blocks    The current set of blocks
-     * @param bool   $useBlocks Whether to use the current set of blocks
-     *
-     * @return string The rendered block
-     *
-     * @internal
-     */
-    public function renderBlock($name, array $context, array $blocks = array(), $useBlocks = true)
-    {
-        ob_start();
-        $this->displayBlock($name, $context, $blocks, $useBlocks);
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Returns whether a block exists or not in the current context of the template.
-     *
-     * This method checks blocks defined in the current template
-     * or defined in "used" traits or defined in parent templates.
-     *
-     * @param string $name    The block name
-     * @param array  $context The context
-     * @param array  $blocks  The current set of blocks
-     *
-     * @return bool true if the block exists, false otherwise
-     *
-     * @internal
-     */
-    public function hasBlock($name, array $context = null, array $blocks = array())
-    {
-        if (null === $context) {
-            @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
-
-            return isset($this->blocks[(string) $name]);
-        }
-
-        if (isset($blocks[$name])) {
-            return $blocks[$name][0] instanceof self;
-        }
-
-        if (isset($this->blocks[$name])) {
-            return true;
-        }
-
-        if (false !== $parent = $this->getParent($context)) {
-            return $parent->hasBlock($name, $context);
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns all block names in the current context of the template.
-     *
-     * This method checks blocks defined in the current template
-     * or defined in "used" traits or defined in parent templates.
-     *
-     * @param array $context The context
-     * @param array $blocks  The current set of blocks
-     *
-     * @return array An array of block names
-     *
-     * @internal
-     */
-    public function getBlockNames(array $context = null, array $blocks = array())
-    {
-        if (null === $context) {
-            @trigger_error('The '.__METHOD__.' method is internal and should never be called; calling it directly is deprecated since version 1.28 and won\'t be possible anymore in 2.0.', E_USER_DEPRECATED);
-
-            return array_keys($this->blocks);
-        }
-
-        $names = array_merge(array_keys($blocks), array_keys($this->blocks));
-
-        if (false !== $parent = $this->getParent($context)) {
-            $names = array_merge($names, $parent->getBlockNames($context));
-        }
-
-        return array_unique($names);
-    }
-
-    protected function loadTemplate($template, $templateName = null, $line = null, $index = null)
-    {
-        try {
-            if (is_array($template)) {
-                return $this->env->resolveTemplate($template);
-            }
-
-            if ($template instanceof self) {
-                return $template;
-            }
-
-            if ($template instanceof Twig_TemplateWrapper) {
-                return $template;
-            }
-
-            return $this->env->loadTemplate($template, $index);
-        } catch (Twig_Error $e) {
-            if (!$e->getSourceContext()) {
-                $e->setSourceContext($templateName ? new Twig_Source('', $templateName) : $this->getSourceContext());
-            }
-
-            if ($e->getTemplateLine()) {
-                throw $e;
-            }
-
-            if (!$line) {
-                $e->guess();
-            } else {
-                $e->setTemplateLine($line);
-            }
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Returns all blocks.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * @return array An array of blocks
-     *
-     * @internal
-     */
-    public function getBlocks()
-    {
-        return $this->blocks;
-    }
-
-    public function display(array $context, array $blocks = array())
-    {
-        $this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
-    }
-
-    public function render(array $context)
-    {
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->display($context);
-        } catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        } catch (Throwable $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        }
-
-        return ob_get_clean();
-    }
-
-    protected function displayWithErrorHandling(array $context, array $blocks = array())
-    {
-        try {
-            $this->doDisplay($context, $blocks);
-        } catch (Twig_Error $e) {
-            if (!$e->getSourceContext()) {
-                $e->setSourceContext($this->getSourceContext());
-            }
-
-            // this is mostly useful for Twig_Error_Loader exceptions
-            // see Twig_Error_Loader
-            if (false === $e->getTemplateLine()) {
-                $e->setTemplateLine(-1);
-                $e->guess();
-            }
-
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
-        }
-    }
-
-    /**
-     * Auto-generated method to display the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    abstract protected function doDisplay(array $context, array $blocks = array());
-
-    /**
-     * Returns a variable from the context.
-     *
-     * This method is for internal use only and should never be called
-     * directly.
-     *
-     * This method should not be overridden in a sub-class as this is an
-     * implementation detail that has been introduced to optimize variable
-     * access for versions of PHP before 5.4. This is not a way to override
-     * the way to get a variable value.
-     *
-     * @param array  $context           The context
-     * @param string $item              The variable to return from the context
-     * @param bool   $ignoreStrictCheck Whether to ignore the strict variable check or not
-     *
-     * @return mixed The content of the context variable
-     *
-     * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode
-     *
-     * @internal
-     */
-    final protected function getContext($context, $item, $ignoreStrictCheck = false)
-    {
-        if (!array_key_exists($item, $context)) {
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist.', $item), -1, $this->getSourceContext());
-        }
-
-        return $context[$item];
-    }
-
-    /**
-     * Returns the attribute value for a given array/object.
-     *
-     * @param mixed  $object            The object or array from where to get the item
-     * @param mixed  $item              The item to get from the array or object
-     * @param array  $arguments         An array of arguments to pass if the item is an object method
-     * @param string $type              The type of attribute (@see Twig_Template constants)
-     * @param bool   $isDefinedTest     Whether this is only a defined check
-     * @param bool   $ignoreStrictCheck Whether to ignore the strict attribute check or not
-     *
-     * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
-     *
-     * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
-     *
-     * @internal
-     */
-    protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
-    {
-        // array
-        if (self::METHOD_CALL !== $type) {
-            $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
-
-            if ((is_array($object) && (isset($object[$arrayItem]) || array_key_exists($arrayItem, $object)))
-                || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
-            ) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                return $object[$arrayItem];
-            }
-
-            if (self::ARRAY_CALL === $type || !is_object($object)) {
-                if ($isDefinedTest) {
-                    return false;
-                }
-
-                if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                    return;
-                }
-
-                if ($object instanceof ArrayAccess) {
-                    $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist.', $arrayItem, get_class($object));
-                } elseif (is_object($object)) {
-                    $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface.', $item, get_class($object));
-                } elseif (is_array($object)) {
-                    if (empty($object)) {
-                        $message = sprintf('Key "%s" does not exist as the array is empty.', $arrayItem);
-                    } else {
-                        $message = sprintf('Key "%s" for array with keys "%s" does not exist.', $arrayItem, implode(', ', array_keys($object)));
-                    }
-                } elseif (self::ARRAY_CALL === $type) {
-                    if (null === $object) {
-                        $message = sprintf('Impossible to access a key ("%s") on a null variable.', $item);
-                    } else {
-                        $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
-                    }
-                } elseif (null === $object) {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a null variable.', $item);
-                } else {
-                    $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
-                }
-
-                throw new Twig_Error_Runtime($message, -1, $this->getSourceContext());
-            }
-        }
-
-        if (!is_object($object)) {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            if (null === $object) {
-                $message = sprintf('Impossible to invoke a method ("%s") on a null variable.', $item);
-            } elseif (is_array($object)) {
-                $message = sprintf('Impossible to invoke a method ("%s") on an array.', $item);
-            } else {
-                $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s").', $item, gettype($object), $object);
-            }
-
-            throw new Twig_Error_Runtime($message, -1, $this->getSourceContext());
-        }
-
-        // object property
-        if (self::METHOD_CALL !== $type && !$object instanceof self) { // Twig_Template does not have public properties, and we don't want to allow access to internal ones
-            if (isset($object->$item) || array_key_exists((string) $item, $object)) {
-                if ($isDefinedTest) {
-                    return true;
-                }
-
-                if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
-                    $this->env->getExtension('Twig_Extension_Sandbox')->checkPropertyAllowed($object, $item);
-                }
-
-                return $object->$item;
-            }
-        }
-
-        $class = get_class($object);
-
-        // object method
-        if (!isset(self::$cache[$class])) {
-            // get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
-            if ($object instanceof self) {
-                $ref = new ReflectionClass($class);
-                $methods = array();
-
-                foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
-                    // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
-                    if ('getenvironment' !== strtolower($refMethod->name)) {
-                        $methods[] = $refMethod->name;
-                    }
-                }
-            } else {
-                $methods = get_class_methods($object);
-            }
-            // sort values to have consistent behavior, so that "get" methods win precedence over "is" methods
-            sort($methods);
-
-            $cache = array();
-
-            foreach ($methods as $method) {
-                $cache[$method] = $method;
-                $cache[$lcName = strtolower($method)] = $method;
-
-                if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
-                    $name = substr($method, 3);
-                    $lcName = substr($lcName, 3);
-                } elseif ('i' === $lcName[0] && 0 === strpos($lcName, 'is')) {
-                    $name = substr($method, 2);
-                    $lcName = substr($lcName, 2);
-                } else {
-                    continue;
-                }
-
-                // skip get() and is() methods (in which case, $name is empty)
-                if ($name) {
-                    if (!isset($cache[$name])) {
-                        $cache[$name] = $method;
-                    }
-                    if (!isset($cache[$lcName])) {
-                        $cache[$lcName] = $method;
-                    }
-                }
-            }
-            self::$cache[$class] = $cache;
-        }
-
-        $call = false;
-        if (isset(self::$cache[$class][$item])) {
-            $method = self::$cache[$class][$item];
-        } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) {
-            $method = self::$cache[$class][$lcItem];
-        } elseif (isset(self::$cache[$class]['__call'])) {
-            $method = $item;
-            $call = true;
-        } else {
-            if ($isDefinedTest) {
-                return false;
-            }
-
-            if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
-                return;
-            }
-
-            throw new Twig_Error_Runtime(sprintf('Neither the property "%1$s" nor one of the methods "%1$s()", "get%1$s()"/"is%1$s()" or "__call()" exist and have public access in class "%2$s".', $item, $class), -1, $this->getSourceContext());
-        }
-
-        if ($isDefinedTest) {
-            return true;
-        }
-
-        if ($this->env->hasExtension('Twig_Extension_Sandbox')) {
-            $this->env->getExtension('Twig_Extension_Sandbox')->checkMethodAllowed($object, $method);
-        }
-
-        // Some objects throw exceptions when they have __call, and the method we try
-        // to call is not supported. If ignoreStrictCheck is true, we should return null.
-        try {
-            if (!$arguments) {
-                $ret = $object->$method();
-            } else {
-                $ret = call_user_func_array(array($object, $method), $arguments);
-            }
-        } catch (BadMethodCallException $e) {
-            if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
-                return;
-            }
-            throw $e;
-        }
-
-        // @deprecated in 1.28
-        if ($object instanceof Twig_TemplateInterface) {
-            $self = $object->getTemplateName() === $this->getTemplateName();
-            $message = sprintf('Calling "%s" on template "%s" from template "%s" is deprecated since version 1.28 and won\'t be supported anymore in 2.0.', $item, $object->getTemplateName(), $this->getTemplateName());
-            if ('renderBlock' === $method || 'displayBlock' === $method) {
-                $message .= sprintf(' Use block("%s"%s) instead).', $arguments[0], $self ? '' : ', template');
-            } elseif ('hasBlock' === $method) {
-                $message .= sprintf(' Use "block("%s"%s) is defined" instead).', $arguments[0], $self ? '' : ', template');
-            } elseif ('render' === $method || 'display' === $method) {
-                $message .= sprintf(' Use include("%s") instead).', $object->getTemplateName());
-            }
-            @trigger_error($message, E_USER_DEPRECATED);
-
-            return '' === $ret ? '' : new Twig_Markup($ret, $this->env->getCharset());
-        }
-
-        return $ret;
-    }
-}
-
-class_alias('Twig_Template', 'Twig\Template', false);
diff --git a/inc/lib/Twig/TemplateInterface.php b/inc/lib/Twig/TemplateInterface.php
deleted file mode 100644
index 457ef7d7..00000000
--- a/inc/lib/Twig/TemplateInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by all compiled templates.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 3.0)
- */
-interface Twig_TemplateInterface
-{
-    const ANY_CALL = 'any';
-    const ARRAY_CALL = 'array';
-    const METHOD_CALL = 'method';
-
-    /**
-     * Renders the template with the given context and returns it as string.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render(array $context);
-
-    /**
-     * Displays the template with the given context.
-     *
-     * @param array $context An array of parameters to pass to the template
-     * @param array $blocks  An array of blocks to pass to the template
-     */
-    public function display(array $context, array $blocks = array());
-
-    /**
-     * Returns the bound environment for this template.
-     *
-     * @return Twig_Environment
-     */
-    public function getEnvironment();
-}
diff --git a/inc/lib/Twig/TemplateWrapper.php b/inc/lib/Twig/TemplateWrapper.php
deleted file mode 100644
index 497f6e98..00000000
--- a/inc/lib/Twig/TemplateWrapper.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Exposes a template to userland.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-final class Twig_TemplateWrapper
-{
-    private $env;
-    private $template;
-
-    /**
-     * This method is for internal use only and should never be called
-     * directly (use Twig_Environment::load() instead).
-     *
-     * @internal
-     */
-    public function __construct(Twig_Environment $env, Twig_Template $template)
-    {
-        $this->env = $env;
-        $this->template = $template;
-    }
-
-    /**
-     * Renders the template.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render($context = array())
-    {
-        return $this->template->render($context);
-    }
-
-    /**
-     * Displays the template.
-     *
-     * @param array $context An array of parameters to pass to the template
-     */
-    public function display($context = array())
-    {
-        $this->template->display($context);
-    }
-
-    /**
-     * Checks if a block is defined.
-     *
-     * @param string $name    The block name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return bool
-     */
-    public function hasBlock($name, $context = array())
-    {
-        return $this->template->hasBlock($name, $context);
-    }
-
-    /**
-     * Returns defined block names in the template.
-     *
-     * @param array $context An array of parameters to pass to the template
-     *
-     * @return string[] An array of defined template block names
-     */
-    public function getBlockNames($context = array())
-    {
-        return $this->template->getBlockNames($context);
-    }
-
-    /**
-     * Renders a template block.
-     *
-     * @param string $name    The block name to render
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The rendered block
-     */
-    public function renderBlock($name, $context = array())
-    {
-        $context = $this->env->mergeGlobals($context);
-        $level = ob_get_level();
-        ob_start();
-        try {
-            $this->template->displayBlock($name, $context);
-        } catch (Exception $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        } catch (Throwable $e) {
-            while (ob_get_level() > $level) {
-                ob_end_clean();
-            }
-
-            throw $e;
-        }
-
-        return ob_get_clean();
-    }
-
-    /**
-     * Displays a template block.
-     *
-     * @param string $name    The block name to render
-     * @param array  $context An array of parameters to pass to the template
-     */
-    public function displayBlock($name, $context = array())
-    {
-        $this->template->displayBlock($name, $this->env->mergeGlobals($context));
-    }
-
-    /**
-     * @return Twig_Source
-     */
-    public function getSourceContext()
-    {
-        return $this->template->getSourceContext();
-    }
-}
-
-class_alias('Twig_TemplateWrapper', 'Twig\TemplateWrapper', false);
diff --git a/inc/lib/Twig/Test.php b/inc/lib/Twig/Test.php
deleted file mode 100644
index b450ec62..00000000
--- a/inc/lib/Twig/Test.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Test class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-abstract class Twig_Test implements Twig_TestInterface, Twig_TestCallableInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'callable' => null,
-        ), $options);
-    }
-
-    public function getCallable()
-    {
-        return $this->options['callable'];
-    }
-}
diff --git a/inc/lib/Twig/Test/Function.php b/inc/lib/Twig/Test/Function.php
deleted file mode 100644
index 9e83c3f8..00000000
--- a/inc/lib/Twig/Test/Function.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Test_Function class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a function template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Function extends Twig_Test
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        $options['callable'] = $function;
-
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/inc/lib/Twig/Test/IntegrationTestCase.php b/inc/lib/Twig/Test/IntegrationTestCase.php
deleted file mode 100644
index 016951aa..00000000
--- a/inc/lib/Twig/Test/IntegrationTestCase.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use PHPUnit\Framework\TestCase;
-
-/**
- * Integration test helper.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Karma Dordrak <drak@zikula.org>
- */
-abstract class Twig_Test_IntegrationTestCase extends TestCase
-{
-    /**
-     * @return string
-     */
-    abstract protected function getFixturesDir();
-
-    /**
-     * @return Twig_RuntimeLoaderInterface[]
-     */
-    protected function getRuntimeLoaders()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_ExtensionInterface[]
-     */
-    protected function getExtensions()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleFilter[]
-     */
-    protected function getTwigFilters()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleFunction[]
-     */
-    protected function getTwigFunctions()
-    {
-        return array();
-    }
-
-    /**
-     * @return Twig_SimpleTest[]
-     */
-    protected function getTwigTests()
-    {
-        return array();
-    }
-
-    /**
-     * @dataProvider getTests
-     */
-    public function testIntegration($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        $this->doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs);
-    }
-
-    /**
-     * @dataProvider getLegacyTests
-     * @group legacy
-     */
-    public function testLegacyIntegration($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        $this->doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs);
-    }
-
-    public function getTests($name, $legacyTests = false)
-    {
-        $fixturesDir = realpath($this->getFixturesDir());
-        $tests = array();
-
-        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($fixturesDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if (!preg_match('/\.test$/', $file)) {
-                continue;
-            }
-
-            if ($legacyTests xor false !== strpos($file->getRealpath(), '.legacy.test')) {
-                continue;
-            }
-
-            $test = file_get_contents($file->getRealpath());
-
-            if (preg_match('/--TEST--\s*(.*?)\s*(?:--CONDITION--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)\s*(?:--DATA--\s*(.*))?\s*--EXCEPTION--\s*(.*)/sx', $test, $match)) {
-                $message = $match[1];
-                $condition = $match[2];
-                $templates = self::parseTemplates($match[3]);
-                $exception = $match[5];
-                $outputs = array(array(null, $match[4], null, ''));
-            } elseif (preg_match('/--TEST--\s*(.*?)\s*(?:--CONDITION--\s*(.*))?\s*((?:--TEMPLATE(?:\(.*?\))?--(?:.*?))+)--DATA--.*?--EXPECT--.*/s', $test, $match)) {
-                $message = $match[1];
-                $condition = $match[2];
-                $templates = self::parseTemplates($match[3]);
-                $exception = false;
-                preg_match_all('/--DATA--(.*?)(?:--CONFIG--(.*?))?--EXPECT--(.*?)(?=\-\-DATA\-\-|$)/s', $test, $outputs, PREG_SET_ORDER);
-            } else {
-                throw new InvalidArgumentException(sprintf('Test "%s" is not valid.', str_replace($fixturesDir.'/', '', $file)));
-            }
-
-            $tests[] = array(str_replace($fixturesDir.'/', '', $file), $message, $condition, $templates, $exception, $outputs);
-        }
-
-        if ($legacyTests && empty($tests)) {
-            // add a dummy test to avoid a PHPUnit message
-            return array(array('not', '-', '', array(), '', array()));
-        }
-
-        return $tests;
-    }
-
-    public function getLegacyTests()
-    {
-        return $this->getTests('testLegacyIntegration', true);
-    }
-
-    protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
-    {
-        if (!$outputs) {
-            $this->markTestSkipped('no legacy tests to run');
-        }
-
-        if ($condition) {
-            eval('$ret = '.$condition.';');
-            if (!$ret) {
-                $this->markTestSkipped($condition);
-            }
-        }
-
-        $loader = new Twig_Loader_Array($templates);
-
-        foreach ($outputs as $i => $match) {
-            $config = array_merge(array(
-                'cache' => false,
-                'strict_variables' => true,
-            ), $match[2] ? eval($match[2].';') : array());
-            $twig = new Twig_Environment($loader, $config);
-            $twig->addGlobal('global', 'global');
-            foreach ($this->getRuntimeLoaders() as $runtimeLoader) {
-                $twig->addRuntimeLoader($runtimeLoader);
-            }
-
-            foreach ($this->getExtensions() as $extension) {
-                $twig->addExtension($extension);
-            }
-
-            foreach ($this->getTwigFilters() as $filter) {
-                $twig->addFilter($filter);
-            }
-
-            foreach ($this->getTwigTests() as $test) {
-                $twig->addTest($test);
-            }
-
-            foreach ($this->getTwigFunctions() as $function) {
-                $twig->addFunction($function);
-            }
-
-            // avoid using the same PHP class name for different cases
-            // only for PHP 5.2+
-            if (PHP_VERSION_ID >= 50300) {
-                $p = new ReflectionProperty($twig, 'templateClassPrefix');
-                $p->setAccessible(true);
-                $p->setValue($twig, '__TwigTemplate_'.hash('sha256', uniqid(mt_rand(), true), false).'_');
-            }
-
-            try {
-                $template = $twig->loadTemplate('index.twig');
-            } catch (Exception $e) {
-                if (false !== $exception) {
-                    $message = $e->getMessage();
-                    $this->assertSame(trim($exception), trim(sprintf('%s: %s', get_class($e), $message)));
-                    $last = substr($message, strlen($message) - 1);
-                    $this->assertTrue('.' === $last || '?' === $last, $message, 'Exception message must end with a dot or a question mark.');
-
-                    return;
-                }
-
-                throw new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-            }
-
-            try {
-                $output = trim($template->render(eval($match[1].';')), "\n ");
-            } catch (Exception $e) {
-                if (false !== $exception) {
-                    $this->assertSame(trim($exception), trim(sprintf('%s: %s', get_class($e), $e->getMessage())));
-
-                    return;
-                }
-
-                $e = new Twig_Error(sprintf('%s: %s', get_class($e), $e->getMessage()), -1, $file, $e);
-
-                $output = trim(sprintf('%s: %s', get_class($e), $e->getMessage()));
-            }
-
-            if (false !== $exception) {
-                list($class) = explode(':', $exception);
-                $constraintClass = class_exists('PHPUnit\Framework\Constraint\Exception') ? 'PHPUnit\Framework\Constraint\Exception' : 'PHPUnit_Framework_Constraint_Exception';
-                $this->assertThat(null, new $constraintClass($class));
-            }
-
-            $expected = trim($match[3], "\n ");
-
-            if ($expected !== $output) {
-                printf("Compiled templates that failed on case %d:\n", $i + 1);
-
-                foreach (array_keys($templates) as $name) {
-                    echo "Template: $name\n";
-                    $loader = $twig->getLoader();
-                    if (!$loader instanceof Twig_SourceContextLoaderInterface) {
-                        $source = new Twig_Source($loader->getSource($name), $name);
-                    } else {
-                        $source = $loader->getSourceContext($name);
-                    }
-                    echo $twig->compile($twig->parse($twig->tokenize($source)));
-                }
-            }
-            $this->assertEquals($expected, $output, $message.' (in '.$file.')');
-        }
-    }
-
-    protected static function parseTemplates($test)
-    {
-        $templates = array();
-        preg_match_all('/--TEMPLATE(?:\((.*?)\))?--(.*?)(?=\-\-TEMPLATE|$)/s', $test, $matches, PREG_SET_ORDER);
-        foreach ($matches as $match) {
-            $templates[($match[1] ? $match[1] : 'index.twig')] = $match[2];
-        }
-
-        return $templates;
-    }
-}
-
-class_alias('Twig_Test_IntegrationTestCase', 'Twig\Test\IntegrationTestCase', false);
diff --git a/inc/lib/Twig/Test/Method.php b/inc/lib/Twig/Test/Method.php
deleted file mode 100644
index feccd5db..00000000
--- a/inc/lib/Twig/Test/Method.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Test_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleTest instead.', E_USER_DEPRECATED);
-
-/**
- * Represents a method template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Method extends Twig_Test
-{
-    protected $extension;
-    protected $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        $options['callable'] = array($extension, $method);
-
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', get_class($this->extension), $this->method);
-    }
-}
diff --git a/inc/lib/Twig/Test/Node.php b/inc/lib/Twig/Test/Node.php
deleted file mode 100644
index 6098a527..00000000
--- a/inc/lib/Twig/Test/Node.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (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_Test_Node class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
-
-/**
- * Represents a template test as a Node.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_Test_Node extends Twig_Test
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/inc/lib/Twig/Test/NodeTestCase.php b/inc/lib/Twig/Test/NodeTestCase.php
deleted file mode 100644
index 47942675..00000000
--- a/inc/lib/Twig/Test/NodeTestCase.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use PHPUnit\Framework\TestCase;
-
-abstract class Twig_Test_NodeTestCase extends TestCase
-{
-    abstract public function getTests();
-
-    /**
-     * @dataProvider getTests
-     */
-    public function testCompile($node, $source, $environment = null, $isPattern = false)
-    {
-        $this->assertNodeCompilation($source, $node, $environment, $isPattern);
-    }
-
-    public function assertNodeCompilation($source, Twig_Node $node, Twig_Environment $environment = null, $isPattern = false)
-    {
-        $compiler = $this->getCompiler($environment);
-        $compiler->compile($node);
-
-        if ($isPattern) {
-            $this->assertStringMatchesFormat($source, trim($compiler->getSource()));
-        } else {
-            $this->assertEquals($source, trim($compiler->getSource()));
-        }
-    }
-
-    protected function getCompiler(Twig_Environment $environment = null)
-    {
-        return new Twig_Compiler(null === $environment ? $this->getEnvironment() : $environment);
-    }
-
-    protected function getEnvironment()
-    {
-        return new Twig_Environment(new Twig_Loader_Array(array()));
-    }
-
-    protected function getVariableGetter($name, $line = false)
-    {
-        $line = $line > 0 ? "// line {$line}\n" : '';
-
-        if (PHP_VERSION_ID >= 70000) {
-            return sprintf('%s($context["%s"] ?? null)', $line, $name, $name);
-        }
-
-        if (PHP_VERSION_ID >= 50400) {
-            return sprintf('%s(isset($context["%s"]) ? $context["%s"] : null)', $line, $name, $name);
-        }
-
-        return sprintf('%s$this->getContext($context, "%s")', $line, $name);
-    }
-
-    protected function getAttributeGetter()
-    {
-        if (function_exists('twig_template_get_attributes')) {
-            return 'twig_template_get_attributes($this, ';
-        }
-
-        return '$this->getAttribute(';
-    }
-}
-
-class_alias('Twig_Test_NodeTestCase', 'Twig\Test\NodeTestCase', false);
-class_exists('Twig_Environment');
-class_exists('Twig_Node');
diff --git a/inc/lib/Twig/TestCallableInterface.php b/inc/lib/Twig/TestCallableInterface.php
deleted file mode 100644
index 51ecb9a2..00000000
--- a/inc/lib/Twig/TestCallableInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a callable template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestCallableInterface
-{
-    public function getCallable();
-}
diff --git a/inc/lib/Twig/TestInterface.php b/inc/lib/Twig/TestInterface.php
deleted file mode 100644
index 91664075..00000000
--- a/inc/lib/Twig/TestInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a template test.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TestInterface
-{
-    /**
-     * Compiles a test.
-     *
-     * @return string The PHP code for the test
-     */
-    public function compile();
-}
diff --git a/inc/lib/Twig/Token.php b/inc/lib/Twig/Token.php
deleted file mode 100644
index 89066869..00000000
--- a/inc/lib/Twig/Token.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a Token.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Token
-{
-    protected $value;
-    protected $type;
-    protected $lineno;
-
-    const EOF_TYPE = -1;
-    const TEXT_TYPE = 0;
-    const BLOCK_START_TYPE = 1;
-    const VAR_START_TYPE = 2;
-    const BLOCK_END_TYPE = 3;
-    const VAR_END_TYPE = 4;
-    const NAME_TYPE = 5;
-    const NUMBER_TYPE = 6;
-    const STRING_TYPE = 7;
-    const OPERATOR_TYPE = 8;
-    const PUNCTUATION_TYPE = 9;
-    const INTERPOLATION_START_TYPE = 10;
-    const INTERPOLATION_END_TYPE = 11;
-
-    /**
-     * @param int    $type   The type of the token
-     * @param string $value  The token value
-     * @param int    $lineno The line position in the source
-     */
-    public function __construct($type, $value, $lineno)
-    {
-        $this->type = $type;
-        $this->value = $value;
-        $this->lineno = $lineno;
-    }
-
-    public function __toString()
-    {
-        return sprintf('%s(%s)', self::typeToString($this->type, true), $this->value);
-    }
-
-    /**
-     * Tests the current token for a type and/or a value.
-     *
-     * Parameters may be:
-     *  * just type
-     *  * type and value (or array of possible values)
-     *  * just value (or array of possible values) (NAME_TYPE is used as type)
-     *
-     * @param array|string|int  $type   The type to test
-     * @param array|string|null $values The token value
-     *
-     * @return bool
-     */
-    public function test($type, $values = null)
-    {
-        if (null === $values && !is_int($type)) {
-            $values = $type;
-            $type = self::NAME_TYPE;
-        }
-
-        return ($this->type === $type) && (
-            null === $values ||
-            (is_array($values) && in_array($this->value, $values)) ||
-            $this->value == $values
-        );
-    }
-
-    /**
-     * @return int
-     */
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the constant representation (internal) of a given type.
-     *
-     * @param int  $type  The type as an integer
-     * @param bool $short Whether to return a short representation or not
-     *
-     * @return string The string representation
-     */
-    public static function typeToString($type, $short = false)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                $name = 'EOF_TYPE';
-                break;
-            case self::TEXT_TYPE:
-                $name = 'TEXT_TYPE';
-                break;
-            case self::BLOCK_START_TYPE:
-                $name = 'BLOCK_START_TYPE';
-                break;
-            case self::VAR_START_TYPE:
-                $name = 'VAR_START_TYPE';
-                break;
-            case self::BLOCK_END_TYPE:
-                $name = 'BLOCK_END_TYPE';
-                break;
-            case self::VAR_END_TYPE:
-                $name = 'VAR_END_TYPE';
-                break;
-            case self::NAME_TYPE:
-                $name = 'NAME_TYPE';
-                break;
-            case self::NUMBER_TYPE:
-                $name = 'NUMBER_TYPE';
-                break;
-            case self::STRING_TYPE:
-                $name = 'STRING_TYPE';
-                break;
-            case self::OPERATOR_TYPE:
-                $name = 'OPERATOR_TYPE';
-                break;
-            case self::PUNCTUATION_TYPE:
-                $name = 'PUNCTUATION_TYPE';
-                break;
-            case self::INTERPOLATION_START_TYPE:
-                $name = 'INTERPOLATION_START_TYPE';
-                break;
-            case self::INTERPOLATION_END_TYPE:
-                $name = 'INTERPOLATION_END_TYPE';
-                break;
-            default:
-                throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
-        }
-
-        return $short ? $name : 'Twig_Token::'.$name;
-    }
-
-    /**
-     * Returns the English representation of a given type.
-     *
-     * @param int $type The type as an integer
-     *
-     * @return string The string representation
-     */
-    public static function typeToEnglish($type)
-    {
-        switch ($type) {
-            case self::EOF_TYPE:
-                return 'end of template';
-            case self::TEXT_TYPE:
-                return 'text';
-            case self::BLOCK_START_TYPE:
-                return 'begin of statement block';
-            case self::VAR_START_TYPE:
-                return 'begin of print statement';
-            case self::BLOCK_END_TYPE:
-                return 'end of statement block';
-            case self::VAR_END_TYPE:
-                return 'end of print statement';
-            case self::NAME_TYPE:
-                return 'name';
-            case self::NUMBER_TYPE:
-                return 'number';
-            case self::STRING_TYPE:
-                return 'string';
-            case self::OPERATOR_TYPE:
-                return 'operator';
-            case self::PUNCTUATION_TYPE:
-                return 'punctuation';
-            case self::INTERPOLATION_START_TYPE:
-                return 'begin of string interpolation';
-            case self::INTERPOLATION_END_TYPE:
-                return 'end of string interpolation';
-            default:
-                throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
-        }
-    }
-}
-
-class_alias('Twig_Token', 'Twig\Token', false);
diff --git a/inc/lib/Twig/TokenParser.php b/inc/lib/Twig/TokenParser.php
deleted file mode 100644
index 1b4de14d..00000000
--- a/inc/lib/Twig/TokenParser.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all token parsers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Twig_TokenParser implements Twig_TokenParserInterface
-{
-    /**
-     * @var Twig_Parser
-     */
-    protected $parser;
-
-    /**
-     * Sets the parser associated with this token parser.
-     */
-    public function setParser(Twig_Parser $parser)
-    {
-        $this->parser = $parser;
-    }
-}
-
-class_alias('Twig_TokenParser', 'Twig\TokenParser\AbstractTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/AutoEscape.php b/inc/lib/Twig/TokenParser/AutoEscape.php
deleted file mode 100644
index a20dedd1..00000000
--- a/inc/lib/Twig/TokenParser/AutoEscape.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template to be escaped or not.
- *
- * <pre>
- * {% autoescape true %}
- *   Everything will be automatically escaped in this block
- * {% endautoescape %}
- *
- * {% autoescape false %}
- *   Everything will be outputed as is in this block
- * {% endautoescape %}
- *
- * {% autoescape true js %}
- *   Everything will be automatically escaped in this block
- *   using the js escaping strategy
- * {% endautoescape %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_AutoEscape extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-
-        if ($stream->test(Twig_Token::BLOCK_END_TYPE)) {
-            $value = 'html';
-        } else {
-            $expr = $this->parser->getExpressionParser()->parseExpression();
-            if (!$expr instanceof Twig_Node_Expression_Constant) {
-                throw new Twig_Error_Syntax('An escaping strategy must be a string or a bool.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
-            }
-            $value = $expr->getAttribute('value');
-
-            $compat = true === $value || false === $value;
-
-            if (true === $value) {
-                $value = 'html';
-            }
-
-            if ($compat && $stream->test(Twig_Token::NAME_TYPE)) {
-                @trigger_error('Using the autoescape tag with "true" or "false" before the strategy name is deprecated since version 1.21.', E_USER_DEPRECATED);
-
-                if (false === $value) {
-                    throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
-                }
-
-                $value = $stream->next()->getValue();
-            }
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endautoescape');
-    }
-
-    public function getTag()
-    {
-        return 'autoescape';
-    }
-}
-
-class_alias('Twig_TokenParser_AutoEscape', 'Twig\TokenParser\AutoEscapeTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Block.php b/inc/lib/Twig/TokenParser/Block.php
deleted file mode 100644
index f30f86b5..00000000
--- a/inc/lib/Twig/TokenParser/Block.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as being reusable.
- *
- * <pre>
- *  {% block head %}
- *    <link rel="stylesheet" href="style.css" />
- *    <title>{% block title %}{% endblock %} - My Webpage</title>
- *  {% endblock %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Block extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        if ($this->parser->hasBlock($name)) {
-            throw new Twig_Error_Syntax(sprintf("The block '%s' has already been defined line %d.", $name, $this->parser->getBlock($name)->getTemplateLine()), $stream->getCurrent()->getLine(), $stream->getSourceContext());
-        }
-        $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
-        $this->parser->pushLocalScope();
-        $this->parser->pushBlockStack($name);
-
-        if ($stream->nextIf(Twig_Token::BLOCK_END_TYPE)) {
-            $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
-                $value = $token->getValue();
-
-                if ($value != $name) {
-                    throw new Twig_Error_Syntax(sprintf('Expected endblock for block "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
-                }
-            }
-        } else {
-            $body = new Twig_Node(array(
-                new Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno),
-            ));
-        }
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block->setNode('body', $body);
-        $this->parser->popBlockStack();
-        $this->parser->popLocalScope();
-
-        return new Twig_Node_BlockReference($name, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endblock');
-    }
-
-    public function getTag()
-    {
-        return 'block';
-    }
-}
-
-class_alias('Twig_TokenParser_Block', 'Twig\TokenParser\BlockTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Do.php b/inc/lib/Twig/TokenParser/Do.php
deleted file mode 100644
index 8ce08808..00000000
--- a/inc/lib/Twig/TokenParser/Do.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Evaluates an expression, discarding the returned value.
- *
- * @final
- */
-class Twig_TokenParser_Do extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Do($expr, $token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'do';
-    }
-}
-
-class_alias('Twig_TokenParser_Do', 'Twig\TokenParser\DoTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Embed.php b/inc/lib/Twig/TokenParser/Embed.php
deleted file mode 100644
index 44644cc6..00000000
--- a/inc/lib/Twig/TokenParser/Embed.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Embeds a template.
- *
- * @final
- */
-class Twig_TokenParser_Embed extends Twig_TokenParser_Include
-{
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
-
-        $parent = $this->parser->getExpressionParser()->parseExpression();
-
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
-
-        $parentToken = $fakeParentToken = new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine());
-        if ($parent instanceof Twig_Node_Expression_Constant) {
-            $parentToken = new Twig_Token(Twig_Token::STRING_TYPE, $parent->getAttribute('value'), $token->getLine());
-        } elseif ($parent instanceof Twig_Node_Expression_Name) {
-            $parentToken = new Twig_Token(Twig_Token::NAME_TYPE, $parent->getAttribute('name'), $token->getLine());
-        }
-
-        // inject a fake parent to make the parent() function work
-        $stream->injectTokens(array(
-            new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', $token->getLine()),
-            new Twig_Token(Twig_Token::NAME_TYPE, 'extends', $token->getLine()),
-            $parentToken,
-            new Twig_Token(Twig_Token::BLOCK_END_TYPE, '', $token->getLine()),
-        ));
-
-        $module = $this->parser->parse($stream, array($this, 'decideBlockEnd'), true);
-
-        // override the parent with the correct one
-        if ($fakeParentToken === $parentToken) {
-            $module->setNode('parent', $parent);
-        }
-
-        $this->parser->embedTemplate($module);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Embed($module->getTemplateName(), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endembed');
-    }
-
-    public function getTag()
-    {
-        return 'embed';
-    }
-}
-
-class_alias('Twig_TokenParser_Embed', 'Twig\TokenParser\EmbedTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Extends.php b/inc/lib/Twig/TokenParser/Extends.php
deleted file mode 100644
index 31168cce..00000000
--- a/inc/lib/Twig/TokenParser/Extends.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Extends a template by another one.
- *
- * <pre>
- *  {% extends "base.html" %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Extends extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
-
-        if (!$this->parser->isMainScope()) {
-            throw new Twig_Error_Syntax('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext());
-        }
-
-        if (null !== $this->parser->getParent()) {
-            throw new Twig_Error_Syntax('Multiple extends tags are forbidden.', $token->getLine(), $stream->getSourceContext());
-        }
-        $this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-    }
-
-    public function getTag()
-    {
-        return 'extends';
-    }
-}
-
-class_alias('Twig_TokenParser_Extends', 'Twig\TokenParser\ExtendsTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Filter.php b/inc/lib/Twig/TokenParser/Filter.php
deleted file mode 100644
index 76017829..00000000
--- a/inc/lib/Twig/TokenParser/Filter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Filters a section of a template by applying filters.
- *
- * <pre>
- * {% filter upper %}
- *  This text becomes uppercase
- * {% endfilter %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Filter extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $name = $this->parser->getVarName();
-        $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), null, $token->getLine(), $this->getTag());
-
-        $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $block = new Twig_Node_Block($name, $body, $token->getLine());
-        $this->parser->setBlock($name, $block);
-
-        return new Twig_Node_Print($filter, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endfilter');
-    }
-
-    public function getTag()
-    {
-        return 'filter';
-    }
-}
-
-class_alias('Twig_TokenParser_Filter', 'Twig\TokenParser\FilterTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Flush.php b/inc/lib/Twig/TokenParser/Flush.php
deleted file mode 100644
index 51832c77..00000000
--- a/inc/lib/Twig/TokenParser/Flush.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Flushes the output to the client.
- *
- * @see flush()
- *
- * @final
- */
-class Twig_TokenParser_Flush extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Flush($token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'flush';
-    }
-}
-
-class_alias('Twig_TokenParser_Flush', 'Twig\TokenParser\FlushTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/For.php b/inc/lib/Twig/TokenParser/For.php
deleted file mode 100644
index 8e737c5f..00000000
--- a/inc/lib/Twig/TokenParser/For.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Loops over each item of a sequence.
- *
- * <pre>
- * <ul>
- *  {% for user in users %}
- *    <li>{{ user.username|e }}</li>
- *  {% endfor %}
- * </ul>
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_For extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $targets = $this->parser->getExpressionParser()->parseAssignmentExpression();
-        $stream->expect(Twig_Token::OPERATOR_TYPE, 'in');
-        $seq = $this->parser->getExpressionParser()->parseExpression();
-
-        $ifexpr = null;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'if')) {
-            $ifexpr = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideForFork'));
-        if ('else' == $stream->next()->getValue()) {
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-            $else = $this->parser->subparse(array($this, 'decideForEnd'), true);
-        } else {
-            $else = null;
-        }
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        if (count($targets) > 1) {
-            $keyTarget = $targets->getNode(0);
-            $keyTarget = new Twig_Node_Expression_AssignName($keyTarget->getAttribute('name'), $keyTarget->getTemplateLine());
-            $valueTarget = $targets->getNode(1);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getTemplateLine());
-        } else {
-            $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno);
-            $valueTarget = $targets->getNode(0);
-            $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getTemplateLine());
-        }
-
-        if ($ifexpr) {
-            $this->checkLoopUsageCondition($stream, $ifexpr);
-            $this->checkLoopUsageBody($stream, $body);
-        }
-
-        return new Twig_Node_For($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, $lineno, $this->getTag());
-    }
-
-    public function decideForFork(Twig_Token $token)
-    {
-        return $token->test(array('else', 'endfor'));
-    }
-
-    public function decideForEnd(Twig_Token $token)
-    {
-        return $token->test('endfor');
-    }
-
-    // the loop variable cannot be used in the condition
-    protected function checkLoopUsageCondition(Twig_TokenStream $stream, Twig_NodeInterface $node)
-    {
-        if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
-            throw new Twig_Error_Syntax('The "loop" variable cannot be used in a looping condition.', $node->getTemplateLine(), $stream->getSourceContext());
-        }
-
-        foreach ($node as $n) {
-            if (!$n) {
-                continue;
-            }
-
-            $this->checkLoopUsageCondition($stream, $n);
-        }
-    }
-
-    // check usage of non-defined loop-items
-    // it does not catch all problems (for instance when a for is included into another or when the variable is used in an include)
-    protected function checkLoopUsageBody(Twig_TokenStream $stream, Twig_NodeInterface $node)
-    {
-        if ($node instanceof Twig_Node_Expression_GetAttr && $node->getNode('node') instanceof Twig_Node_Expression_Name && 'loop' == $node->getNode('node')->getAttribute('name')) {
-            $attribute = $node->getNode('attribute');
-            if ($attribute instanceof Twig_Node_Expression_Constant && in_array($attribute->getAttribute('value'), array('length', 'revindex0', 'revindex', 'last'))) {
-                throw new Twig_Error_Syntax(sprintf('The "loop.%s" variable is not defined when looping with a condition.', $attribute->getAttribute('value')), $node->getTemplateLine(), $stream->getSourceContext());
-            }
-        }
-
-        // should check for parent.loop.XXX usage
-        if ($node instanceof Twig_Node_For) {
-            return;
-        }
-
-        foreach ($node as $n) {
-            if (!$n) {
-                continue;
-            }
-
-            $this->checkLoopUsageBody($stream, $n);
-        }
-    }
-
-    public function getTag()
-    {
-        return 'for';
-    }
-}
-
-class_alias('Twig_TokenParser_For', 'Twig\TokenParser\ForTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/From.php b/inc/lib/Twig/TokenParser/From.php
deleted file mode 100644
index f3053da4..00000000
--- a/inc/lib/Twig/TokenParser/From.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% from 'forms.html' import forms %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_From extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect('import');
-
-        $targets = array();
-        do {
-            $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-            $alias = $name;
-            if ($stream->nextIf('as')) {
-                $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-            }
-
-            $targets[$name] = $alias;
-
-            if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-        } while (true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag());
-
-        foreach ($targets as $name => $alias) {
-            if ($this->parser->isReservedMacroName($name)) {
-                throw new Twig_Error_Syntax(sprintf('"%s" cannot be an imported macro as it is a reserved keyword.', $name), $token->getLine(), $stream->getSourceContext());
-            }
-
-            $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
-        }
-
-        return $node;
-    }
-
-    public function getTag()
-    {
-        return 'from';
-    }
-}
-
-class_alias('Twig_TokenParser_From', 'Twig\TokenParser\FromTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/If.php b/inc/lib/Twig/TokenParser/If.php
deleted file mode 100644
index f081df3a..00000000
--- a/inc/lib/Twig/TokenParser/If.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Tests a condition.
- *
- * <pre>
- * {% if users %}
- *  <ul>
- *    {% for user in users %}
- *      <li>{{ user.username|e }}</li>
- *    {% endfor %}
- *  </ul>
- * {% endif %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_If extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideIfFork'));
-        $tests = array($expr, $body);
-        $else = null;
-
-        $end = false;
-        while (!$end) {
-            switch ($stream->next()->getValue()) {
-                case 'else':
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $else = $this->parser->subparse(array($this, 'decideIfEnd'));
-                    break;
-
-                case 'elseif':
-                    $expr = $this->parser->getExpressionParser()->parseExpression();
-                    $stream->expect(Twig_Token::BLOCK_END_TYPE);
-                    $body = $this->parser->subparse(array($this, 'decideIfFork'));
-                    $tests[] = $expr;
-                    $tests[] = $body;
-                    break;
-
-                case 'endif':
-                    $end = true;
-                    break;
-
-                default:
-                    throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d).', $lineno), $stream->getCurrent()->getLine(), $stream->getSourceContext());
-            }
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
-    }
-
-    public function decideIfFork(Twig_Token $token)
-    {
-        return $token->test(array('elseif', 'else', 'endif'));
-    }
-
-    public function decideIfEnd(Twig_Token $token)
-    {
-        return $token->test(array('endif'));
-    }
-
-    public function getTag()
-    {
-        return 'if';
-    }
-}
-
-class_alias('Twig_TokenParser_If', 'Twig\TokenParser\IfTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Import.php b/inc/lib/Twig/TokenParser/Import.php
deleted file mode 100644
index 47802f50..00000000
--- a/inc/lib/Twig/TokenParser/Import.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports macros.
- *
- * <pre>
- *   {% import 'forms.html' as forms %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Import extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $macro = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect('as');
-        $var = new Twig_Node_Expression_AssignName($this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue(), $token->getLine());
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->addImportedSymbol('template', $var->getAttribute('name'));
-
-        return new Twig_Node_Import($macro, $var, $token->getLine(), $this->getTag());
-    }
-
-    public function getTag()
-    {
-        return 'import';
-    }
-}
-
-class_alias('Twig_TokenParser_Import', 'Twig\TokenParser\ImportTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Include.php b/inc/lib/Twig/TokenParser/Include.php
deleted file mode 100644
index 309f11db..00000000
--- a/inc/lib/Twig/TokenParser/Include.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Includes a template.
- *
- * <pre>
- *   {% include 'header.html' %}
- *     Body
- *   {% include 'footer.html' %}
- * </pre>
- */
-class Twig_TokenParser_Include extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $expr = $this->parser->getExpressionParser()->parseExpression();
-
-        list($variables, $only, $ignoreMissing) = $this->parseArguments();
-
-        return new Twig_Node_Include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
-    }
-
-    protected function parseArguments()
-    {
-        $stream = $this->parser->getStream();
-
-        $ignoreMissing = false;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'ignore')) {
-            $stream->expect(Twig_Token::NAME_TYPE, 'missing');
-
-            $ignoreMissing = true;
-        }
-
-        $variables = null;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) {
-            $variables = $this->parser->getExpressionParser()->parseExpression();
-        }
-
-        $only = false;
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'only')) {
-            $only = true;
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return array($variables, $only, $ignoreMissing);
-    }
-
-    public function getTag()
-    {
-        return 'include';
-    }
-}
-
-class_alias('Twig_TokenParser_Include', 'Twig\TokenParser\IncludeTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Macro.php b/inc/lib/Twig/TokenParser/Macro.php
deleted file mode 100644
index 4287934b..00000000
--- a/inc/lib/Twig/TokenParser/Macro.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a macro.
- *
- * <pre>
- * {% macro input(name, value, type, size) %}
- *    <input type="{{ type|default('text') }}" name="{{ name }}" value="{{ value|e }}" size="{{ size|default(20) }}" />
- * {% endmacro %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Macro extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-        $arguments = $this->parser->getExpressionParser()->parseArguments(true, true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $this->parser->pushLocalScope();
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
-            $value = $token->getValue();
-
-            if ($value != $name) {
-                throw new Twig_Error_Syntax(sprintf('Expected endmacro for macro "%s" (but "%s" given).', $name, $value), $stream->getCurrent()->getLine(), $stream->getSourceContext());
-            }
-        }
-        $this->parser->popLocalScope();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body(array($body)), $arguments, $lineno, $this->getTag()));
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endmacro');
-    }
-
-    public function getTag()
-    {
-        return 'macro';
-    }
-}
-
-class_alias('Twig_TokenParser_Macro', 'Twig\TokenParser\MacroTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Sandbox.php b/inc/lib/Twig/TokenParser/Sandbox.php
deleted file mode 100644
index 7fc70d9a..00000000
--- a/inc/lib/Twig/TokenParser/Sandbox.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Marks a section of a template as untrusted code that must be evaluated in the sandbox mode.
- *
- * <pre>
- * {% sandbox %}
- *     {% include 'user.html' %}
- * {% endsandbox %}
- * </pre>
- *
- * @see https://twig.symfony.com/doc/api.html#sandbox-extension for details
- *
- * @final
- */
-class Twig_TokenParser_Sandbox extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        // in a sandbox tag, only include tags are allowed
-        if (!$body instanceof Twig_Node_Include) {
-            foreach ($body as $node) {
-                if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) {
-                    continue;
-                }
-
-                if (!$node instanceof Twig_Node_Include) {
-                    throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section.', $node->getTemplateLine(), $stream->getSourceContext());
-                }
-            }
-        }
-
-        return new Twig_Node_Sandbox($body, $token->getLine(), $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endsandbox');
-    }
-
-    public function getTag()
-    {
-        return 'sandbox';
-    }
-}
-
-class_alias('Twig_TokenParser_Sandbox', 'Twig\TokenParser\SandboxTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Set.php b/inc/lib/Twig/TokenParser/Set.php
deleted file mode 100644
index 48c6b3ae..00000000
--- a/inc/lib/Twig/TokenParser/Set.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines a variable.
- *
- * <pre>
- *  {% set foo = 'foo' %}
- *
- *  {% set foo = [1, 2] %}
- *
- *  {% set foo = {'foo': 'bar'} %}
- *
- *  {% set foo = 'foo' ~ 'bar' %}
- *
- *  {% set foo, bar = 'foo', 'bar' %}
- *
- *  {% set foo %}Some content{% endset %}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Set extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-        $stream = $this->parser->getStream();
-        $names = $this->parser->getExpressionParser()->parseAssignmentExpression();
-
-        $capture = false;
-        if ($stream->nextIf(Twig_Token::OPERATOR_TYPE, '=')) {
-            $values = $this->parser->getExpressionParser()->parseMultitargetExpression();
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            if (count($names) !== count($values)) {
-                throw new Twig_Error_Syntax('When using set, you must have the same number of variables and assignments.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
-            }
-        } else {
-            $capture = true;
-
-            if (count($names) > 1) {
-                throw new Twig_Error_Syntax('When using set with a block, you cannot have a multi-target.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
-            }
-
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-            $values = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
-            $stream->expect(Twig_Token::BLOCK_END_TYPE);
-        }
-
-        return new Twig_Node_Set($capture, $names, $values, $lineno, $this->getTag());
-    }
-
-    public function decideBlockEnd(Twig_Token $token)
-    {
-        return $token->test('endset');
-    }
-
-    public function getTag()
-    {
-        return 'set';
-    }
-}
-
-class_alias('Twig_TokenParser_Set', 'Twig\TokenParser\SetTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Spaceless.php b/inc/lib/Twig/TokenParser/Spaceless.php
deleted file mode 100644
index cecf27c6..00000000
--- a/inc/lib/Twig/TokenParser/Spaceless.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Remove whitespaces between HTML tags.
- *
- * <pre>
- * {% spaceless %}
- *      <div>
- *          <strong>foo</strong>
- *      </div>
- * {% endspaceless %}
- *
- * {# output will be <div><strong>foo</strong></div> #}
- * </pre>
- *
- * @final
- */
-class Twig_TokenParser_Spaceless extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $lineno = $token->getLine();
-
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-        $body = $this->parser->subparse(array($this, 'decideSpacelessEnd'), true);
-        $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_Spaceless($body, $lineno, $this->getTag());
-    }
-
-    public function decideSpacelessEnd(Twig_Token $token)
-    {
-        return $token->test('endspaceless');
-    }
-
-    public function getTag()
-    {
-        return 'spaceless';
-    }
-}
-
-class_alias('Twig_TokenParser_Spaceless', 'Twig\TokenParser\SpacelessTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/Use.php b/inc/lib/Twig/TokenParser/Use.php
deleted file mode 100644
index 1ab24e2c..00000000
--- a/inc/lib/Twig/TokenParser/Use.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Imports blocks defined in another template into the current template.
- *
- * <pre>
- * {% extends "base.html" %}
- *
- * {% use "blocks.html" %}
- *
- * {% block title %}{% endblock %}
- * {% block content %}{% endblock %}
- * </pre>
- *
- * @see https://twig.symfony.com/doc/templates.html#horizontal-reuse for details.
- *
- * @final
- */
-class Twig_TokenParser_Use extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $template = $this->parser->getExpressionParser()->parseExpression();
-        $stream = $this->parser->getStream();
-
-        if (!$template instanceof Twig_Node_Expression_Constant) {
-            throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
-        }
-
-        $targets = array();
-        if ($stream->nextIf('with')) {
-            do {
-                $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-
-                $alias = $name;
-                if ($stream->nextIf('as')) {
-                    $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-                }
-
-                $targets[$name] = new Twig_Node_Expression_Constant($alias, -1);
-
-                if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                    break;
-                }
-            } while (true);
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
-
-        return new Twig_Node();
-    }
-
-    public function getTag()
-    {
-        return 'use';
-    }
-}
-
-class_alias('Twig_TokenParser_Use', 'Twig\TokenParser\UseTokenParser', false);
diff --git a/inc/lib/Twig/TokenParser/With.php b/inc/lib/Twig/TokenParser/With.php
deleted file mode 100644
index 7a692597..00000000
--- a/inc/lib/Twig/TokenParser/With.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Creates a nested scope.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_TokenParser_With extends Twig_TokenParser
-{
-    public function parse(Twig_Token $token)
-    {
-        $stream = $this->parser->getStream();
-
-        $variables = null;
-        $only = false;
-        if (!$stream->test(Twig_Token::BLOCK_END_TYPE)) {
-            $variables = $this->parser->getExpressionParser()->parseExpression();
-            $only = $stream->nextIf(Twig_Token::NAME_TYPE, 'only');
-        }
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        $body = $this->parser->subparse(array($this, 'decideWithEnd'), true);
-
-        $stream->expect(Twig_Token::BLOCK_END_TYPE);
-
-        return new Twig_Node_With($body, $variables, $only, $token->getLine(), $this->getTag());
-    }
-
-    public function decideWithEnd(Twig_Token $token)
-    {
-        return $token->test('endwith');
-    }
-
-    public function getTag()
-    {
-        return 'with';
-    }
-}
-
-class_alias('Twig_TokenParser_With', 'Twig\TokenParser\WithTokenParser', false);
diff --git a/inc/lib/Twig/TokenParserBroker.php b/inc/lib/Twig/TokenParserBroker.php
deleted file mode 100644
index 0d7d6e52..00000000
--- a/inc/lib/Twig/TokenParserBroker.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Default implementation of a token parser broker.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
-{
-    protected $parser;
-    protected $parsers = array();
-    protected $brokers = array();
-
-    /**
-     * @param array|Traversable $parsers                 A Traversable of Twig_TokenParserInterface instances
-     * @param array|Traversable $brokers                 A Traversable of Twig_TokenParserBrokerInterface instances
-     * @param bool              $triggerDeprecationError
-     */
-    public function __construct($parsers = array(), $brokers = array(), $triggerDeprecationError = true)
-    {
-        if ($triggerDeprecationError) {
-            @trigger_error('The '.__CLASS__.' class is deprecated since version 1.12 and will be removed in 2.0.', E_USER_DEPRECATED);
-        }
-
-        foreach ($parsers as $parser) {
-            if (!$parser instanceof Twig_TokenParserInterface) {
-                throw new LogicException('$parsers must a an array of Twig_TokenParserInterface.');
-            }
-            $this->parsers[$parser->getTag()] = $parser;
-        }
-        foreach ($brokers as $broker) {
-            if (!$broker instanceof Twig_TokenParserBrokerInterface) {
-                throw new LogicException('$brokers must a an array of Twig_TokenParserBrokerInterface.');
-            }
-            $this->brokers[] = $broker;
-        }
-    }
-
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $this->parsers[$parser->getTag()] = $parser;
-    }
-
-    public function removeTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $name = $parser->getTag();
-        if (isset($this->parsers[$name]) && $parser === $this->parsers[$name]) {
-            unset($this->parsers[$name]);
-        }
-    }
-
-    public function addTokenParserBroker(self $broker)
-    {
-        $this->brokers[] = $broker;
-    }
-
-    public function removeTokenParserBroker(self $broker)
-    {
-        if (false !== $pos = array_search($broker, $this->brokers)) {
-            unset($this->brokers[$pos]);
-        }
-    }
-
-    /**
-     * Gets a suitable TokenParser for a tag.
-     *
-     * First looks in parsers, then in brokers.
-     *
-     * @param string $tag A tag name
-     *
-     * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    public function getTokenParser($tag)
-    {
-        if (isset($this->parsers[$tag])) {
-            return $this->parsers[$tag];
-        }
-        $broker = end($this->brokers);
-        while (false !== $broker) {
-            $parser = $broker->getTokenParser($tag);
-            if (null !== $parser) {
-                return $parser;
-            }
-            $broker = prev($this->brokers);
-        }
-    }
-
-    public function getParsers()
-    {
-        return $this->parsers;
-    }
-
-    public function getParser()
-    {
-        return $this->parser;
-    }
-
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-        foreach ($this->parsers as $tokenParser) {
-            $tokenParser->setParser($parser);
-        }
-        foreach ($this->brokers as $broker) {
-            $broker->setParser($parser);
-        }
-    }
-}
diff --git a/inc/lib/Twig/TokenParserBrokerInterface.php b/inc/lib/Twig/TokenParserBrokerInterface.php
deleted file mode 100644
index 6c93f5ea..00000000
--- a/inc/lib/Twig/TokenParserBrokerInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Arnaud Le Blanc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parser brokers.
- *
- * Token parser brokers allows to implement custom logic in the process of resolving a token parser for a given tag name.
- *
- * @author Arnaud Le Blanc <arnaud.lb@gmail.com>
- *
- * @deprecated since 1.12 (to be removed in 2.0)
- */
-interface Twig_TokenParserBrokerInterface
-{
-    /**
-     * Gets a TokenParser suitable for a tag.
-     *
-     * @param string $tag A tag name
-     *
-     * @return Twig_TokenParserInterface|null A Twig_TokenParserInterface or null if no suitable TokenParser was found
-     */
-    public function getTokenParser($tag);
-
-    /**
-     * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
-     */
-    public function setParser(Twig_ParserInterface $parser);
-
-    /**
-     * Gets the Twig_ParserInterface.
-     *
-     * @return null|Twig_ParserInterface A Twig_ParserInterface instance or null
-     */
-    public function getParser();
-}
diff --git a/inc/lib/Twig/TokenParserInterface.php b/inc/lib/Twig/TokenParserInterface.php
deleted file mode 100644
index 14acc808..00000000
--- a/inc/lib/Twig/TokenParserInterface.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface implemented by token parsers.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface Twig_TokenParserInterface
-{
-    /**
-     * Sets the parser associated with this token parser.
-     */
-    public function setParser(Twig_Parser $parser);
-
-    /**
-     * Parses a token and returns a node.
-     *
-     * @return Twig_NodeInterface
-     *
-     * @throws Twig_Error_Syntax
-     */
-    public function parse(Twig_Token $token);
-
-    /**
-     * Gets the tag name associated with this token parser.
-     *
-     * @return string The tag name
-     */
-    public function getTag();
-}
-
-class_alias('Twig_TokenParserInterface', 'Twig\TokenParser\TokenParserInterface', false);
-class_exists('Twig_Parser');
-class_exists('Twig_Token');
diff --git a/inc/lib/Twig/TokenStream.php b/inc/lib/Twig/TokenStream.php
deleted file mode 100644
index 81c043ca..00000000
--- a/inc/lib/Twig/TokenStream.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- * (c) Armin Ronacher
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Represents a token stream.
- *
- * @final
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_TokenStream
-{
-    protected $tokens;
-    protected $current = 0;
-    protected $filename;
-
-    private $source;
-
-    /**
-     * @param array       $tokens An array of tokens
-     * @param string|null $name   The name of the template which tokens are associated with
-     * @param string|null $source The source code associated with the tokens
-     */
-    public function __construct(array $tokens, $name = null, $source = null)
-    {
-        if (!$name instanceof Twig_Source) {
-            if (null !== $name || null !== $source) {
-                @trigger_error(sprintf('Passing a string as the $name argument of %s() is deprecated since version 1.27. Pass a Twig_Source instance instead.', __METHOD__), E_USER_DEPRECATED);
-            }
-            $this->source = new Twig_Source($source, $name);
-        } else {
-            $this->source = $name;
-        }
-
-        $this->tokens = $tokens;
-
-        // deprecated, not used anymore, to be removed in 2.0
-        $this->filename = $this->source->getName();
-    }
-
-    public function __toString()
-    {
-        return implode("\n", $this->tokens);
-    }
-
-    public function injectTokens(array $tokens)
-    {
-        $this->tokens = array_merge(array_slice($this->tokens, 0, $this->current), $tokens, array_slice($this->tokens, $this->current));
-    }
-
-    /**
-     * Sets the pointer to the next token and returns the old one.
-     *
-     * @return Twig_Token
-     */
-    public function next()
-    {
-        if (!isset($this->tokens[++$this->current])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current - 1]->getLine(), $this->source);
-        }
-
-        return $this->tokens[$this->current - 1];
-    }
-
-    /**
-     * Tests a token, sets the pointer to the next one and returns it or throws a syntax error.
-     *
-     * @return Twig_Token|null The next token if the condition is true, null otherwise
-     */
-    public function nextIf($primary, $secondary = null)
-    {
-        if ($this->tokens[$this->current]->test($primary, $secondary)) {
-            return $this->next();
-        }
-    }
-
-    /**
-     * Tests a token and returns it or throws a syntax error.
-     *
-     * @return Twig_Token
-     */
-    public function expect($type, $value = null, $message = null)
-    {
-        $token = $this->tokens[$this->current];
-        if (!$token->test($type, $value)) {
-            $line = $token->getLine();
-            throw new Twig_Error_Syntax(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).',
-                $message ? $message.'. ' : '',
-                Twig_Token::typeToEnglish($token->getType()), $token->getValue(),
-                Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
-                $line,
-                $this->source
-            );
-        }
-        $this->next();
-
-        return $token;
-    }
-
-    /**
-     * Looks at the next token.
-     *
-     * @param int $number
-     *
-     * @return Twig_Token
-     */
-    public function look($number = 1)
-    {
-        if (!isset($this->tokens[$this->current + $number])) {
-            throw new Twig_Error_Syntax('Unexpected end of template.', $this->tokens[$this->current + $number - 1]->getLine(), $this->source);
-        }
-
-        return $this->tokens[$this->current + $number];
-    }
-
-    /**
-     * Tests the current token.
-     *
-     * @return bool
-     */
-    public function test($primary, $secondary = null)
-    {
-        return $this->tokens[$this->current]->test($primary, $secondary);
-    }
-
-    /**
-     * Checks if end of stream was reached.
-     *
-     * @return bool
-     */
-    public function isEOF()
-    {
-        return Twig_Token::EOF_TYPE === $this->tokens[$this->current]->getType();
-    }
-
-    /**
-     * @return Twig_Token
-     */
-    public function getCurrent()
-    {
-        return $this->tokens[$this->current];
-    }
-
-    /**
-     * Gets the name associated with this stream (null if not defined).
-     *
-     * @return string|null
-     *
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getFilename()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->source->getName();
-    }
-
-    /**
-     * Gets the source code associated with this stream.
-     *
-     * @return string
-     *
-     * @internal Don't use this as it might be empty depending on the environment configuration
-     *
-     * @deprecated since 1.27 (to be removed in 2.0)
-     */
-    public function getSource()
-    {
-        @trigger_error(sprintf('The %s() method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->source->getCode();
-    }
-
-    /**
-     * Gets the source associated with this stream.
-     *
-     * @return Twig_Source
-     *
-     * @internal
-     */
-    public function getSourceContext()
-    {
-        return $this->source;
-    }
-}
-
-class_alias('Twig_TokenStream', 'Twig\TokenStream', false);
diff --git a/inc/lib/Twig/Util/DeprecationCollector.php b/inc/lib/Twig/Util/DeprecationCollector.php
deleted file mode 100644
index c7bf53be..00000000
--- a/inc/lib/Twig/Util/DeprecationCollector.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
- */
-class Twig_Util_DeprecationCollector
-{
-    private $twig;
-    private $deprecations;
-
-    public function __construct(Twig_Environment $twig)
-    {
-        $this->twig = $twig;
-    }
-
-    /**
-     * Returns deprecations for templates contained in a directory.
-     *
-     * @param string $dir A directory where templates are stored
-     * @param string $ext Limit the loaded templates by extension
-     *
-     * @return array An array of deprecations
-     */
-    public function collectDir($dir, $ext = '.twig')
-    {
-        $iterator = new RegexIterator(
-            new RecursiveIteratorIterator(
-                new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY
-            ), '{'.preg_quote($ext).'$}'
-        );
-
-        return $this->collect(new Twig_Util_TemplateDirIterator($iterator));
-    }
-
-    /**
-     * Returns deprecations for passed templates.
-     *
-     * @param Traversable $iterator An iterator of templates (where keys are template names and values the contents of the template)
-     *
-     * @return array An array of deprecations
-     */
-    public function collect(Traversable $iterator)
-    {
-        $this->deprecations = array();
-
-        set_error_handler(array($this, 'errorHandler'));
-
-        foreach ($iterator as $name => $contents) {
-            try {
-                $this->twig->parse($this->twig->tokenize(new Twig_Source($contents, $name)));
-            } catch (Twig_Error_Syntax $e) {
-                // ignore templates containing syntax errors
-            }
-        }
-
-        restore_error_handler();
-
-        $deprecations = $this->deprecations;
-        $this->deprecations = array();
-
-        return $deprecations;
-    }
-
-    /**
-     * @internal
-     */
-    public function errorHandler($type, $msg)
-    {
-        if (E_USER_DEPRECATED === $type) {
-            $this->deprecations[] = $msg;
-        }
-    }
-}
-
-class_alias('Twig_Util_DeprecationCollector', 'Twig\Util\DeprecationCollector', false);
diff --git a/inc/lib/Twig/Util/TemplateDirIterator.php b/inc/lib/Twig/Util/TemplateDirIterator.php
deleted file mode 100644
index c8682335..00000000
--- a/inc/lib/Twig/Util/TemplateDirIterator.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Twig_Util_TemplateDirIterator extends IteratorIterator
-{
-    public function current()
-    {
-        return file_get_contents(parent::current());
-    }
-
-    public function key()
-    {
-        return (string) parent::key();
-    }
-}
-
-class_alias('Twig_Util_TemplateDirIterator', 'Twig\Util\TemplateDirIterator', false);
diff --git a/inc/lib/Twig/Extensions/Extension/I18n.php b/inc/lib/Twig/extensions/Extension/I18n.php
index bc6a05bd..bc6a05bd 100644
--- a/inc/lib/Twig/Extensions/Extension/I18n.php
+++ b/inc/lib/Twig/extensions/Extension/I18n.php
diff --git a/inc/lib/Twig/Extensions/Extension/Tinyboard.php b/inc/lib/Twig/extensions/Extension/Tinyboard.php
index 3d964c71..3d964c71 100644
--- a/inc/lib/Twig/Extensions/Extension/Tinyboard.php
+++ b/inc/lib/Twig/extensions/Extension/Tinyboard.php
diff --git a/inc/lib/Twig/Extensions/Node/Trans.php b/inc/lib/Twig/extensions/Node/Trans.php
index e7dc1ca8..e7dc1ca8 100644
--- a/inc/lib/Twig/Extensions/Node/Trans.php
+++ b/inc/lib/Twig/extensions/Node/Trans.php
diff --git a/inc/lib/Twig/Extensions/TokenParser/Trans.php b/inc/lib/Twig/extensions/TokenParser/Trans.php
index 4a0fad41..4a0fad41 100644
--- a/inc/lib/Twig/Extensions/TokenParser/Trans.php
+++ b/inc/lib/Twig/extensions/TokenParser/Trans.php
diff --git a/inc/lib/geoip/geoip.inc b/inc/lib/geoip/geoip.inc
deleted file mode 100644
index 16e8c392..00000000
--- a/inc/lib/geoip/geoip.inc
+++ /dev/null
@@ -1,722 +0,0 @@
-<?php
-
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* geoip.inc
- *
- * Copyright (C) 2007 MaxMind LLC
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-namespace geoip;
-
-@define("GEOIP_COUNTRY_BEGIN", 16776960);
-@define("GEOIP_STATE_BEGIN_REV0", 16700000);
-@define("GEOIP_STATE_BEGIN_REV1", 16000000);
-@define("GEOIP_STANDARD", 0);
-@define("GEOIP_MEMORY_CACHE", 1);
-@define("GEOIP_SHARED_MEMORY", 2);
-@define("STRUCTURE_INFO_MAX_SIZE", 20);
-@define("DATABASE_INFO_MAX_SIZE", 100);
-@define("GEOIP_COUNTRY_EDITION", 1);
-@define("GEOIP_PROXY_EDITION", 8);
-@define("GEOIP_ASNUM_EDITION", 9);
-@define("GEOIP_NETSPEED_EDITION", 10);
-@define("GEOIP_REGION_EDITION_REV0", 7);
-@define("GEOIP_REGION_EDITION_REV1", 3);
-@define("GEOIP_CITY_EDITION_REV0", 6);
-@define("GEOIP_CITY_EDITION_REV1", 2);
-@define("GEOIP_ORG_EDITION", 5);
-@define("GEOIP_ISP_EDITION", 4);
-@define("SEGMENT_RECORD_LENGTH", 3);
-@define("STANDARD_RECORD_LENGTH", 3);
-@define("ORG_RECORD_LENGTH", 4);
-@define("MAX_RECORD_LENGTH", 4);
-@define("MAX_ORG_RECORD_LENGTH", 300);
-@define("GEOIP_SHM_KEY", 0x4f415401);
-@define("US_OFFSET", 1);
-@define("CANADA_OFFSET", 677);
-@define("WORLD_OFFSET", 1353);
-@define("FIPS_RANGE", 360);
-@define("GEOIP_UNKNOWN_SPEED", 0);
-@define("GEOIP_DIALUP_SPEED", 1);
-@define("GEOIP_CABLEDSL_SPEED", 2);
-@define("GEOIP_CORPORATE_SPEED", 3);
-@define("GEOIP_DOMAIN_EDITION", 11);
-@define("GEOIP_COUNTRY_EDITION_V6", 12);
-@define("GEOIP_LOCATIONA_EDITION", 13);
-@define("GEOIP_ACCURACYRADIUS_EDITION", 14);
-@define("GEOIP_CITYCOMBINED_EDITION", 15);
-@define("GEOIP_CITY_EDITION_REV1_V6", 30);
-@define("GEOIP_CITY_EDITION_REV0_V6",31);
-@define("GEOIP_NETSPEED_EDITION_REV1",32);
-@define("GEOIP_NETSPEED_EDITION_REV1_V6",33);
-@define("GEOIP_USERTYPE_EDITION",28);
-@define("GEOIP_USERTYPE_EDITION_V6",29);
-@define("GEOIP_ASNUM_EDITION_V6",21);
-@define("GEOIP_ISP_EDITION_V6",22);
-@define("GEOIP_ORG_EDITION_V6",23);
-@define("GEOIP_DOMAIN_EDITION_V6",24);
-
-@define("CITYCOMBINED_FIXED_RECORD", 7 );
-
-class GeoIP {
-    var $flags;
-    var $filehandle;
-    var $memory_buffer;
-    var $databaseType;
-    var $databaseSegments;
-    var $record_length;
-    var $shmid;
-    var $GEOIP_COUNTRY_CODE_TO_NUMBER = array(
-	    "" => 0, "AP" => 1, "EU" => 2, "AD" => 3, "AE" => 4, "AF" => 5,
-	    "AG" => 6, "AI" => 7, "AL" => 8, "AM" => 9, "CW" => 10, "AO" => 11,
-	    "AQ" => 12, "AR" => 13, "AS" => 14, "AT" => 15, "AU" => 16, "AW" => 17,
-	    "AZ" => 18, "BA" => 19, "BB" => 20, "BD" => 21, "BE" => 22, "BF" => 23,
-	    "BG" => 24, "BH" => 25, "BI" => 26, "BJ" => 27, "BM" => 28, "BN" => 29,
-	    "BO" => 30, "BR" => 31, "BS" => 32, "BT" => 33, "BV" => 34, "BW" => 35,
-	    "BY" => 36, "BZ" => 37, "CA" => 38, "CC" => 39, "CD" => 40, "CF" => 41,
-	    "CG" => 42, "CH" => 43, "CI" => 44, "CK" => 45, "CL" => 46, "CM" => 47,
-	    "CN" => 48, "CO" => 49, "CR" => 50, "CU" => 51, "CV" => 52, "CX" => 53,
-	    "CY" => 54, "CZ" => 55, "DE" => 56, "DJ" => 57, "DK" => 58, "DM" => 59,
-	    "DO" => 60, "DZ" => 61, "EC" => 62, "EE" => 63, "EG" => 64, "EH" => 65,
-	    "ER" => 66, "ES" => 67, "ET" => 68, "FI" => 69, "FJ" => 70, "FK" => 71,
-	    "FM" => 72, "FO" => 73, "FR" => 74, "SX" => 75, "GA" => 76, "GB" => 77,
-	    "GD" => 78, "GE" => 79, "GF" => 80, "GH" => 81, "GI" => 82, "GL" => 83,
-	    "GM" => 84, "GN" => 85, "GP" => 86, "GQ" => 87, "GR" => 88, "GS" => 89,
-	    "GT" => 90, "GU" => 91, "GW" => 92, "GY" => 93, "HK" => 94, "HM" => 95,
-	    "HN" => 96, "HR" => 97, "HT" => 98, "HU" => 99, "ID" => 100, "IE" => 101,
-	    "IL" => 102, "IN" => 103, "IO" => 104, "IQ" => 105, "IR" => 106, "IS" => 107,
-	    "IT" => 108, "JM" => 109, "JO" => 110, "JP" => 111, "KE" => 112, "KG" => 113,
-	    "KH" => 114, "KI" => 115, "KM" => 116, "KN" => 117, "KP" => 118, "KR" => 119,
-	    "KW" => 120, "KY" => 121, "KZ" => 122, "LA" => 123, "LB" => 124, "LC" => 125,
-	    "LI" => 126, "LK" => 127, "LR" => 128, "LS" => 129, "LT" => 130, "LU" => 131,
-	    "LV" => 132, "LY" => 133, "MA" => 134, "MC" => 135, "MD" => 136, "MG" => 137,
-	    "MH" => 138, "MK" => 139, "ML" => 140, "MM" => 141, "MN" => 142, "MO" => 143,
-	    "MP" => 144, "MQ" => 145, "MR" => 146, "MS" => 147, "MT" => 148, "MU" => 149,
-	    "MV" => 150, "MW" => 151, "MX" => 152, "MY" => 153, "MZ" => 154, "NA" => 155,
-	    "NC" => 156, "NE" => 157, "NF" => 158, "NG" => 159, "NI" => 160, "NL" => 161,
-	    "NO" => 162, "NP" => 163, "NR" => 164, "NU" => 165, "NZ" => 166, "OM" => 167,
-	    "PA" => 168, "PE" => 169, "PF" => 170, "PG" => 171, "PH" => 172, "PK" => 173,
-	    "PL" => 174, "PM" => 175, "PN" => 176, "PR" => 177, "PS" => 178, "PT" => 179,
-	    "PW" => 180, "PY" => 181, "QA" => 182, "RE" => 183, "RO" => 184, "RU" => 185,
-	    "RW" => 186, "SA" => 187, "SB" => 188, "SC" => 189, "SD" => 190, "SE" => 191,
-	    "SG" => 192, "SH" => 193, "SI" => 194, "SJ" => 195, "SK" => 196, "SL" => 197,
-	    "SM" => 198, "SN" => 199, "SO" => 200, "SR" => 201, "ST" => 202, "SV" => 203,
-	    "SY" => 204, "SZ" => 205, "TC" => 206, "TD" => 207, "TF" => 208, "TG" => 209,
-	    "TH" => 210, "TJ" => 211, "TK" => 212, "TM" => 213, "TN" => 214, "TO" => 215,
-	    "TL" => 216, "TR" => 217, "TT" => 218, "TV" => 219, "TW" => 220, "TZ" => 221,
-	    "UA" => 222, "UG" => 223, "UM" => 224, "US" => 225, "UY" => 226, "UZ" => 227,
-	    "VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233,
-	    "VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239,
-	    "ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245,
-	    "O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250, "BL" => 251,
-	    "MF" => 252, "BQ" => 253, "SS" => 254
-		);
-    var $GEOIP_COUNTRY_CODES = array(
-	    "","AP","EU","AD","AE","AF","AG","AI","AL","AM","CW",
-	    "AO","AQ","AR","AS","AT","AU","AW","AZ","BA","BB",
-	    "BD","BE","BF","BG","BH","BI","BJ","BM","BN","BO",
-	    "BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD",
-	    "CF","CG","CH","CI","CK","CL","CM","CN","CO","CR",
-	    "CU","CV","CX","CY","CZ","DE","DJ","DK","DM","DO",
-	    "DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ",
-	    "FK","FM","FO","FR","SX","GA","GB","GD","GE","GF",
-	    "GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT",
-	    "GU","GW","GY","HK","HM","HN","HR","HT","HU","ID",
-	    "IE","IL","IN","IO","IQ","IR","IS","IT","JM","JO",
-	    "JP","KE","KG","KH","KI","KM","KN","KP","KR","KW",
-	    "KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT",
-	    "LU","LV","LY","MA","MC","MD","MG","MH","MK","ML",
-	    "MM","MN","MO","MP","MQ","MR","MS","MT","MU","MV",
-	    "MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI",
-	    "NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF",
-	    "PG","PH","PK","PL","PM","PN","PR","PS","PT","PW",
-	    "PY","QA","RE","RO","RU","RW","SA","SB","SC","SD",
-	    "SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO",
-	    "SR","ST","SV","SY","SZ","TC","TD","TF","TG","TH",
-	    "TJ","TK","TM","TN","TO","TL","TR","TT","TV","TW",
-	    "TZ","UA","UG","UM","US","UY","UZ","VA","VC","VE",
-	    "VG","VI","VN","VU","WF","WS","YE","YT","RS","ZA",
-	    "ZM","ME","ZW","A1","A2","O1","AX","GG","IM","JE",
-	    "BL","MF", "BQ", "SS", "O1" );
-    var $GEOIP_COUNTRY_CODES3 = array(
-	    "","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","CUW",
-	    "AGO","ATA","ARG","ASM","AUT","AUS","ABW","AZE","BIH","BRB",
-	    "BGD","BEL","BFA","BGR","BHR","BDI","BEN","BMU","BRN","BOL",
-	    "BRA","BHS","BTN","BVT","BWA","BLR","BLZ","CAN","CCK","COD",
-	    "CAF","COG","CHE","CIV","COK","CHL","CMR","CHN","COL","CRI",
-	    "CUB","CPV","CXR","CYP","CZE","DEU","DJI","DNK","DMA","DOM",
-	    "DZA","ECU","EST","EGY","ESH","ERI","ESP","ETH","FIN","FJI",
-	    "FLK","FSM","FRO","FRA","SXM","GAB","GBR","GRD","GEO","GUF",
-	    "GHA","GIB","GRL","GMB","GIN","GLP","GNQ","GRC","SGS","GTM",
-	    "GUM","GNB","GUY","HKG","HMD","HND","HRV","HTI","HUN","IDN",
-	    "IRL","ISR","IND","IOT","IRQ","IRN","ISL","ITA","JAM","JOR",
-	    "JPN","KEN","KGZ","KHM","KIR","COM","KNA","PRK","KOR","KWT",
-	    "CYM","KAZ","LAO","LBN","LCA","LIE","LKA","LBR","LSO","LTU",
-	    "LUX","LVA","LBY","MAR","MCO","MDA","MDG","MHL","MKD","MLI",
-	    "MMR","MNG","MAC","MNP","MTQ","MRT","MSR","MLT","MUS","MDV",
-	    "MWI","MEX","MYS","MOZ","NAM","NCL","NER","NFK","NGA","NIC",
-	    "NLD","NOR","NPL","NRU","NIU","NZL","OMN","PAN","PER","PYF",
-	    "PNG","PHL","PAK","POL","SPM","PCN","PRI","PSE","PRT","PLW",
-	    "PRY","QAT","REU","ROU","RUS","RWA","SAU","SLB","SYC","SDN",
-	    "SWE","SGP","SHN","SVN","SJM","SVK","SLE","SMR","SEN","SOM",
-	    "SUR","STP","SLV","SYR","SWZ","TCA","TCD","ATF","TGO","THA",
-	    "TJK","TKL","TKM","TUN","TON","TLS","TUR","TTO","TUV","TWN",
-	    "TZA","UKR","UGA","UMI","USA","URY","UZB","VAT","VCT","VEN",
-	    "VGB","VIR","VNM","VUT","WLF","WSM","YEM","MYT","SRB","ZAF",
-	    "ZMB","MNE","ZWE","A1","A2","O1","ALA","GGY","IMN","JEY",
-	    "BLM","MAF", "BES", "SSD", "O1"
-		);
-    var $GEOIP_COUNTRY_NAMES = array(
-	    "","Asia/Pacific Region","Europe","Andorra","United Arab Emirates","Afghanistan","Antigua and Barbuda","Anguilla","Albania","Armenia","Curacao",
-	    "Angola","Antarctica","Argentina","American Samoa","Austria","Australia","Aruba","Azerbaijan","Bosnia and Herzegovina","Barbados",
-	    "Bangladesh","Belgium","Burkina Faso","Bulgaria","Bahrain","Burundi","Benin","Bermuda","Brunei Darussalam","Bolivia",
-	    "Brazil","Bahamas","Bhutan","Bouvet Island","Botswana","Belarus","Belize","Canada","Cocos (Keeling) Islands","Congo, The Democratic Republic of the",
-	    "Central African Republic","Congo","Switzerland","Cote D'Ivoire","Cook Islands","Chile","Cameroon","China","Colombia","Costa Rica",
-	    "Cuba","Cape Verde","Christmas Island","Cyprus","Czech Republic","Germany","Djibouti","Denmark","Dominica","Dominican Republic",
-	    "Algeria","Ecuador","Estonia","Egypt","Western Sahara","Eritrea","Spain","Ethiopia","Finland","Fiji",
-	    "Falkland Islands (Malvinas)","Micronesia, Federated States of","Faroe Islands","France","Sint Maarten (Dutch part)","Gabon","United Kingdom","Grenada","Georgia","French Guiana",
-	    "Ghana","Gibraltar","Greenland","Gambia","Guinea","Guadeloupe","Equatorial Guinea","Greece","South Georgia and the South Sandwich Islands","Guatemala",
-	    "Guam","Guinea-Bissau","Guyana","Hong Kong","Heard Island and McDonald Islands","Honduras","Croatia","Haiti","Hungary","Indonesia",
-	    "Ireland","Israel","India","British Indian Ocean Territory","Iraq","Iran, Islamic Republic of","Iceland","Italy","Jamaica","Jordan",
-	    "Japan","Kenya","Kyrgyzstan","Cambodia","Kiribati","Comoros","Saint Kitts and Nevis","Korea, Democratic People's Republic of","Korea, Republic of","Kuwait",
-	    "Cayman Islands","Kazakhstan","Lao People's Democratic Republic","Lebanon","Saint Lucia","Liechtenstein","Sri Lanka","Liberia","Lesotho","Lithuania",
-	    "Luxembourg","Latvia","Libya","Morocco","Monaco","Moldova, Republic of","Madagascar","Marshall Islands","Macedonia","Mali",
-	    "Myanmar","Mongolia","Macau","Northern Mariana Islands","Martinique","Mauritania","Montserrat","Malta","Mauritius","Maldives",
-	    "Malawi","Mexico","Malaysia","Mozambique","Namibia","New Caledonia","Niger","Norfolk Island","Nigeria","Nicaragua",
-	    "Netherlands","Norway","Nepal","Nauru","Niue","New Zealand","Oman","Panama","Peru","French Polynesia",
-	    "Papua New Guinea","Philippines","Pakistan","Poland","Saint Pierre and Miquelon","Pitcairn Islands","Puerto Rico","Palestinian Territory","Portugal","Palau",
-	    "Paraguay","Qatar","Reunion","Romania","Russian Federation","Rwanda","Saudi Arabia","Solomon Islands","Seychelles","Sudan",
-	    "Sweden","Singapore","Saint Helena","Slovenia","Svalbard and Jan Mayen","Slovakia","Sierra Leone","San Marino","Senegal","Somalia","Suriname",
-	    "Sao Tome and Principe","El Salvador","Syrian Arab Republic","Swaziland","Turks and Caicos Islands","Chad","French Southern Territories","Togo","Thailand",
-	    "Tajikistan","Tokelau","Turkmenistan","Tunisia","Tonga","Timor-Leste","Turkey","Trinidad and Tobago","Tuvalu","Taiwan",
-	    "Tanzania, United Republic of","Ukraine","Uganda","United States Minor Outlying Islands","United States","Uruguay","Uzbekistan","Holy See (Vatican City State)","Saint Vincent and the Grenadines","Venezuela",
-	    "Virgin Islands, British","Virgin Islands, U.S.","Vietnam","Vanuatu","Wallis and Futuna","Samoa","Yemen","Mayotte","Serbia","South Africa",
-	    "Zambia","Montenegro","Zimbabwe","Anonymous Proxy","Satellite Provider","Other","Aland Islands","Guernsey","Isle of Man","Jersey",
-	    "Saint Barthelemy","Saint Martin", "Bonaire, Saint Eustatius and Saba",
-	    "South Sudan", "Other"
-		);
-
-    var $GEOIP_CONTINENT_CODES = array(
-	    "--", "AS","EU","EU","AS","AS","NA","NA","EU","AS","NA",
-	    "AF","AN","SA","OC","EU","OC","NA","AS","EU","NA",
-	    "AS","EU","AF","EU","AS","AF","AF","NA","AS","SA",
-	    "SA","NA","AS","AN","AF","EU","NA","NA","AS","AF",
-	    "AF","AF","EU","AF","OC","SA","AF","AS","SA","NA",
-	    "NA","AF","AS","AS","EU","EU","AF","EU","NA","NA",
-	    "AF","SA","EU","AF","AF","AF","EU","AF","EU","OC",
-	    "SA","OC","EU","EU","NA","AF","EU","NA","AS","SA",
-	    "AF","EU","NA","AF","AF","NA","AF","EU","AN","NA",
-	    "OC","AF","SA","AS","AN","NA","EU","NA","EU","AS",
-	    "EU","AS","AS","AS","AS","AS","EU","EU","NA","AS",
-	    "AS","AF","AS","AS","OC","AF","NA","AS","AS","AS",
-	    "NA","AS","AS","AS","NA","EU","AS","AF","AF","EU",
-	    "EU","EU","AF","AF","EU","EU","AF","OC","EU","AF",
-	    "AS","AS","AS","OC","NA","AF","NA","EU","AF","AS",
-	    "AF","NA","AS","AF","AF","OC","AF","OC","AF","NA",
-	    "EU","EU","AS","OC","OC","OC","AS","NA","SA","OC",
-	    "OC","AS","AS","EU","NA","OC","NA","AS","EU","OC",
-	    "SA","AS","AF","EU","EU","AF","AS","OC","AF","AF",
-	    "EU","AS","AF","EU","EU","EU","AF","EU","AF","AF",
-	    "SA","AF","NA","AS","AF","NA","AF","AN","AF","AS",
-	    "AS","OC","AS","AF","OC","AS","EU","NA","OC","AS",
-	    "AF","EU","AF","OC","NA","SA","AS","EU","NA","SA",
-	    "NA","NA","AS","OC","OC","OC","AS","AF","EU","AF",
-	    "AF","EU","AF","--","--","--","EU","EU","EU","EU",
-	    "NA","NA","NA", "AF", "--"
-		);
-
-}
-function geoip_load_shared_mem ($file) {
-
-    $fp = fopen($file, "rb");
-    if (!$fp) {
-	print "error opening $file: $php_errormsg\n";
-	exit;
-    }
-    $s_array = fstat($fp);
-    $size = $s_array['size'];
-    if ($shmid = @shmop_open (GEOIP_SHM_KEY, "w", 0, 0)) {
-	shmop_delete ($shmid);
-	shmop_close ($shmid);
-    }
-    $shmid = shmop_open (GEOIP_SHM_KEY, "c", 0644, $size);
-    shmop_write ($shmid, fread($fp, $size), 0);
-    shmop_close ($shmid);
-}
-
-function _setup_segments($gi){
-    $gi->databaseType = GEOIP_COUNTRY_EDITION;
-    $gi->record_length = STANDARD_RECORD_LENGTH;
-    if ($gi->flags & GEOIP_SHARED_MEMORY) {
-	$offset = @shmop_size ($gi->shmid) - 3;
-	for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-	    $delim = @shmop_read ($gi->shmid, $offset, 3);
-	    $offset += 3;
-	    if ($delim == (chr(255).chr(255).chr(255))) {
-		$gi->databaseType = ord(@shmop_read ($gi->shmid, $offset, 1));
-		if ( $gi->databaseType >= 106 ){
-		    $gi->databaseType -= 105;
-		}
-		$offset++;
-
-		if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-		    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-		} else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-		    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-		} else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)||
-			($gi->databaseType == GEOIP_CITY_EDITION_REV1)
-			|| ($gi->databaseType == GEOIP_ORG_EDITION)
-			|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-			|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_ISP_EDITION)
-			|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_USERTYPE_EDITION)
-			|| ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
-			|| ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
-			|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
-			|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
-			|| ($gi->databaseType == GEOIP_ASNUM_EDITION)
-			|| ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)){
-		    $gi->databaseSegments = 0;
-		    $buf = @shmop_read ($gi->shmid, $offset, SEGMENT_RECORD_LENGTH);
-		    for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-			$gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-		    }
-		    if (($gi->databaseType == GEOIP_ORG_EDITION)
-			    || ($gi->databaseType == GEOIP_ORG_EDITION_V6)
-			    || ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-			    || ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
-			    || ($gi->databaseType == GEOIP_ISP_EDITION)
-			    || ($gi->databaseType == GEOIP_ISP_EDITION_V6)) {
-			$gi->record_length = ORG_RECORD_LENGTH;
-		    }
-		}
-		break;
-	    } else {
-		$offset -= 4;
-	    }
-	}
-	if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-		($gi->databaseType == GEOIP_COUNTRY_EDITION_V6)||
-		($gi->databaseType == GEOIP_PROXY_EDITION)||
-		($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-	    $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-	}
-    } else {
-	$filepos = ftell($gi->filehandle);
-	fseek($gi->filehandle, -3, SEEK_END);
-	for ($i = 0; $i < STRUCTURE_INFO_MAX_SIZE; $i++) {
-	    $delim = fread($gi->filehandle,3);
-	    if ($delim == (chr(255).chr(255).chr(255))){
-		$gi->databaseType = ord(fread($gi->filehandle,1));
-		if ( $gi->databaseType >= 106 ){
-		    $gi->databaseType -= 105;
-		}
-		if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-		    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV0;
-		}
-		else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1){
-		    $gi->databaseSegments = GEOIP_STATE_BEGIN_REV1;
-		}  else if (($gi->databaseType == GEOIP_CITY_EDITION_REV0)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
-			|| ($gi->databaseType == GEOIP_ORG_EDITION)
-			|| ($gi->databaseType == GEOIP_DOMAIN_EDITION)
-			|| ($gi->databaseType == GEOIP_ISP_EDITION)
-			|| ($gi->databaseType == GEOIP_ORG_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_DOMAIN_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_ISP_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_LOCATIONA_EDITION)
-			|| ($gi->databaseType == GEOIP_ACCURACYRADIUS_EDITION)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV0_V6)
-			|| ($gi->databaseType == GEOIP_CITY_EDITION_REV1_V6)
-			|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1)
-			|| ($gi->databaseType == GEOIP_NETSPEED_EDITION_REV1_V6)
-			|| ($gi->databaseType == GEOIP_USERTYPE_EDITION)
-			|| ($gi->databaseType == GEOIP_USERTYPE_EDITION_V6)
-			|| ($gi->databaseType == GEOIP_ASNUM_EDITION)
-			|| ($gi->databaseType == GEOIP_ASNUM_EDITION_V6)){
-		    $gi->databaseSegments = 0;
-		    $buf = fread($gi->filehandle,SEGMENT_RECORD_LENGTH);
-		    for ($j = 0;$j < SEGMENT_RECORD_LENGTH;$j++){
-			$gi->databaseSegments += (ord($buf[$j]) << ($j * 8));
-		    }
-		    if (   ( $gi->databaseType == GEOIP_ORG_EDITION )
-			    || ( $gi->databaseType == GEOIP_DOMAIN_EDITION )
-			    || ( $gi->databaseType == GEOIP_ISP_EDITION )
-			    || ( $gi->databaseType == GEOIP_ORG_EDITION_V6 )
-			    || ( $gi->databaseType == GEOIP_DOMAIN_EDITION_V6 )
-			    || ( $gi->databaseType == GEOIP_ISP_EDITION_V6 )) {
-			$gi->record_length = ORG_RECORD_LENGTH;
-		    }
-		}
-		break;
-	    } else {
-		fseek($gi->filehandle, -4, SEEK_CUR);
-	    }
-	}
-	if (($gi->databaseType == GEOIP_COUNTRY_EDITION)||
-		($gi->databaseType == GEOIP_COUNTRY_EDITION_V6)||
-		($gi->databaseType == GEOIP_PROXY_EDITION)||
-		($gi->databaseType == GEOIP_NETSPEED_EDITION)){
-	    $gi->databaseSegments = GEOIP_COUNTRY_BEGIN;
-	}
-	fseek($gi->filehandle,$filepos,SEEK_SET);
-    }
-    return $gi;
-}
-
-function geoip_open($filename, $flags) {
-    $gi = new GeoIP;
-    $gi->flags = $flags;
-    if ($gi->flags & GEOIP_SHARED_MEMORY) {
-	$gi->shmid = @shmop_open (GEOIP_SHM_KEY, "a", 0, 0);
-    } else {
-	$gi->filehandle = fopen($filename,"rb") or die( "Can not open $filename\n" );
-	if ($gi->flags & GEOIP_MEMORY_CACHE) {
-	    $s_array = fstat($gi->filehandle);
-	    $gi->memory_buffer = fread($gi->filehandle, $s_array['size']);
-	}
-    }
-
-    $gi = _setup_segments($gi);
-    return $gi;
-}
-
-function geoip_close($gi) {
-    if ($gi->flags & GEOIP_SHARED_MEMORY) {
-	return true;
-    }
-
-    return fclose($gi->filehandle);
-}
-
-function geoip_country_id_by_name_v6($gi, $name) {
-    $rec = dns_get_record($name, DNS_AAAA);
-    if ( !$rec ) {
-	return false;
-    }
-    $addr = $rec[0]["ipv6"];
-    if (!$addr || $addr == $name) {
-	return false;
-    }
-    return geoip_country_id_by_addr_v6($gi, $addr);
-}
-
-function geoip_country_id_by_name($gi, $name) {
-    $addr = gethostbyname($name);
-    if (!$addr || $addr == $name) {
-	return false;
-    }
-    return geoip_country_id_by_addr($gi, $addr);
-}
-
-function geoip_country_code_by_name_v6($gi, $name) {
-    $country_id = geoip_country_id_by_name_v6($gi,$name);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_CODES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_code_by_name($gi, $name) {
-    $country_id = geoip_country_id_by_name($gi,$name);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_CODES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_name_by_name_v6($gi, $name) {
-    $country_id = geoip_country_id_by_name_v6($gi,$name);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_name_by_name($gi, $name) {
-    $country_id = geoip_country_id_by_name($gi,$name);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_id_by_addr_v6($gi, $addr) {
-    $ipnum = inet_pton($addr);
-    return _geoip_seek_country_v6($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
-}
-
-function geoip_country_id_by_addr($gi, $addr) {
-    $ipnum = ip2long($addr);
-    return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
-}
-
-function geoip_country_code_by_addr_v6($gi, $addr) {
-    $country_id = geoip_country_id_by_addr_v6($gi,$addr);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_CODES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_code_by_addr($gi, $addr) {
-    if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-	$record = geoip_record_by_addr($gi,$addr);
-	if ( $record !== false ) {
-	    return $record->country_code;
-	}
-    } else {
-	$country_id = geoip_country_id_by_addr($gi,$addr);
-	if ($country_id !== false) {
-	    return $gi->GEOIP_COUNTRY_CODES[$country_id];
-	}
-    }
-    return false;
-}
-
-function geoip_country_name_by_addr_v6($gi, $addr) {
-    $country_id = geoip_country_id_by_addr_v6($gi,$addr);
-    if ($country_id !== false) {
-	return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-    }
-    return false;
-}
-
-function geoip_country_name_by_addr($gi, $addr) {
-    if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
-	$record = geoip_record_by_addr($gi,$addr);
-	return $record->country_name;
-    } else {
-	$country_id = geoip_country_id_by_addr($gi,$addr);
-	if ($country_id !== false) {
-	    return $gi->GEOIP_COUNTRY_NAMES[$country_id];
-	}
-    }
-    return false;
-}
-
-function _geoip_seek_country_v6($gi, $ipnum) {
-
-# arrays from unpack start with offset 1
-# yet another php mystery. array_merge work around
-# this broken behaviour
-    $v6vec = array_merge(unpack( "C16", $ipnum));
-
-    $offset = 0;
-    for ($depth = 127; $depth >= 0; --$depth) {
-	if ($gi->flags & GEOIP_MEMORY_CACHE) {
-	    // workaround php's broken substr, strpos, etc handling with
-	    // mbstring.func_overload and mbstring.internal_encoding
-	    $enc = mb_internal_encoding();
-	    mb_internal_encoding('ISO-8859-1');
-
-	    $buf = substr($gi->memory_buffer,
-		    2 * $gi->record_length * $offset,
-		    2 * $gi->record_length);
-
-	    mb_internal_encoding($enc);
-	} elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-	    $buf = @shmop_read ($gi->shmid,
-		    2 * $gi->record_length * $offset,
-		    2 * $gi->record_length );
-	} else {
-	    fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
-		or die("fseek failed");
-	    $buf = fread($gi->filehandle, 2 * $gi->record_length);
-	}
-	$x = array(0,0);
-	for ($i = 0; $i < 2; ++$i) {
-	    for ($j = 0; $j < $gi->record_length; ++$j) {
-		$x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
-	    }
-	}
-
-	$bnum = 127 - $depth;
-	$idx = $bnum >> 3;
-	$b_mask = 1 << ( $bnum & 7 ^ 7 );
-	if (($v6vec[$idx] & $b_mask) > 0) {
-	    if ($x[1] >= $gi->databaseSegments) {
-		return $x[1];
-	    }
-	    $offset = $x[1];
-	} else {
-	    if ($x[0] >= $gi->databaseSegments) {
-		return $x[0];
-	    }
-	    $offset = $x[0];
-	}
-    }
-    trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
-    return false;
-}
-
-function _geoip_seek_country($gi, $ipnum) {
-    $offset = 0;
-    for ($depth = 31; $depth >= 0; --$depth) {
-	if ($gi->flags & GEOIP_MEMORY_CACHE) {
-	    // workaround php's broken substr, strpos, etc handling with
-	    // mbstring.func_overload and mbstring.internal_encoding
-	    $enc = mb_internal_encoding();
-	    mb_internal_encoding('ISO-8859-1');
-
-	    $buf = substr($gi->memory_buffer,
-		    2 * $gi->record_length * $offset,
-		    2 * $gi->record_length);
-
-	    mb_internal_encoding($enc);
-	} elseif ($gi->flags & GEOIP_SHARED_MEMORY) {
-	    $buf = @shmop_read ($gi->shmid,
-		    2 * $gi->record_length * $offset,
-		    2 * $gi->record_length );
-	} else {
-	    fseek($gi->filehandle, 2 * $gi->record_length * $offset, SEEK_SET) == 0
-		or die("fseek failed");
-	    $buf = fread($gi->filehandle, 2 * $gi->record_length);
-	}
-	$x = array(0,0);
-	for ($i = 0; $i < 2; ++$i) {
-	    for ($j = 0; $j < $gi->record_length; ++$j) {
-		$x[$i] += ord($buf[$gi->record_length * $i + $j]) << ($j * 8);
-	    }
-	}
-	if ($ipnum & (1 << $depth)) {
-	    if ($x[1] >= $gi->databaseSegments) {
-		return $x[1];
-	    }
-	    $offset = $x[1];
-	} else {
-	    if ($x[0] >= $gi->databaseSegments) {
-		return $x[0];
-	    }
-	    $offset = $x[0];
-	}
-    }
-    trigger_error("error traversing database - perhaps it is corrupt?", E_USER_ERROR);
-    return false;
-}
-
-function _common_get_org($gi, $seek_org){
-    $record_pointer = $seek_org + (2 * $gi->record_length - 1) * $gi->databaseSegments;
-    if ($gi->flags & GEOIP_SHARED_MEMORY) {
-	$org_buf = @shmop_read ($gi->shmid, $record_pointer, MAX_ORG_RECORD_LENGTH);
-    } else {
-	fseek($gi->filehandle, $record_pointer, SEEK_SET);
-	$org_buf = fread($gi->filehandle,MAX_ORG_RECORD_LENGTH);
-    }
-    // workaround php's broken substr, strpos, etc handling with
-    // mbstring.func_overload and mbstring.internal_encoding
-    $enc = mb_internal_encoding();
-    mb_internal_encoding('ISO-8859-1');
-    $org_buf = substr($org_buf, 0, strpos($org_buf, "\0"));
-    mb_internal_encoding($enc);
-    return $org_buf;
-}
-
-function _get_org_v6($gi,$ipnum){
-    $seek_org = _geoip_seek_country_v6($gi,$ipnum);
-    if ($seek_org == $gi->databaseSegments) {
-	return NULL;
-    }
-    return _common_get_org($gi, $seek_org);
-}
-
-function _get_org($gi,$ipnum){
-    $seek_org = _geoip_seek_country($gi,$ipnum);
-    if ($seek_org == $gi->databaseSegments) {
-	return NULL;
-    }
-    return _common_get_org($gi, $seek_org);
-}
-
-
-
-function geoip_name_by_addr_v6 ($gi,$addr) {
-    if ($addr == NULL) {
-	return 0;
-    }
-    $ipnum = inet_pton($addr);
-    return _get_org_v6($gi, $ipnum);
-}
-
-function geoip_name_by_addr ($gi,$addr) {
-    if ($addr == NULL) {
-	return 0;
-    }
-    $ipnum = ip2long($addr);
-    return _get_org($gi, $ipnum);
-}
-
-function geoip_org_by_addr ($gi,$addr) {
-    return geoip_name_by_addr($gi, $addr);
-}
-
-function _get_region($gi,$ipnum){
-    if ($gi->databaseType == GEOIP_REGION_EDITION_REV0){
-	$seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV0;
-	if ($seek_region >= 1000){
-	    $country_code = "US";
-	    $region = chr(($seek_region - 1000)/26 + 65) . chr(($seek_region - 1000)%26 + 65);
-	} else {
-	    $country_code = $gi->GEOIP_COUNTRY_CODES[$seek_region];
-	    $region = "";
-	}
-	return array ($country_code,$region);
-    }  else if ($gi->databaseType == GEOIP_REGION_EDITION_REV1) {
-	$seek_region = _geoip_seek_country($gi,$ipnum) - GEOIP_STATE_BEGIN_REV1;
-	//print $seek_region;
-	if ($seek_region < US_OFFSET){
-	    $country_code = "";
-	    $region = "";
-	} else if ($seek_region < CANADA_OFFSET) {
-	    $country_code = "US";
-	    $region = chr(($seek_region - US_OFFSET)/26 + 65) . chr(($seek_region - US_OFFSET)%26 + 65);
-	} else if ($seek_region < WORLD_OFFSET) {
-	    $country_code = "CA";
-	    $region = chr(($seek_region - CANADA_OFFSET)/26 + 65) . chr(($seek_region - CANADA_OFFSET)%26 + 65);
-	} else {
-	    $country_code = $gi->GEOIP_COUNTRY_CODES[($seek_region - WORLD_OFFSET) / FIPS_RANGE];
-	    $region = "";
-	}
-	return array ($country_code,$region);
-    }
-}
-
-function geoip_region_by_addr ($gi,$addr) {
-    if ($addr == NULL) {
-	return 0;
-    }
-    $ipnum = ip2long($addr);
-    return _get_region($gi, $ipnum);
-}
-
-function getdnsattributes ($l,$ip){
-    $r = new Net_DNS_Resolver();
-    $r->nameservers = array("ws1.maxmind.com");
-    $p = $r->search($l."." . $ip .".s.maxmind.com","TXT","IN");
-    $str = is_object($p->answer[0])?$p->answer[0]->string():'';
-    $str = substr( $str, 1, -1 );
-    return $str;
-}
-
-?>
diff --git a/inc/lib/gettext/AUTHORS b/inc/lib/gettext/AUTHORS
deleted file mode 100644
index da6ade7b..00000000
--- a/inc/lib/gettext/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Danilo Segan <danilo@kvota.net>
-Nico Kaiser <nico@siriux.net> (contributed most changes between 1.0.2 and 1.0.3, bugfix for 1.0.5)
-Steven Armstrong <sa@c-area.ch> (gettext.inc, leading to 1.0.6)
diff --git a/inc/lib/gettext/COPYING b/inc/lib/gettext/COPYING
deleted file mode 100644
index 5b6e7c66..00000000
--- a/inc/lib/gettext/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/inc/lib/gettext/Makefile b/inc/lib/gettext/Makefile
deleted file mode 100644
index f389de51..00000000
--- a/inc/lib/gettext/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-PACKAGE = php-gettext-$(VERSION)
-VERSION = 1.0.11
-
-DIST_FILES = \
-	gettext.php \
-	gettext.inc \
-	streams.php \
-	AUTHORS     \
-	README      \
-	COPYING     \
-	Makefile    \
-	examples/index.php    \
-	examples/pigs_dropin.php    \
-	examples/pigs_fallback.php    \
-	examples/locale/sr_CS/LC_MESSAGES/messages.po \
-	examples/locale/sr_CS/LC_MESSAGES/messages.mo \
-	examples/locale/de_CH/LC_MESSAGES/messages.po \
-	examples/locale/de_CH/LC_MESSAGES/messages.mo \
-	examples/update \
-	tests/LocalesTest.php \
-	tests/ParsingTest.php
-
-check:
-	phpunit --verbose tests
-
-dist: check
-	if [ -d $(PACKAGE) ]; then \
-	    rm -rf $(PACKAGE); \
-	fi; \
-	mkdir $(PACKAGE); \
-	if [ -d $(PACKAGE) ]; then \
-	    cp -rp --parents $(DIST_FILES) $(PACKAGE); \
-	    tar cvzf $(PACKAGE).tar.gz $(PACKAGE); \
-	    rm -rf $(PACKAGE); \
-	fi;
-
-clean:
-	rm -f $(PACKAGE).tar.gz
diff --git a/inc/lib/gettext/README b/inc/lib/gettext/README
deleted file mode 100644
index bca4f916..00000000
--- a/inc/lib/gettext/README
+++ /dev/null
@@ -1,161 +0,0 @@
-PHP-gettext 1.0 (https://launchpad.net/php-gettext)
-
-Copyright 2003, 2006, 2009 -- Danilo "angry with PHP[1]" Segan
-Licensed under GPLv2 (or any later version, see COPYING)
-
-[1] PHP is actually cyrillic, and translates roughly to
-    "works-doesn't-work" (UTF-8: Ради-Не-Ради)
-
-
-Introduction
-
-    How many times did you look for a good translation tool, and
-    found out that gettext is best for the job? Many times.
-
-    How many times did you try to use gettext in PHP, but failed
-    miserably, because either your hosting provider didn't support
-    it, or the server didn't have adequate locale? Many times.
-
-    Well, this is a solution to your needs. It allows using gettext
-    tools for managing translations, yet it doesn't require gettext
-    library at all. It parses generated MO files directly, and thus
-    might be a bit slower than the (maybe provided) gettext library.
-
-    PHP-gettext is a simple reader for GNU gettext MO files. Those
-    are binary containers for translations, produced by GNU msgfmt.
-
-Why?
-
-    I got used to having gettext work even without gettext
-    library. It's there in my favourite language Python, so I was
-    surprised that I couldn't find it in PHP. I even Googled for it,
-    but to no avail.
-
-    So, I said, what the heck, I'm going to write it for this
-    disguisting language of PHP, because I'm often constrained to it.
-
-Features
-
-  o Support for simple translations
-    Just define a simple alias for translate() function (suggested
-    use of _() or gettext(); see provided example).
-
-  o Support for ngettext calls (plural forms, see a note under bugs)
-    You may also use plural forms. Translations in MO files need to
-    provide this, and they must also provide "plural-forms" header.
-    Please see 'info gettext' for more details.
-
-  o Support for reading straight files, or strings (!!!)
-    Since I can imagine many different backends for reading in the MO
-    file data, I used imaginary abstract class StreamReader to do all
-    the input (check streams.php). For your convenience, I've already
-    provided two classes for reading files: FileReader and
-    StringReader (CachedFileReader is a combination of the two: it
-    loads entire file contents into a string, and then works on that).
-    See example below for usage. You can for instance use StringReader
-    when you read in data from a database, or you can create your own
-    derivative of StreamReader for anything you like.
-
-
-Bugs
-
-    Report them on https://bugs.launchpad.net/php-gettext
-
-Usage
-
-    Put files streams.php and gettext.php somewhere you can load them
-    from, and require 'em in where you want to use them.
-
-    Then, create one 'stream reader' (a class that provides functions
-    like read(), seekto(), currentpos() and length()) which will
-    provide data for the 'gettext_reader', with eg.
-      $streamer = new FileStream('data.mo');
-
-    Then, use that as a parameter to gettext_reader constructor:
-      $wohoo = new gettext_reader($streamer);
-
-    If you want to disable pre-loading of entire message catalog in
-    memory (if, for example, you have a multi-thousand message catalog
-    which you'll use only occasionally), use "false" for second
-    parameter to gettext_reader constructor:
-      $wohoo = new gettext_reader($streamer, false);
-
-    From now on, you have all the benefits of gettext data at your
-    disposal, so may run:
-      print $wohoo->translate("This is a test");
-      print $wohoo->ngettext("%d bird", "%d birds", $birds);
-
-    You might need to pass parameter "-k" to xgettext to make it
-    extract all the strings. In above example, try with
-      xgettext -ktranslate -kngettext:1,2 file.php
-    what should create messages.po which contains two messages for
-    translation.
-
-    I suggest creating simple aliases for these functions (see
-    example/pigs.php for how do I do it, which means it's probably a
-    bad way).
-
-
-Usage with gettext.inc (standard gettext interfaces emulation)
-
-    Check example in examples/pig_dropin.php, basically you include
-    gettext.inc and use all the standard gettext interfaces as
-    documented on:
-
-       http://www.php.net/gettext
-
-    The only catch is that you can check return value of setlocale()
-    to see if your locale is system supported or not.
-
-
-Example
-
-    See in examples/ subdirectory. There are a couple of files.
-    pigs.php is an example, serbian.po is a translation to Serbian
-    language, and serbian.mo is generated with
-       msgfmt -o serbian.mo serbian.po
-    There is also simple "update" script that can be used to generate
-    POT file and to update the translation using msgmerge.
-
-TODO:
-
-  o Improve speed to be even more comparable to the native gettext
-    implementation.
-
-  o Try to use hash tables in MO files: with pre-loading, would it
-    be useful at all?
-
-Never-asked-questions:
-
-  o Why did you mark this as version 1.0 when this is the first code
-    release?
-
-    Well, it's quite simple. I consider that the first released thing
-    should be labeled "version 1" (first, right?). Zero is there to
-    indicate that there's zero improvement and/or change compared to
-    "version 1".
-
-    I plan to use version numbers 1.0.* for small bugfixes, and to
-    release 1.1 as "first stable release of version 1".
-
-    This may trick someone that this is actually useful software, but
-    as with any other free software, I take NO RESPONSIBILITY for
-    creating such a masterpiece that will smoke crack, trash your
-    hard disk, and make lasers in your CD device dance to the tune of
-    Mozart's 40th Symphony (there is one like that, right?).
-
-  o Can I...?
-
-    Yes, you can. This is free software (as in freedom, free speech),
-    and you might do whatever you wish with it, provided you do not
-    limit freedom of others (GPL).
-
-    I'm considering licensing this under LGPL, but I *do* want
-    *every* PHP-gettext user to contribute and respect ideas of free
-    software, so don't count on it happening anytime soon.
-
-    I'm sorry that I'm taking away your freedom of taking others'
-    freedom away, but I believe that's neglible as compared to what
-    freedoms you could take away. ;-)
-
-    Uhm, whatever.
diff --git a/inc/lib/gettext/gettext.inc b/inc/lib/gettext/gettext.inc
deleted file mode 100644
index cb21fea5..00000000
--- a/inc/lib/gettext/gettext.inc
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-/*
-   Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
-   Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
-
-   Drop in replacement for native gettext.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-/*
-LC_CTYPE        0
-LC_NUMERIC      1
-LC_TIME         2
-LC_COLLATE      3
-LC_MONETARY     4
-LC_MESSAGES     5
-LC_ALL          6
-*/
-
-// LC_MESSAGES is not available if php-gettext is not loaded
-// while the other constants are already available from session extension.
-if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
-}
-
-require(dirname(__FILE__) . '/streams.php');
-require(dirname(__FILE__) . '/gettext.php');
-
-
-// Variables
-
-global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE;
-$text_domains = array();
-$default_domain = 'messages';
-$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL');
-$EMULATEGETTEXT = 0;
-$CURRENTLOCALE = '';
-
-/* Class to hold a single domain included in $text_domains. */
-class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
-}
-
-// Utility functions
-
-/**
- * Return a list of locales to try for any POSIX-style locale specification.
- */
-function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
-   * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
-   * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
-   */
-  $locale_names = array();
-  $lang = NULL;
-  $country = NULL;
-  $charset = NULL;
-  $modifier = NULL;
-  if ($locale) {
-    if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
-
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
-
-      if ($modifier) {
-        if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
-        array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
-        array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
-    }
-
-    // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
-}
-
-/**
- * Utility function to get a StreamReader for the given text domain.
- */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    if (!isset($text_domains[$domain]->l10n)) {
-        // get the current locale
-        $locale = _setlocale(LC_MESSAGES, 0);
-        $bound_path = isset($text_domains[$domain]->path) ?
-          $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
-
-        $locale_names = get_list_of_locales($locale);
-        $input = null;
-        foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
-            $input = new FileReader($full_path);
-            break;
-          }
-        }
-
-        if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
-        }
-        $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
-    }
-    return $text_domains[$domain]->l10n;
-}
-
-/**
- * Returns whether we are using our emulated gettext API or PHP built-in one.
- */
-function locale_emulation() {
-    global $EMULATEGETTEXT;
-    return $EMULATEGETTEXT;
-}
-
-/**
- * Checks if the current locale is supported on this system.
- */
-function _check_locale_and_function($function=false) {
-    global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
-    return !$EMULATEGETTEXT;
-}
-
-/**
- * Get the codeset for the given domain.
- */
-function _get_codeset($domain=null) {
-    global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
-}
-
-/**
- * Convert the given string to the encoding set by bind_textdomain_codeset.
- */
-function _encode($text) {
-    $source_encoding = mb_detect_encoding($text);
-    $target_encoding = _get_codeset();
-    if ($source_encoding != $target_encoding) {
-        return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
-        return $text;
-    }
-}
-
-
-// Custom implementation of the standard gettext related functions
-
-/**
- * Returns passed in $locale, or environment variable $LANG if $locale == ''.
- */
-function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
-    return getenv('LANG');
-  else
-    return $locale;
-}
-
-/**
- * Sets a requested locale, if needed emulates it.
- */
-function _setlocale($category, $locale) {
-    global $CURRENTLOCALE, $EMULATEGETTEXT;
-    if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
-            // even if we tried to read locale without setting it first
-            return _setlocale($category, $CURRENTLOCALE);
-    } else {
-        if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
-              ($locale != '' and $ret != $locale)) { // failed setting it
-            // Failed setting it according to environment.
-            $CURRENTLOCALE = _get_default_locale($locale);
-            $EMULATEGETTEXT = 1;
-          } else {
-            $CURRENTLOCALE = $ret;
-            $EMULATEGETTEXT = 0;
-          }
-        } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
-        }
-        // Allow locale to be changed on the go for one translation domain.
-        global $text_domains, $default_domain;
-        if (array_key_exists($default_domain, $text_domains)) {
-            unset($text_domains[$default_domain]->l10n);
-        }
-        return $CURRENTLOCALE;
-    }
-}
-
-/**
- * Sets the path for a domain.
- */
-function _bindtextdomain($domain, $path) {
-    global $text_domains;
-    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
-    if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
-    } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
-    }
-    if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
-    }
-    $text_domains[$domain]->path = $path;
-}
-
-/**
- * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
- */
-function _bind_textdomain_codeset($domain, $codeset) {
-    global $text_domains;
-    $text_domains[$domain]->codeset = $codeset;
-}
-
-/**
- * Sets the default domain.
- */
-function _textdomain($domain) {
-    global $default_domain;
-    $default_domain = $domain;
-}
-
-/**
- * Lookup a message in the current domain.
- */
-function _gettext($msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Alias for gettext.
- */
-function __($msgid) {
-    return _gettext($msgid);
-}
-
-/**
- * Plural version of gettext.
- */
-function _ngettext($singular, $plural, $number) {
-    $l10n = _get_reader();
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Override the current domain.
- */
-function _dgettext($domain, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->translate($msgid));
-}
-
-/**
- * Plural version of dgettext.
- */
-function _dngettext($domain, $singular, $plural, $number) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Overrides the domain and category for a single lookup.
- */
-function _dcgettext($domain, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->translate($msgid));
-}
-/**
- * Plural version of dcgettext.
- */
-function _dcngettext($domain, $singular, $plural, $number, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->ngettext($singular, $plural, $number));
-}
-
-/**
- * Context version of gettext.
- */
-function _pgettext($context, $msgid) {
-    $l10n = _get_reader();
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Override the current domain in a context gettext call.
- */
-function _dpgettext($domain, $context, $msgid) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Overrides the domain and category for a single context-based lookup.
- */
-function _dcpgettext($domain, $context, $msgid, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->pgettext($context, $msgid));
-}
-
-/**
- * Context version of ngettext.
- */
-function _npgettext($context, $singular, $plural) {
-    $l10n = _get_reader();
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Override the current domain in a context ngettext call.
- */
-function _dnpgettext($domain, $context, $singular, $plural) {
-    $l10n = _get_reader($domain);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-/**
- * Overrides the domain and category for a plural context-based lookup.
- */
-function _dcnpgettext($domain, $context, $singular, $plural, $category) {
-    $l10n = _get_reader($domain, $category);
-    return _encode($l10n->npgettext($context, $singular, $plural));
-}
-
-
-
-// Wrappers to use if the standard gettext functions are available,
-// but the current locale is not supported by the system.
-// Use the standard impl if the current locale is supported, use the
-// custom impl otherwise.
-
-function T_setlocale($category, $locale) {
-    return _setlocale($category, $locale);
-}
-
-function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
-function T_bind_textdomain_codeset($domain, $codeset) {
-    // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
-function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
-function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
-function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
-    return __($msgid);
-}
-function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
-function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
-function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
-function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
-function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
-
-function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
-
-function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
-
-function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
-
-function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
-
-function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
-
-function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
-                            $plural, $number, $category);
-}
-
-
-
-// Wrappers used as a drop in replacement for the standard gettext functions
-
-if (!function_exists('gettext')) {
-    function bindtextdomain($domain, $path) {
-        return _bindtextdomain($domain, $path);
-    }
-    function bind_textdomain_codeset($domain, $codeset) {
-        return _bind_textdomain_codeset($domain, $codeset);
-    }
-    function textdomain($domain) {
-        return _textdomain($domain);
-    }
-    function gettext($msgid) {
-        return _gettext($msgid);
-    }
-    function _($msgid) {
-        return __($msgid);
-    }
-    function ngettext($singular, $plural, $number) {
-        return _ngettext($singular, $plural, $number);
-    }
-    function dgettext($domain, $msgid) {
-        return _dgettext($domain, $msgid);
-    }
-    function dngettext($domain, $singular, $plural, $number) {
-        return _dngettext($domain, $singular, $plural, $number);
-    }
-    function dcgettext($domain, $msgid, $category) {
-        return _dcgettext($domain, $msgid, $category);
-    }
-    function dcngettext($domain, $singular, $plural, $number, $category) {
-        return _dcngettext($domain, $singular, $plural, $number, $category);
-    }
-    function pgettext($context, $msgid) {
-        return _pgettext($context, $msgid);
-    }
-    function npgettext($context, $singular, $plural, $number) {
-        return _npgettext($context, $singular, $plural, $number);
-    }
-    function dpgettext($domain, $context, $msgid) {
-        return _dpgettext($domain, $context, $msgid);
-    }
-    function dnpgettext($domain, $context, $singular, $plural, $number) {
-        return _dnpgettext($domain, $context, $singular, $plural, $number);
-    }
-    function dcpgettext($domain, $context, $msgid, $category) {
-        return _dcpgettext($domain, $context, $msgid, $category);
-    }
-    function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
-    }
-}
-
-?>
diff --git a/inc/lib/gettext/gettext.php b/inc/lib/gettext/gettext.php
deleted file mode 100755
index 5064047c..00000000
--- a/inc/lib/gettext/gettext.php
+++ /dev/null
@@ -1,432 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
-   Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-/**
- * Provides a simple gettext replacement that works independently from
- * the system's gettext abilities.
- * It can read MO files and use them for translating strings.
- * The files are passed to gettext_reader as a Stream (see streams.php)
- *
- * This version has the ability to cache all strings and translations to
- * speed up the string lookup.
- * While the cache is enabled by default, it can be switched off with the
- * second parameter in the constructor (e.g. whenusing very large MO files
- * that you don't want to keep in memory)
- */
-class gettext_reader {
-  //public:
-   var $error = 0; // public variable that holds error code (0 if no error)
-
-   //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
-  var $STREAM = NULL;
-  var $short_circuit = false;
-  var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
-
-
-  /* Methods */
-
-
-  /**
-   * Reads a 32bit Integer from the Stream
-   *
-   * @access private
-   * @return Integer from the Stream
-   */
-  function readint() {
-      if ($this->BYTEORDER == 0) {
-        // low endian
-        $input=unpack('V', $this->STREAM->read(4));
-        return array_shift($input);
-      } else {
-        // big endian
-        $input=unpack('N', $this->STREAM->read(4));
-        return array_shift($input);
-      }
-    }
-
-  function read($bytes) {
-    return $this->STREAM->read($bytes);
-  }
-
-  /**
-   * Reads an array of Integers from the Stream
-   *
-   * @param int count How many elements should be read
-   * @return Array of Integers
-   */
-  function readintarray($count) {
-    if ($this->BYTEORDER == 0) {
-        // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
-        // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
-  }
-
-  /**
-   * Constructor
-   *
-   * @param object Reader the StreamReader object
-   * @param boolean enable_cache Enable or disable caching of strings (default on)
-   */
-  function gettext_reader($Reader, $enable_cache = true) {
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
-    }
-
-    // Caching can be turned off
-    $this->enable_cache = $enable_cache;
-
-    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC2 = "\xde\x12\x04\x95";
-
-    $this->STREAM = $Reader;
-    $magic = $this->read(4);
-    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
-    } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
-    } else {
-      $this->error = 1; // not MO file
-      return false;
-    }
-
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-    $this->total = $this->readint();
-    $this->originals = $this->readint();
-    $this->translations = $this->readint();
-  }
-
-  /**
-   * Loads the translation tables from the MO file into the cache
-   * If caching is enabled, also loads all strings into a cache
-   * to speed up translation lookups
-   *
-   * @access private
-   */
-  function load_tables() {
-    if (is_array($this->cache_translations) &&
-      is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
-
-    /* get original and translations tables */
-    if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
-    }
-    if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
-    }
-
-    if ($this->enable_cache) {
-      $this->cache_translations = array ();
-      /* read all strings in the cache */
-      for ($i = 0; $i < $this->total; $i++) {
-        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
-        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
-        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
-        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
-        $this->cache_translations[$original] = $translation;
-      }
-    }
-  }
-
-  /**
-   * Returns a string from the "originals" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_original_string($num) {
-    $length = $this->table_originals[$num * 2 + 1];
-    $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Returns a string from the "translations" table
-   *
-   * @access private
-   * @param int num Offset number of original string
-   * @return string Requested string if found, otherwise ''
-   */
-  function get_translation_string($num) {
-    $length = $this->table_translations[$num * 2 + 1];
-    $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
-  }
-
-  /**
-   * Binary search for string
-   *
-   * @access private
-   * @param string string
-   * @param int start (internally used in recursive function)
-   * @param int end (internally used in recursive function)
-   * @return int string number (offset in originals table)
-   */
-  function find_string($string, $start = -1, $end = -1) {
-    if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
-    }
-    if (abs($start - $end) <= 1) {
-      // We're done, now we either found the string, or it doesn't exist
-      $txt = $this->get_original_string($start);
-      if ($string == $txt)
-        return $start;
-      else
-        return -1;
-    } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
-    } else {
-      // Divide table in two parts
-      $half = (int)(($start + $end) / 2);
-      $cmp = strcmp($string, $this->get_original_string($half));
-      if ($cmp == 0)
-        // string is exactly in the middle => return it
-        return $half;
-      else if ($cmp < 0)
-        // The string is in the upper half
-        return $this->find_string($string, $start, $half);
-      else
-        // The string is in the lower half
-        return $this->find_string($string, $half, $end);
-    }
-  }
-
-  /**
-   * Translates a string
-   *
-   * @access public
-   * @param string string to be translated
-   * @return string translated string (or original, if not found)
-   */
-  function translate($string) {
-    if ($this->short_circuit)
-      return $string;
-    $this->load_tables();
-
-    if ($this->enable_cache) {
-      // Caching enabled, get translated string from cache
-      if (array_key_exists($string, $this->cache_translations))
-        return $this->cache_translations[$string];
-      else
-        return $string;
-    } else {
-      // Caching not enabled, try to find string
-      $num = $this->find_string($string);
-      if ($num == -1)
-        return $string;
-      else
-        return $this->get_translation_string($num);
-    }
-  }
-
-  /**
-   * Sanitize plural form expression for use in PHP eval call.
-   *
-   * @access private
-   * @return string sanitized plural form expression
-   */
-  function sanitize_plural_expression($expr) {
-    // Get rid of disallowed characters.
-    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
-
-    // Add parenthesis for tertiary '?' operator.
-    $expr .= ';';
-    $res = '';
-    $p = 0;
-    for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
-        $res .= ' ? (';
-        $p++;
-        break;
-      case ':':
-        $res .= ') : (';
-        break;
-      case ';':
-        $res .= str_repeat( ')', $p) . ';';
-        $p = 0;
-        break;
-      default:
-        $res .= $ch;
-      }
-    }
-    return $res;
-  }
-
-  /**
-   * Parse full PO header and extract only plural forms line.
-   *
-   * @access private
-   * @return string verbatim plural form header field
-   */
-  function extract_plural_forms_header_from_po_header($header) {
-    if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-      $expr = $regs[2];
-    else
-      $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
-    return $expr;
-  }
-
-  /**
-   * Get possible plural forms from MO header
-   *
-   * @access private
-   * @return string plural form header
-   */
-  function get_plural_forms() {
-    // lets assume message number 0 is header
-    // this is true, right?
-    $this->load_tables();
-
-    // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
-        $header = $this->cache_translations[""];
-      } else {
-        $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
-    }
-    return $this->pluralheader;
-  }
-
-  /**
-   * Detects which plural form to take
-   *
-   * @access private
-   * @param n count
-   * @return int array index of the right plural form
-   */
-  function select_string($n) {
-    $string = $this->get_plural_forms();
-    $string = str_replace('nplurals',"\$total",$string);
-    $string = str_replace("n",$n,$string);
-    $string = str_replace('plural',"\$plural",$string);
-
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
-    return $plural;
-  }
-
-  /**
-   * Plural version of gettext
-   *
-   * @access public
-   * @param string single
-   * @param string plural
-   * @param string number
-   * @return translated plural form
-   */
-  function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
-    }
-
-    // find out the appropriate form
-    $select = $this->select_string($number);
-
-    // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
-
-
-    if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->cache_translations[$key];
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->get_translation_string($num);
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    }
-  }
-
-  function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
-    $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
-    } else {
-      return $ret;
-    }
-  }
-
-  function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
-    $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
-    } else {
-      return $ret;
-    }
-
-  }
-}
-
-?>
diff --git a/inc/lib/gettext/streams.php b/inc/lib/gettext/streams.php
deleted file mode 100644
index 3cdc1584..00000000
--- a/inc/lib/gettext/streams.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/*
-   Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
-
-   This file is part of PHP-gettext.
-
-   PHP-gettext is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   PHP-gettext is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with PHP-gettext; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-*/
-
-
-  // Simple class to wrap file streams, string streams, etc.
-  // seek is essential, and it should be byte stream
-class StreamReader {
-  // should return a string [FIXME: perhaps return array of bytes?]
-  function read($bytes) {
-    return false;
-  }
-
-  // should return new position
-  function seekto($position) {
-    return false;
-  }
-
-  // returns current position
-  function currentpos() {
-    return false;
-  }
-
-  // returns length of entire stream (limit for seekto()s)
-  function length() {
-    return false;
-  }
-};
-
-class StringReader {
-  var $_pos;
-  var $_str;
-
-  function StringReader($str='') {
-    $this->_str = $str;
-    $this->_pos = 0;
-  }
-
-  function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
-    $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-
-    return $data;
-  }
-
-  function seekto($pos) {
-    $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return strlen($this->_str);
-  }
-
-};
-
-
-class FileReader {
-  var $_pos;
-  var $_fd;
-  var $_length;
-
-  function FileReader($filename) {
-    if (file_exists($filename)) {
-
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-
-  function read($bytes) {
-    if ($bytes) {
-      fseek($this->_fd, $this->_pos);
-
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
-        $chunk  = fread($this->_fd, $bytes);
-        $data  .= $chunk;
-        $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
-
-      return $data;
-    } else return '';
-  }
-
-  function seekto($pos) {
-    fseek($this->_fd, $pos);
-    $this->_pos = ftell($this->_fd);
-    return $this->_pos;
-  }
-
-  function currentpos() {
-    return $this->_pos;
-  }
-
-  function length() {
-    return $this->_length;
-  }
-
-  function close() {
-    fclose($this->_fd);
-  }
-
-};
-
-// Preloads entire file in memory first, then creates a StringReader
-// over it (it assumes knowledge of StringReader internals)
-class CachedFileReader extends StringReader {
-  function CachedFileReader($filename) {
-    if (file_exists($filename)) {
-
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
-
-      if (!$fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
-
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
-  }
-};
-
-
-?>
diff --git a/inc/lib/minify/FirePHP.php b/inc/lib/minify/FirePHP.php
deleted file mode 100755
index d301a641..00000000
--- a/inc/lib/minify/FirePHP.php
+++ /dev/null
@@ -1,1370 +0,0 @@
-<?php
-/**
- * *** BEGIN LICENSE BLOCK *****
- *  
- * This file is part of FirePHP (http://www.firephp.org/).
- * 
- * Software License Agreement (New BSD License)
- * 
- * Copyright (c) 2006-2008, Christoph Dorn
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- * 
- *     * Redistributions in binary form must reproduce the above copyright notice,
- *       this list of conditions and the following disclaimer in the documentation
- *       and/or other materials provided with the distribution.
- * 
- *     * Neither the name of Christoph Dorn nor the names of its
- *       contributors may be used to endorse or promote products derived from this
- *       software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * ***** END LICENSE BLOCK *****
- * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
- */
- 
- 
-/**
- * Sends the given data to the FirePHP Firefox Extension.
- * The data can be displayed in the Firebug Console or in the
- * "Server" request tab.
- * 
- * For more information see: http://www.firephp.org/
- * 
- * @copyright   Copyright (C) 2007-2008 Christoph Dorn
- * @author      Christoph Dorn <christoph@christophdorn.com>
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @package     FirePHP
- */
-class FirePHP {
-  
-  /**
-   * FirePHP version
-   *
-   * @var string
-   */
-  const VERSION = '0.2.0';
-  
-  /**
-   * Firebug LOG level
-   *
-   * Logs a message to firebug console.
-   * 
-   * @var string
-   */
-  const LOG = 'LOG';
-  
-  /**
-   * Firebug INFO level
-   *
-   * Logs a message to firebug console and displays an info icon before the message.
-   * 
-   * @var string
-   */
-  const INFO = 'INFO';
-  
-  /**
-   * Firebug WARN level
-   *
-   * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise.
-   * 
-   * @var string
-   */
-  const WARN = 'WARN';
-  
-  /**
-   * Firebug ERROR level
-   *
-   * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count.
-   * 
-   * @var string
-   */
-  const ERROR = 'ERROR';
-  
-  /**
-   * Dumps a variable to firebug's server panel
-   *
-   * @var string
-   */
-  const DUMP = 'DUMP';
-  
-  /**
-   * Displays a stack trace in firebug console
-   *
-   * @var string
-   */
-  const TRACE = 'TRACE';
-  
-  /**
-   * Displays an exception in firebug console
-   * 
-   * Increments the firebug error count.
-   *
-   * @var string
-   */
-  const EXCEPTION = 'EXCEPTION';
-  
-  /**
-   * Displays an table in firebug console
-   *
-   * @var string
-   */
-  const TABLE = 'TABLE';
-  
-  /**
-   * Starts a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_START = 'GROUP_START';
-  
-  /**
-   * Ends a group in firebug console
-   * 
-   * @var string
-   */
-  const GROUP_END = 'GROUP_END';
-  
-  /**
-   * Singleton instance of FirePHP
-   *
-   * @var FirePHP
-   */
-  protected static $instance = null;
-  
-  /**
-   * Wildfire protocol message index
-   *
-   * @var int
-   */
-  protected $messageIndex = 1;
-    
-  /**
-   * Options for the library
-   * 
-   * @var array
-   */
-  protected $options = array();
-  
-  /**
-   * Filters used to exclude object members when encoding
-   * 
-   * @var array
-   */
-  protected $objectFilters = array();
-  
-  /**
-   * A stack of objects used to detect recursion during object encoding
-   * 
-   * @var object
-   */
-  protected $objectStack = array();
-  
-  /**
-   * Flag to enable/disable logging
-   * 
-   * @var boolean
-   */
-  protected $enabled = true;
-  
-  /**
-   * The object constructor
-   */
-  function __construct() {
-    $this->options['maxObjectDepth'] = 10;
-    $this->options['maxArrayDepth'] = 20;
-    $this->options['useNativeJsonEncode'] = true;
-    $this->options['includeLineNumbers'] = true;
-  }
-    
-  /**
-   * When the object gets serialized only include specific object members.
-   * 
-   * @return array
-   */  
-  public function __sleep() {
-    return array('options','objectFilters','enabled');
-  }
-    
-  /**
-   * Gets singleton instance of FirePHP
-   *
-   * @param boolean $AutoCreate
-   * @return FirePHP
-   */
-  public static function getInstance($AutoCreate=false) {
-    if($AutoCreate===true && !self::$instance) {
-      self::init();
-    }
-    return self::$instance;
-  }
-   
-  /**
-   * Creates FirePHP object and stores it for singleton access
-   *
-   * @return FirePHP
-   */
-  public static function init() {
-    return self::$instance = new self();
-  }
-  
-  /**
-   * Enable and disable logging to Firebug
-   * 
-   * @param boolean $Enabled TRUE to enable, FALSE to disable
-   * @return void
-   */
-  public function setEnabled($Enabled) {
-    $this->enabled = $Enabled;
-  }
-  
-  /**
-   * Check if logging is enabled
-   * 
-   * @return boolean TRUE if enabled
-   */
-  public function getEnabled() {
-    return $this->enabled;
-  }
-  
-  /**
-   * Specify a filter to be used when encoding an object
-   * 
-   * Filters are used to exclude object members.
-   * 
-   * @param string $Class The class name of the object
-   * @param array $Filter An array or members to exclude
-   * @return void
-   */
-  public function setObjectFilter($Class, $Filter) {
-    $this->objectFilters[$Class] = $Filter;
-  }
-  
-  /**
-   * Set some options for the library
-   * 
-   * Options:
-   *  - maxObjectDepth: The maximum depth to traverse objects (default: 10)
-   *  - maxArrayDepth: The maximum depth to traverse arrays (default: 20)
-   *  - useNativeJsonEncode: If true will use json_encode() (default: true)
-   *  - includeLineNumbers: If true will include line numbers and filenames (default: true)
-   * 
-   * @param array $Options The options to be set
-   * @return void
-   */
-  public function setOptions($Options) {
-    $this->options = array_merge($this->options,$Options);
-  }
-  
-  /**
-   * Register FirePHP as your error handler
-   * 
-   * Will throw exceptions for each php error.
-   */
-  public function registerErrorHandler()
-  {
-    //NOTE: The following errors will not be caught by this error handler:
-    //      E_ERROR, E_PARSE, E_CORE_ERROR,
-    //      E_CORE_WARNING, E_COMPILE_ERROR,
-    //      E_COMPILE_WARNING, E_STRICT
-    
-    set_error_handler(array($this,'errorHandler'));     
-  }
-
-  /**
-   * FirePHP's error handler
-   * 
-   * Throws exception for each php error that will occur.
-   *
-   * @param int $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param int $errline
-   * @param array $errcontext
-   */
-  public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
-  {
-    // Don't throw exception if error reporting is switched off
-    if (error_reporting() == 0) {
-      return;
-    }
-    // Only throw exceptions for errors we are asking for
-    if (error_reporting() & $errno) {
-      throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-    }
-  }
-  
-  /**
-   * Register FirePHP as your exception handler
-   */
-  public function registerExceptionHandler()
-  {
-    set_exception_handler(array($this,'exceptionHandler'));     
-  }
-  
-  /**
-   * FirePHP's exception handler
-   * 
-   * Logs all exceptions to your firebug console and then stops the script.
-   *
-   * @param Exception $Exception
-   * @throws Exception
-   */
-  function exceptionHandler($Exception) {
-    $this->fb($Exception);
-  }
-  
-  /**
-   * Set custom processor url for FirePHP
-   *
-   * @param string $URL
-   */    
-  public function setProcessorUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-ProcessorURL', $URL);
-  }
-
-  /**
-   * Set custom renderer url for FirePHP
-   *
-   * @param string $URL
-   */
-  public function setRendererUrl($URL)
-  {
-    $this->setHeader('X-FirePHP-RendererURL', $URL);
-  }
-  
-  /**
-   * Start a group for following messages
-   *
-   * @param string $Name
-   * @return true
-   * @throws Exception
-   */
-  public function group($Name) {
-    return $this->fb(null, $Name, FirePHP::GROUP_START);
-  }
-  
-  /**
-   * Ends a group you have started before
-   *
-   * @return true
-   * @throws Exception
-   */
-  public function groupEnd() {
-    return $this->fb(null, null, FirePHP::GROUP_END);
-  }
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::LOG
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function log($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::LOG);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::INFO
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function info($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::INFO);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::WARN
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function warn($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::WARN);
-  } 
-
-  /**
-   * Log object with label to firebug console
-   *
-   * @see FirePHP::ERROR
-   * @param mixes $Object
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function error($Object, $Label=null) {
-    return $this->fb($Object, $Label, FirePHP::ERROR);
-  } 
-
-  /**
-   * Dumps key and variable to firebug server panel
-   *
-   * @see FirePHP::DUMP
-   * @param string $Key
-   * @param mixed $Variable
-   * @return true
-   * @throws Exception
-   */
-  public function dump($Key, $Variable) {
-    return $this->fb($Variable, $Key, FirePHP::DUMP);
-  }
-  
-  /**
-   * Log a trace in the firebug console
-   *
-   * @see FirePHP::TRACE
-   * @param string $Label
-   * @return true
-   * @throws Exception
-   */
-  public function trace($Label) {
-    return $this->fb($Label, FirePHP::TRACE);
-  } 
-
-  /**
-   * Log a table in the firebug console
-   *
-   * @see FirePHP::TABLE
-   * @param string $Label
-   * @param string $Table
-   * @return true
-   * @throws Exception
-   */
-  public function table($Label, $Table) {
-    return $this->fb($Table, $Label, FirePHP::TABLE);
-  }
-  
-  /**
-   * Check if FirePHP is installed on client
-   *
-   * @return boolean
-   */
-  public function detectClientExtension() {
-    /* Check if FirePHP is installed on client */
-    if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) ||
-       !version_compare($m[1][0],'0.0.6','>=')) {
-      return false;
-    }
-    return true;    
-  }
- 
-  /**
-   * Log varible to Firebug
-   * 
-   * @see http://www.firephp.org/Wiki/Reference/Fb
-   * @param mixed $Object The variable to be logged
-   * @return true Return TRUE if message was added to headers, FALSE otherwise
-   * @throws Exception
-   */
-  public function fb($Object) {
-  
-    if(!$this->enabled) {
-      return false;
-    }
-  
-    if (headers_sent($filename, $linenum)) {
-        throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.');
-    }
-  
-    $Type = null;
-    $Label = null;
-  
-    if(func_num_args()==1) {
-    } else
-    if(func_num_args()==2) {
-      switch(func_get_arg(1)) {
-        case self::LOG:
-        case self::INFO:
-        case self::WARN:
-        case self::ERROR:
-        case self::DUMP:
-        case self::TRACE:
-        case self::EXCEPTION:
-        case self::TABLE:
-        case self::GROUP_START:
-        case self::GROUP_END:
-          $Type = func_get_arg(1);
-          break;
-        default:
-          $Label = func_get_arg(1);
-          break;
-      }
-    } else
-    if(func_num_args()==3) {
-      $Type = func_get_arg(2);
-      $Label = func_get_arg(1);
-    } else {
-      throw $this->newException('Wrong number of arguments to fb() function!');
-    }
-  
-  
-    if(!$this->detectClientExtension()) {
-      return false;
-    }
-  
-    $meta = array();
-    $skipFinalObjectEncode = false;
-  
-    if($Object instanceof Exception) {
-
-      $meta['file'] = $this->_escapeTraceFile($Object->getFile());
-      $meta['line'] = $Object->getLine();
-      
-      $trace = $Object->getTrace();
-      if($Object instanceof ErrorException
-         && isset($trace[0]['function'])
-         && $trace[0]['function']=='errorHandler'
-         && isset($trace[0]['class'])
-         && $trace[0]['class']=='FirePHP') {
-           
-        $severity = false;
-        switch($Object->getSeverity()) {
-          case E_WARNING: $severity = 'E_WARNING'; break;
-          case E_NOTICE: $severity = 'E_NOTICE'; break;
-          case E_USER_ERROR: $severity = 'E_USER_ERROR'; break;
-          case E_USER_WARNING: $severity = 'E_USER_WARNING'; break;
-          case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break;
-          case E_STRICT: $severity = 'E_STRICT'; break;
-          case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break;
-          case E_DEPRECATED: $severity = 'E_DEPRECATED'; break;
-          case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break;
-        }
-           
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$severity.': '.$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'trigger',
-                        'Trace'=>$this->_escapeTrace(array_splice($trace,2)));
-        $skipFinalObjectEncode = true;
-      } else {
-        $Object = array('Class'=>get_class($Object),
-                        'Message'=>$Object->getMessage(),
-                        'File'=>$this->_escapeTraceFile($Object->getFile()),
-                        'Line'=>$Object->getLine(),
-                        'Type'=>'throw',
-                        'Trace'=>$this->_escapeTrace($trace));
-        $skipFinalObjectEncode = true;
-      }
-      $Type = self::EXCEPTION;
-      
-    } else
-    if($Type==self::TRACE) {
-      
-      $trace = debug_backtrace();
-      if(!$trace) return false;
-      for( $i=0 ; $i<sizeof($trace) ; $i++ ) {
-
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i]['file'])
-           && ($trace[$i]['class']=='FirePHP'
-               || $trace[$i]['class']=='FB')
-           && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-               || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-          /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-        } else
-        if(isset($trace[$i]['class'])
-           && isset($trace[$i+1]['file'])
-           && $trace[$i]['class']=='FirePHP'
-           && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-          /* Skip fb() */
-        } else
-        if($trace[$i]['function']=='fb'
-           || $trace[$i]['function']=='trace'
-           || $trace[$i]['function']=='send') {
-          $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'',
-                          'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'',
-                          'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'',
-                          'Message'=>$trace[$i]['args'][0],
-                          'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'',
-                          'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'',
-                          'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'',
-                          'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1)));
-
-          $skipFinalObjectEncode = true;
-          $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-          $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-          break;
-        }
-      }
-
-    } else
-    if($Type==self::TABLE) {
-      
-      if(isset($Object[0]) && is_string($Object[0])) {
-        $Object[1] = $this->encodeTable($Object[1]);
-      } else {
-        $Object = $this->encodeTable($Object);
-      }
-
-      $skipFinalObjectEncode = true;
-      
-    } else {
-      if($Type===null) {
-        $Type = self::LOG;
-      }
-    }
-    
-    if($this->options['includeLineNumbers']) {
-      if(!isset($meta['file']) || !isset($meta['line'])) {
-
-        $trace = debug_backtrace();
-        for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) {
-  
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i]['file'])
-             && ($trace[$i]['class']=='FirePHP'
-                 || $trace[$i]['class']=='FB')
-             && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php'
-                 || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) {
-            /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */
-          } else
-          if(isset($trace[$i]['class'])
-             && isset($trace[$i+1]['file'])
-             && $trace[$i]['class']=='FirePHP'
-             && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip fb() */
-          } else
-          if(isset($trace[$i]['file'])
-             && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') {
-            /* Skip FB::fb() */
-          } else {
-            $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'';
-            $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:'';
-            break;
-          }
-        }      
-      
-      }
-    } else {
-      unset($meta['file']);
-      unset($meta['line']);
-    }
-
-  	$this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
-  	$this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION);
- 
-    $structure_index = 1;
-    if($Type==self::DUMP) {
-      $structure_index = 2;
-    	$this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
-    } else {
-    	$this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
-    }
-  
-    if($Type==self::DUMP) {
-    	$msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}';
-    } else {
-      $msg_meta = array('Type'=>$Type);
-      if($Label!==null) {
-        $msg_meta['Label'] = $Label;
-      }
-      if(isset($meta['file'])) {
-        $msg_meta['File'] = $meta['file'];
-      }
-      if(isset($meta['line'])) {
-        $msg_meta['Line'] = $meta['line'];
-      }
-    	$msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']';
-    }
-    
-    $parts = explode("\n",chunk_split($msg, 5000, "\n"));
-
-    for( $i=0 ; $i<count($parts) ; $i++) {
-        
-        $part = $parts[$i];
-        if ($part) {
-            
-            if(count($parts)>2) {
-              // Message needs to be split into multiple parts
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               (($i==0)?strlen($msg):'')
-                               . '|' . $part . '|'
-                               . (($i<count($parts)-2)?'\\':''));
-            } else {
-              $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex,
-                               strlen($part) . '|' . $part . '|');
-            }
-            
-            $this->messageIndex++;
-            
-            if ($this->messageIndex > 99999) {
-                throw new Exception('Maximum number (99,999) of messages reached!');             
-            }
-        }
-    }
-
-  	$this->setHeader('X-Wf-1-Index',$this->messageIndex-1);
-
-    return true;
-  }
-  
-  /**
-   * Standardizes path for windows systems.
-   *
-   * @param string $Path
-   * @return string
-   */
-  protected function _standardizePath($Path) {
-    return preg_replace('/\\\\+/','/',$Path);    
-  }
-  
-  /**
-   * Escape trace path for windows systems
-   *
-   * @param array $Trace
-   * @return array
-   */
-  protected function _escapeTrace($Trace) {
-    if(!$Trace) return $Trace;
-    for( $i=0 ; $i<sizeof($Trace) ; $i++ ) {
-      if(isset($Trace[$i]['file'])) {
-        $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']);
-      }
-      if(isset($Trace[$i]['args'])) {
-        $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']);
-      }
-    }
-    return $Trace;    
-  }
-  
-  /**
-   * Escape file information of trace for windows systems
-   *
-   * @param string $File
-   * @return string
-   */
-  protected function _escapeTraceFile($File) {
-    /* Check if we have a windows filepath */
-    if(strpos($File,'\\')) {
-      /* First strip down to single \ */
-      
-      $file = preg_replace('/\\\\+/','\\',$File);
-      
-      return $file;
-    }
-    return $File;
-  }
-
-  /**
-   * Send header
-   *
-   * @param string $Name
-   * @param string_type $Value
-   */
-  protected function setHeader($Name, $Value) {
-    return header($Name.': '.$Value);
-  }
-
-  /**
-   * Get user agent
-   *
-   * @return string|false
-   */
-  protected function getUserAgent() {
-    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
-    return $_SERVER['HTTP_USER_AGENT'];
-  }
-
-  /**
-   * Returns a new exception
-   *
-   * @param string $Message
-   * @return Exception
-   */
-  protected function newException($Message) {
-    return new Exception($Message);
-  }
-  
-  /**
-   * Encode an object into a JSON string
-   * 
-   * Uses PHP's jeson_encode() if available
-   * 
-   * @param object $Object The object to be encoded
-   * @return string The JSON string
-   */
-  protected function jsonEncode($Object, $skipObjectEncode=false)
-  {
-    if(!$skipObjectEncode) {
-      $Object = $this->encodeObject($Object);
-    }
-    
-    if(function_exists('json_encode')
-       && $this->options['useNativeJsonEncode']!=false) {
-
-      return json_encode($Object);
-    } else {
-      return $this->json_encode($Object);
-    }
-  }
-  
-  /**
-   * Encodes a table by encoding each row and column with encodeObject()
-   * 
-   * @param array $Table The table to be encoded
-   * @return array
-   */  
-  protected function encodeTable($Table) {
-    if(!$Table) return $Table;
-    for( $i=0 ; $i<count($Table) ; $i++ ) {
-      if(is_array($Table[$i])) {
-        for( $j=0 ; $j<count($Table[$i]) ; $j++ ) {
-          $Table[$i][$j] = $this->encodeObject($Table[$i][$j]);
-        }
-      }
-    }
-    return $Table;
-  }
-  
-  /**
-   * Encodes an object including members with
-   * protected and private visibility
-   * 
-   * @param Object $Object The object to be encoded
-   * @param int $Depth The current traversal depth
-   * @return array All members of the object
-   */
-  protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1)
-  {
-    $return = array();
-    
-    if (is_object($Object)) {
-
-        if ($ObjectDepth > $this->options['maxObjectDepth']) {
-          return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **';
-        }
-        
-        foreach ($this->objectStack as $refVal) {
-            if ($refVal === $Object) {
-                return '** Recursion ('.get_class($Object).') **';
-            }
-        }
-        array_push($this->objectStack, $Object);
-                
-        $return['__className'] = $class = get_class($Object);
-
-        $reflectionClass = new ReflectionClass($class);  
-        $properties = array();
-        foreach( $reflectionClass->getProperties() as $property) {
-          $properties[$property->getName()] = $property;
-        }
-            
-        $members = (array)$Object;
-            
-        foreach( $properties as $raw_name => $property ) {
-          
-          $name = $raw_name;
-          if($property->isStatic()) {
-            $name = 'static:'.$name;
-          }
-          if($property->isPublic()) {
-            $name = 'public:'.$name;
-          } else
-          if($property->isPrivate()) {
-            $name = 'private:'.$name;
-            $raw_name = "\0".$class."\0".$raw_name;
-          } else
-          if($property->isProtected()) {
-            $name = 'protected:'.$name;
-            $raw_name = "\0".'*'."\0".$raw_name;
-          }
-          
-          if(!(isset($this->objectFilters[$class])
-               && is_array($this->objectFilters[$class])
-               && in_array($raw_name,$this->objectFilters[$class]))) {
-
-            if(array_key_exists($raw_name,$members)
-               && !$property->isStatic()) {
-              
-              $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1);      
-            
-            } else {
-              if(method_exists($property,'setAccessible')) {
-                $property->setAccessible(true);
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else
-              if($property->isPublic()) {
-                $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1);
-              } else {
-                $return[$name] = '** Need PHP 5.3 to get value **';
-              }
-            }
-          } else {
-            $return[$name] = '** Excluded by Filter **';
-          }
-        }
-        
-        // Include all members that are not defined in the class
-        // but exist in the object
-        foreach( $members as $raw_name => $value ) {
-          
-          $name = $raw_name;
-          
-          if ($name{0} == "\0") {
-            $parts = explode("\0", $name);
-            $name = $parts[2];
-          }
-          
-          if(!isset($properties[$name])) {
-            $name = 'undeclared:'.$name;
-              
-            if(!(isset($this->objectFilters[$class])
-                 && is_array($this->objectFilters[$class])
-                 && in_array($raw_name,$this->objectFilters[$class]))) {
-              
-              $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1);
-            } else {
-              $return[$name] = '** Excluded by Filter **';
-            }
-          }
-        }
-        
-        array_pop($this->objectStack);
-        
-    } elseif (is_array($Object)) {
-
-        if ($ArrayDepth > $this->options['maxArrayDepth']) {
-          return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **';
-        }
-      
-        foreach ($Object as $key => $val) {
-          
-          // Encoding the $GLOBALS PHP array causes an infinite loop
-          // if the recursion is not reset here as it contains
-          // a reference to itself. This is the only way I have come up
-          // with to stop infinite recursion in this case.
-          if($key=='GLOBALS'
-             && is_array($val)
-             && array_key_exists('GLOBALS',$val)) {
-            $val['GLOBALS'] = '** Recursion (GLOBALS) **';
-          }
-          
-          $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1);
-        }
-    } else {
-      if(self::is_utf8($Object)) {
-        return $Object;
-      } else {
-        return utf8_encode($Object);
-      }
-    }
-    return $return;
-  }
-
-  /**
-   * Returns true if $string is valid UTF-8 and false otherwise.
-   *
-   * @param mixed $str String to be tested
-   * @return boolean
-   */
-  protected static function is_utf8($str) {
-    $c=0; $b=0;
-    $bits=0;
-    $len=strlen($str);
-    for($i=0; $i<$len; $i++){
-        $c=ord($str[$i]);
-        if($c > 128){
-            if(($c >= 254)) return false;
-            elseif($c >= 252) $bits=6;
-            elseif($c >= 248) $bits=5;
-            elseif($c >= 240) $bits=4;
-            elseif($c >= 224) $bits=3;
-            elseif($c >= 192) $bits=2;
-            else return false;
-            if(($i+$bits) > $len) return false;
-            while($bits > 1){
-                $i++;
-                $b=ord($str[$i]);
-                if($b < 128 || $b > 191) return false;
-                $bits--;
-            }
-        }
-    }
-    return true;
-  } 
-
-  /**
-   * Converts to and from JSON format.
-   *
-   * JSON (JavaScript Object Notation) is a lightweight data-interchange
-   * format. It is easy for humans to read and write. It is easy for machines
-   * to parse and generate. It is based on a subset of the JavaScript
-   * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
-   * This feature can also be found in  Python. JSON is a text format that is
-   * completely language independent but uses conventions that are familiar
-   * to programmers of the C-family of languages, including C, C++, C#, Java,
-   * JavaScript, Perl, TCL, and many others. These properties make JSON an
-   * ideal data-interchange language.
-   *
-   * This package provides a simple encoder and decoder for JSON notation. It
-   * is intended for use with client-side Javascript applications that make
-   * use of HTTPRequest to perform server communication functions - data can
-   * be encoded into JSON notation for use in a client-side javascript, or
-   * decoded from incoming Javascript requests. JSON format is native to
-   * Javascript, and can be directly eval()'ed with no further parsing
-   * overhead
-   *
-   * All strings should be in ASCII or UTF-8 format!
-   *
-   * LICENSE: Redistribution and use in source and binary forms, with or
-   * without modification, are permitted provided that the following
-   * conditions are met: Redistributions of source code must retain the
-   * above copyright notice, this list of conditions and the following
-   * disclaimer. Redistributions in binary form must reproduce the above
-   * copyright notice, this list of conditions and the following disclaimer
-   * in the documentation and/or other materials provided with the
-   * distribution.
-   *
-   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-   * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-   * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-   * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-   * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-   * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-   * DAMAGE.
-   *
-   * @category
-   * @package     Services_JSON
-   * @author      Michal Migurski <mike-json@teczno.com>
-   * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
-   * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
-   * @author      Christoph Dorn <christoph@christophdorn.com>
-   * @copyright   2005 Michal Migurski
-   * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
-   * @license     http://www.opensource.org/licenses/bsd-license.php
-   * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
-   */
-   
-     
-  /**
-   * Keep a list of objects as we descend into the array so we can detect recursion.
-   */
-  private $json_objectStack = array();
-
-
- /**
-  * convert a string from one UTF-8 char to one UTF-16 char
-  *
-  * Normally should be handled by mb_convert_encoding, but
-  * provides a slower PHP-only method for installations
-  * that lack the multibye string extension.
-  *
-  * @param    string  $utf8   UTF-8 character
-  * @return   string  UTF-16 character
-  * @access   private
-  */
-  private function json_utf82utf16($utf8)
-  {
-      // oh please oh please oh please oh please oh please
-      if(function_exists('mb_convert_encoding')) {
-          return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-      }
-
-      switch(strlen($utf8)) {
-          case 1:
-              // this case should never be reached, because we are in ASCII range
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return $utf8;
-
-          case 2:
-              // return a UTF-16 character from a 2-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr(0x07 & (ord($utf8{0}) >> 2))
-                   . chr((0xC0 & (ord($utf8{0}) << 6))
-                       | (0x3F & ord($utf8{1})));
-
-          case 3:
-              // return a UTF-16 character from a 3-byte UTF-8 char
-              // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-              return chr((0xF0 & (ord($utf8{0}) << 4))
-                       | (0x0F & (ord($utf8{1}) >> 2)))
-                   . chr((0xC0 & (ord($utf8{1}) << 6))
-                       | (0x7F & ord($utf8{2})));
-      }
-
-      // ignoring UTF-32 for now, sorry
-      return '';
-  }
-
- /**
-  * encodes an arbitrary variable into JSON format
-  *
-  * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-  *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-  *                           if var is a strng, note that encode() always expects it
-  *                           to be in ASCII or UTF-8 format!
-  *
-  * @return   mixed   JSON string representation of input var or an error if a problem occurs
-  * @access   public
-  */
-  private function json_encode($var)
-  {
-    
-    if(is_object($var)) {
-      if(in_array($var,$this->json_objectStack)) {
-        return '"** Recursion **"';
-      }
-    }
-          
-      switch (gettype($var)) {
-          case 'boolean':
-              return $var ? 'true' : 'false';
-
-          case 'NULL':
-              return 'null';
-
-          case 'integer':
-              return (int) $var;
-
-          case 'double':
-          case 'float':
-              return (float) $var;
-
-          case 'string':
-              // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-              $ascii = '';
-              $strlen_var = strlen($var);
-
-             /*
-              * Iterate over every character in the string,
-              * escaping with a slash or encoding to UTF-8 where necessary
-              */
-              for ($c = 0; $c < $strlen_var; ++$c) {
-
-                  $ord_var_c = ord($var{$c});
-
-                  switch (true) {
-                      case $ord_var_c == 0x08:
-                          $ascii .= '\b';
-                          break;
-                      case $ord_var_c == 0x09:
-                          $ascii .= '\t';
-                          break;
-                      case $ord_var_c == 0x0A:
-                          $ascii .= '\n';
-                          break;
-                      case $ord_var_c == 0x0C:
-                          $ascii .= '\f';
-                          break;
-                      case $ord_var_c == 0x0D:
-                          $ascii .= '\r';
-                          break;
-
-                      case $ord_var_c == 0x22:
-                      case $ord_var_c == 0x2F:
-                      case $ord_var_c == 0x5C:
-                          // double quote, slash, slosh
-                          $ascii .= '\\'.$var{$c};
-                          break;
-
-                      case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                          // characters U-00000000 - U-0000007F (same as ASCII)
-                          $ascii .= $var{$c};
-                          break;
-
-                      case (($ord_var_c & 0xE0) == 0xC0):
-                          // characters U-00000080 - U-000007FF, mask 110XXXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                          $c += 1;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF0) == 0xE0):
-                          // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}));
-                          $c += 2;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xF8) == 0xF0):
-                          // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}));
-                          $c += 3;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFC) == 0xF8):
-                          // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}));
-                          $c += 4;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-
-                      case (($ord_var_c & 0xFE) == 0xFC):
-                          // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                          // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                          $char = pack('C*', $ord_var_c,
-                                       ord($var{$c + 1}),
-                                       ord($var{$c + 2}),
-                                       ord($var{$c + 3}),
-                                       ord($var{$c + 4}),
-                                       ord($var{$c + 5}));
-                          $c += 5;
-                          $utf16 = $this->json_utf82utf16($char);
-                          $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                          break;
-                  }
-              }
-
-              return '"'.$ascii.'"';
-
-          case 'array':
-             /*
-              * As per JSON spec if any array key is not an integer
-              * we must treat the the whole array as an object. We
-              * also try to catch a sparsely populated associative
-              * array with numeric keys here because some JS engines
-              * will create an array with empty indexes up to
-              * max_index which can cause memory issues and because
-              * the keys, which may be relevant, will be remapped
-              * otherwise.
-              *
-              * As per the ECMA and JSON specification an object may
-              * have any string as a property. Unfortunately due to
-              * a hole in the ECMA specification if the key is a
-              * ECMA reserved word or starts with a digit the
-              * parameter is only accessible using ECMAScript's
-              * bracket notation.
-              */
-
-              // treat as a JSON object
-              if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                  
-                  $this->json_objectStack[] = $var;
-
-                  $properties = array_map(array($this, 'json_name_value'),
-                                          array_keys($var),
-                                          array_values($var));
-
-                  array_pop($this->json_objectStack);
-
-                  foreach($properties as $property) {
-                      if($property instanceof Exception) {
-                          return $property;
-                      }
-                  }
-
-                  return '{' . join(',', $properties) . '}';
-              }
-
-              $this->json_objectStack[] = $var;
-
-              // treat it like a regular array
-              $elements = array_map(array($this, 'json_encode'), $var);
-
-              array_pop($this->json_objectStack);
-
-              foreach($elements as $element) {
-                  if($element instanceof Exception) {
-                      return $element;
-                  }
-              }
-
-              return '[' . join(',', $elements) . ']';
-
-          case 'object':
-              $vars = self::encodeObject($var);
-
-              $this->json_objectStack[] = $var;
-
-              $properties = array_map(array($this, 'json_name_value'),
-                                      array_keys($vars),
-                                      array_values($vars));
-
-              array_pop($this->json_objectStack);
-              
-              foreach($properties as $property) {
-                  if($property instanceof Exception) {
-                      return $property;
-                  }
-              }
-                     
-              return '{' . join(',', $properties) . '}';
-
-          default:
-              return null;
-      }
-  }
-
- /**
-  * array-walking function for use in generating JSON-formatted name-value pairs
-  *
-  * @param    string  $name   name of key to use
-  * @param    mixed   $value  reference to an array element to be encoded
-  *
-  * @return   string  JSON-formatted name-value pair, like '"name":value'
-  * @access   private
-  */
-  private function json_name_value($name, $value)
-  {
-      // Encoding the $GLOBALS PHP array causes an infinite loop
-      // if the recursion is not reset here as it contains
-      // a reference to itself. This is the only way I have come up
-      // with to stop infinite recursion in this case.
-      if($name=='GLOBALS'
-         && is_array($value)
-         && array_key_exists('GLOBALS',$value)) {
-        $value['GLOBALS'] = '** Recursion **';
-      }
-    
-      $encoded_value = $this->json_encode($value);
-
-      if($encoded_value instanceof Exception) {
-          return $encoded_value;
-      }
-
-      return $this->json_encode(strval($name)) . ':' . $encoded_value;
-  }
-}
diff --git a/inc/lib/minify/HTTP/ConditionalGet.php b/inc/lib/minify/HTTP/ConditionalGet.php
deleted file mode 100755
index 93b7e75d..00000000
--- a/inc/lib/minify/HTTP/ConditionalGet.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-/**
- * Class HTTP_ConditionalGet  
- * @package Minify
- * @subpackage HTTP
- */
-
-/**
- * Implement conditional GET via a timestamp or hash of content
- *
- * E.g. Content from DB with update time:
- * <code>
- * list($updateTime, $content) = getDbUpdateAndContent();
- * $cg = new HTTP_ConditionalGet(array(
- *     'lastModifiedTime' => $updateTime
- *     ,'isPublic' => true
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * echo $content;
- * </code>
- * 
- * E.g. Shortcut for the above
- * <code>
- * HTTP_ConditionalGet::check($updateTime, true); // exits if client has cache
- * echo $content;
- * </code>
- *
- * E.g. Content from DB with no update time:
- * <code>
- * $content = getContentFromDB();
- * $cg = new HTTP_ConditionalGet(array(
- *     'contentHash' => md5($content)
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * echo $content;
- * </code>
- * 
- * E.g. Static content with some static includes:
- * <code>
- * // before content
- * $cg = new HTTP_ConditionalGet(array(
- *     'lastUpdateTime' => max(
- *         filemtime(__FILE__)
- *         ,filemtime('/path/to/header.inc')
- *         ,filemtime('/path/to/footer.inc')
- *     )
- * ));
- * $cg->sendHeaders();
- * if ($cg->cacheIsValid) {
- *     exit();
- * }
- * </code>
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay <steve@mrclay.org>
- */
-class HTTP_ConditionalGet {
-
-    /**
-     * Does the client have a valid copy of the requested resource?
-     * 
-     * You'll want to check this after instantiating the object. If true, do
-     * not send content, just call sendHeaders() if you haven't already.
-     *
-     * @var bool
-     */
-    public $cacheIsValid = null;
-
-    /**
-     * @param array $spec options
-     * 
-     * 'isPublic': (bool) if false, the Cache-Control header will contain
-     * "private", allowing only browser caching. (default false)
-     * 
-     * 'lastModifiedTime': (int) if given, both ETag AND Last-Modified headers
-     * will be sent with content. This is recommended.
-     *
-     * 'encoding': (string) if set, the header "Vary: Accept-Encoding" will
-     * always be sent and a truncated version of the encoding will be appended
-     * to the ETag. E.g. "pub123456;gz". This will also trigger a more lenient 
-     * checking of the client's If-None-Match header, as the encoding portion of
-     * the ETag will be stripped before comparison.
-     * 
-     * 'contentHash': (string) if given, only the ETag header can be sent with
-     * content (only HTTP1.1 clients can conditionally GET). The given string 
-     * should be short with no quote characters and always change when the 
-     * resource changes (recommend md5()). This is not needed/used if 
-     * lastModifiedTime is given.
-     * 
-     * 'eTag': (string) if given, this will be used as the ETag header rather
-     * than values based on lastModifiedTime or contentHash. Also the encoding
-     * string will not be appended to the given value as described above.
-     * 
-     * 'invalidate': (bool) if true, the client cache will be considered invalid
-     * without testing. Effectively this disables conditional GET. 
-     * (default false)
-     * 
-     * 'maxAge': (int) if given, this will set the Cache-Control max-age in 
-     * seconds, and also set the Expires header to the equivalent GMT date. 
-     * After the max-age period has passed, the browser will again send a 
-     * conditional GET to revalidate its cache.
-     */
-    public function __construct($spec)
-    {
-        $scope = (isset($spec['isPublic']) && $spec['isPublic'])
-            ? 'public'
-            : 'private';
-        $maxAge = 0;
-        // backwards compatibility (can be removed later)
-        if (isset($spec['setExpires']) 
-            && is_numeric($spec['setExpires'])
-            && ! isset($spec['maxAge'])) {
-            $spec['maxAge'] = $spec['setExpires'] - $_SERVER['REQUEST_TIME'];
-        }
-        if (isset($spec['maxAge'])) {
-            $maxAge = $spec['maxAge'];
-            $this->_headers['Expires'] = self::gmtDate(
-                $_SERVER['REQUEST_TIME'] + $spec['maxAge'] 
-            );
-        }
-        $etagAppend = '';
-        if (isset($spec['encoding'])) {
-            $this->_stripEtag = true;
-            $this->_headers['Vary'] = 'Accept-Encoding';
-            if ('' !== $spec['encoding']) {
-                if (0 === strpos($spec['encoding'], 'x-')) {
-                    $spec['encoding'] = substr($spec['encoding'], 2);
-                }
-                $etagAppend = ';' . substr($spec['encoding'], 0, 2);
-            }
-        }
-        if (isset($spec['lastModifiedTime'])) {
-            $this->_setLastModified($spec['lastModifiedTime']);
-            if (isset($spec['eTag'])) { // Use it
-                $this->_setEtag($spec['eTag'], $scope);
-            } else { // base both headers on time
-                $this->_setEtag($spec['lastModifiedTime'] . $etagAppend, $scope);
-            }
-        } elseif (isset($spec['eTag'])) { // Use it
-            $this->_setEtag($spec['eTag'], $scope);
-        } elseif (isset($spec['contentHash'])) { // Use the hash as the ETag
-            $this->_setEtag($spec['contentHash'] . $etagAppend, $scope);
-        }
-        $privacy = ($scope === 'private')
-            ? ', private'
-            : '';
-        $this->_headers['Cache-Control'] = "max-age={$maxAge}{$privacy}";
-        // invalidate cache if disabled, otherwise check
-        $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate'])
-            ? false
-            : $this->_isCacheValid();
-    }
-    
-    /**
-     * Get array of output headers to be sent
-     * 
-     * In the case of 304 responses, this array will only contain the response
-     * code header: array('_responseCode' => 'HTTP/1.0 304 Not Modified')
-     * 
-     * Otherwise something like: 
-     * <code>
-     * array(
-     *     'Cache-Control' => 'max-age=0, public'
-     *     ,'ETag' => '"foobar"'
-     * )
-     * </code>
-     *
-     * @return array 
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Set the Content-Length header in bytes
-     * 
-     * With most PHP configs, as long as you don't flush() output, this method
-     * is not needed and PHP will buffer all output and set Content-Length for 
-     * you. Otherwise you'll want to call this to let the client know up front.
-     * 
-     * @param int $bytes
-     * 
-     * @return int copy of input $bytes
-     */
-    public function setContentLength($bytes)
-    {
-        return $this->_headers['Content-Length'] = $bytes;
-    }
-
-    /**
-     * Send headers
-     * 
-     * @see getHeaders()
-     * 
-     * Note this doesn't "clear" the headers. Calling sendHeaders() will
-     * call header() again (but probably have not effect) and getHeaders() will
-     * still return the headers.
-     *
-     * @return null
-     */
-    public function sendHeaders()
-    {
-        $headers = $this->_headers;
-        if (array_key_exists('_responseCode', $headers)) {
-            // FastCGI environments require 3rd arg to header() to be set
-            list(, $code) = explode(' ', $headers['_responseCode'], 3);
-            header($headers['_responseCode'], true, $code);
-            unset($headers['_responseCode']);
-        }
-        foreach ($headers as $name => $val) {
-            header($name . ': ' . $val);
-        }
-    }
-    
-    /**
-     * Exit if the client's cache is valid for this resource
-     *
-     * This is a convenience method for common use of the class
-     *
-     * @param int $lastModifiedTime if given, both ETag AND Last-Modified headers
-     * will be sent with content. This is recommended.
-     *
-     * @param bool $isPublic (default false) if true, the Cache-Control header 
-     * will contain "public", allowing proxies to cache the content. Otherwise 
-     * "private" will be sent, allowing only browser caching.
-     *
-     * @param array $options (default empty) additional options for constructor
-     */
-    public static function check($lastModifiedTime = null, $isPublic = false, $options = array())
-    {
-        if (null !== $lastModifiedTime) {
-            $options['lastModifiedTime'] = (int)$lastModifiedTime;
-        }
-        $options['isPublic'] = (bool)$isPublic;
-        $cg = new HTTP_ConditionalGet($options);
-        $cg->sendHeaders();
-        if ($cg->cacheIsValid) {
-            exit();
-        }
-    }
-    
-    
-    /**
-     * Get a GMT formatted date for use in HTTP headers
-     * 
-     * <code>
-     * header('Expires: ' . HTTP_ConditionalGet::gmtdate($time));
-     * </code>  
-     *
-     * @param int $time unix timestamp
-     * 
-     * @return string
-     */
-    public static function gmtDate($time)
-    {
-        return gmdate('D, d M Y H:i:s \G\M\T', $time);
-    }
-    
-    protected $_headers = array();
-    protected $_lmTime = null;
-    protected $_etag = null;
-    protected $_stripEtag = false;
-
-    /**
-     * @param string $hash
-     *
-     * @param string $scope
-     */
-    protected function _setEtag($hash, $scope)
-    {
-        $this->_etag = '"' . substr($scope, 0, 3) . $hash . '"';
-        $this->_headers['ETag'] = $this->_etag;
-    }
-
-    /**
-     * @param int $time
-     */
-    protected function _setLastModified($time)
-    {
-        $this->_lmTime = (int)$time;
-        $this->_headers['Last-Modified'] = self::gmtDate($time);
-    }
-
-    /**
-     * Determine validity of client cache and queue 304 header if valid
-     *
-     * @return bool
-     */
-    protected function _isCacheValid()
-    {
-        if (null === $this->_etag) {
-            // lmTime is copied to ETag, so this condition implies that the
-            // server sent neither ETag nor Last-Modified, so the client can't 
-            // possibly has a valid cache.
-            return false;
-        }
-        $isValid = ($this->resourceMatchedEtag() || $this->resourceNotModified());
-        if ($isValid) {
-            $this->_headers['_responseCode'] = 'HTTP/1.0 304 Not Modified';
-        }
-        return $isValid;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function resourceMatchedEtag()
-    {
-        if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
-            return false;
-        }
-        $clientEtagList = get_magic_quotes_gpc()
-            ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH'])
-            : $_SERVER['HTTP_IF_NONE_MATCH'];
-        $clientEtags = explode(',', $clientEtagList);
-        
-        $compareTo = $this->normalizeEtag($this->_etag);
-        foreach ($clientEtags as $clientEtag) {
-            if ($this->normalizeEtag($clientEtag) === $compareTo) {
-                // respond with the client's matched ETag, even if it's not what
-                // we would've sent by default
-                $this->_headers['ETag'] = trim($clientEtag);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param string $etag
-     *
-     * @return string
-     */
-    protected function normalizeEtag($etag) {
-        $etag = trim($etag);
-        return $this->_stripEtag
-            ? preg_replace('/;\\w\\w"$/', '"', $etag)
-            : $etag;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function resourceNotModified()
-    {
-        if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-            return false;
-        }
-        // strip off IE's extra data (semicolon)
-        list($ifModifiedSince) = explode(';', $_SERVER['HTTP_IF_MODIFIED_SINCE'], 2);
-        if (strtotime($ifModifiedSince) >= $this->_lmTime) {
-            // Apache 2.2's behavior. If there was no ETag match, send the 
-            // non-encoded version of the ETag value.
-            $this->_headers['ETag'] = $this->normalizeEtag($this->_etag);
-            return true;
-        }
-        return false;
-    }
-}
diff --git a/inc/lib/minify/HTTP/Encoder.php b/inc/lib/minify/HTTP/Encoder.php
deleted file mode 100755
index 8f347793..00000000
--- a/inc/lib/minify/HTTP/Encoder.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-/**
- * Class HTTP_Encoder  
- * @package Minify
- * @subpackage HTTP
- */
- 
-/**
- * Encode and send gzipped/deflated content
- *
- * The "Vary: Accept-Encoding" header is sent. If the client allows encoding, 
- * Content-Encoding and Content-Length are added.
- *
- * <code>
- * // Send a CSS file, compressed if possible
- * $he = new HTTP_Encoder(array(
- *     'content' => file_get_contents($cssFile)
- *     ,'type' => 'text/css'
- * ));
- * $he->encode();
- * $he->sendAll();
- * </code>
- *
- * <code>
- * // Shortcut to encoding output
- * header('Content-Type: text/css'); // needed if not HTML
- * HTTP_Encoder::output($css);
- * </code>
- * 
- * <code>
- * // Just sniff for the accepted encoding
- * $encoding = HTTP_Encoder::getAcceptedEncoding();
- * </code>
- *
- * For more control over headers, use getHeaders() and getData() and send your
- * own output.
- * 
- * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, 
- * and gzcompress functions for gzip, deflate, and compress-encoding
- * respectively.
- * 
- * @package Minify
- * @subpackage HTTP
- * @author Stephen Clay <steve@mrclay.org>
- */
-class HTTP_Encoder {
-
-    /**
-     * Should the encoder allow HTTP encoding to IE6? 
-     * 
-     * If you have many IE6 users and the bandwidth savings is worth troubling 
-     * some of them, set this to true.
-     * 
-     * By default, encoding is only offered to IE7+. When this is true,
-     * getAcceptedEncoding() will return an encoding for IE6 if its user agent
-     * string contains "SV1". This has been documented in many places as "safe",
-     * but there seem to be remaining, intermittent encoding bugs in patched 
-     * IE6 on the wild web.
-     * 
-     * @var bool
-     */
-    public static $encodeToIe6 = true;
-    
-    
-    /**
-     * Default compression level for zlib operations
-     * 
-     * This level is used if encode() is not given a $compressionLevel
-     * 
-     * @var int
-     */
-    public static $compressionLevel = 6;
-    
-
-    /**
-     * Get an HTTP Encoder object
-     * 
-     * @param array $spec options
-     * 
-     * 'content': (string required) content to be encoded
-     * 
-     * 'type': (string) if set, the Content-Type header will have this value.
-     * 
-     * 'method: (string) only set this if you are forcing a particular encoding
-     * method. If not set, the best method will be chosen by getAcceptedEncoding()
-     * The available methods are 'gzip', 'deflate', 'compress', and '' (no
-     * encoding)
-     */
-    public function __construct($spec) 
-    {
-        $this->_useMbStrlen = (function_exists('mb_strlen')
-                               && (ini_get('mbstring.func_overload') !== '')
-                               && ((int)ini_get('mbstring.func_overload') & 2));
-        $this->_content = $spec['content'];
-        $this->_headers['Content-Length'] = $this->_useMbStrlen
-            ? (string)mb_strlen($this->_content, '8bit')
-            : (string)strlen($this->_content);
-        if (isset($spec['type'])) {
-            $this->_headers['Content-Type'] = $spec['type'];
-        }
-        if (isset($spec['method'])
-            && in_array($spec['method'], array('gzip', 'deflate', 'compress', '')))
-        {
-            $this->_encodeMethod = array($spec['method'], $spec['method']);
-        } else {
-            $this->_encodeMethod = self::getAcceptedEncoding();
-        }
-    }
-
-    /**
-     * Get content in current form
-     * 
-     * Call after encode() for encoded content.
-     * 
-     * @return string
-     */
-    public function getContent() 
-    {
-        return $this->_content;
-    }
-    
-    /**
-     * Get array of output headers to be sent
-     * 
-     * E.g.
-     * <code>
-     * array(
-     *     'Content-Length' => '615'
-     *     ,'Content-Encoding' => 'x-gzip'
-     *     ,'Vary' => 'Accept-Encoding'
-     * )
-     * </code>
-     *
-     * @return array 
-     */
-    public function getHeaders()
-    {
-        return $this->_headers;
-    }
-
-    /**
-     * Send output headers
-     * 
-     * You must call this before headers are sent and it probably cannot be
-     * used in conjunction with zlib output buffering / mod_gzip. Errors are
-     * not handled purposefully.
-     * 
-     * @see getHeaders()
-     */
-    public function sendHeaders()
-    {
-        foreach ($this->_headers as $name => $val) {
-            header($name . ': ' . $val);
-        }
-    }
-    
-    /**
-     * Send output headers and content
-     * 
-     * A shortcut for sendHeaders() and echo getContent()
-     *
-     * You must call this before headers are sent and it probably cannot be
-     * used in conjunction with zlib output buffering / mod_gzip. Errors are
-     * not handled purposefully.
-     */
-    public function sendAll()
-    {
-        $this->sendHeaders();
-        echo $this->_content;
-    }
-
-    /**
-     * Determine the client's best encoding method from the HTTP Accept-Encoding 
-     * header.
-     * 
-     * If no Accept-Encoding header is set, or the browser is IE before v6 SP2,
-     * this will return ('', ''), the "identity" encoding.
-     * 
-     * A syntax-aware scan is done of the Accept-Encoding, so the method must
-     * be non 0. The methods are favored in order of gzip, deflate, then 
-     * compress. Deflate is always smallest and generally faster, but is 
-     * rarely sent by servers, so client support could be buggier.
-     * 
-     * @param bool $allowCompress allow the older compress encoding
-     * 
-     * @param bool $allowDeflate allow the more recent deflate encoding
-     * 
-     * @return array two values, 1st is the actual encoding method, 2nd is the
-     * alias of that method to use in the Content-Encoding header (some browsers
-     * call gzip "x-gzip" etc.)
-     */
-    public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true)
-    {
-        // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
-        
-        if (! isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-            || self::isBuggyIe())
-        {
-            return array('', '');
-        }
-        $ae = $_SERVER['HTTP_ACCEPT_ENCODING'];
-        // gzip checks (quick)
-        if (0 === strpos($ae, 'gzip,')             // most browsers
-            || 0 === strpos($ae, 'deflate, gzip,') // opera
-        ) {
-            return array('gzip', 'gzip');
-        }
-        // gzip checks (slow)
-        if (preg_match(
-                '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
-                ,$ae
-                ,$m)) {
-            return array('gzip', $m[1]);
-        }
-        if ($allowDeflate) {
-            // deflate checks    
-            $aeRev = strrev($ae);
-            if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit
-                || 0 === strpos($aeRev, 'etalfed,') // gecko
-                || 0 === strpos($ae, 'deflate,') // opera
-                // slow parsing
-                || preg_match(
-                    '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) {
-                return array('deflate', 'deflate');
-            }
-        }
-        if ($allowCompress && preg_match(
-                '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@'
-                ,$ae
-                ,$m)) {
-            return array('compress', $m[1]);
-        }
-        return array('', '');
-    }
-
-    /**
-     * Encode (compress) the content
-     * 
-     * If the encode method is '' (none) or compression level is 0, or the 'zlib'
-     * extension isn't loaded, we return false.
-     * 
-     * Then the appropriate gz_* function is called to compress the content. If
-     * this fails, false is returned.
-     * 
-     * The header "Vary: Accept-Encoding" is added. If encoding is successful, 
-     * the Content-Length header is updated, and Content-Encoding is also added.
-     * 
-     * @param int $compressionLevel given to zlib functions. If not given, the
-     * class default will be used.
-     * 
-     * @return bool success true if the content was actually compressed
-     */
-    public function encode($compressionLevel = null)
-    {
-        if (! self::isBuggyIe()) {
-            $this->_headers['Vary'] = 'Accept-Encoding';
-        }
-        if (null === $compressionLevel) {
-            $compressionLevel = self::$compressionLevel;
-        }
-        if ('' === $this->_encodeMethod[0]
-            || ($compressionLevel == 0)
-            || !extension_loaded('zlib'))
-        {
-            return false;
-        }
-        if ($this->_encodeMethod[0] === 'deflate') {
-            $encoded = gzdeflate($this->_content, $compressionLevel);
-        } elseif ($this->_encodeMethod[0] === 'gzip') {
-            $encoded = gzencode($this->_content, $compressionLevel);
-        } else {
-            $encoded = gzcompress($this->_content, $compressionLevel);
-        }
-        if (false === $encoded) {
-            return false;
-        }
-        $this->_headers['Content-Length'] = $this->_useMbStrlen
-            ? (string)mb_strlen($encoded, '8bit')
-            : (string)strlen($encoded);
-        $this->_headers['Content-Encoding'] = $this->_encodeMethod[1];
-        $this->_content = $encoded;
-        return true;
-    }
-    
-    /**
-     * Encode and send appropriate headers and content
-     *
-     * This is a convenience method for common use of the class
-     * 
-     * @param string $content
-     * 
-     * @param int $compressionLevel given to zlib functions. If not given, the
-     * class default will be used.
-     * 
-     * @return bool success true if the content was actually compressed
-     */
-    public static function output($content, $compressionLevel = null)
-    {
-        if (null === $compressionLevel) {
-            $compressionLevel = self::$compressionLevel;
-        }
-        $he = new HTTP_Encoder(array('content' => $content));
-        $ret = $he->encode($compressionLevel);
-        $he->sendAll();
-        return $ret;
-    }
-
-    /**
-     * Is the browser an IE version earlier than 6 SP2?
-     *
-     * @return bool
-     */
-    public static function isBuggyIe()
-    {
-        if (empty($_SERVER['HTTP_USER_AGENT'])) {
-            return false;
-        }
-        $ua = $_SERVER['HTTP_USER_AGENT'];
-        // quick escape for non-IEs
-        if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ')
-            || false !== strpos($ua, 'Opera')) {
-            return false;
-        }
-        // no regex = faaast
-        $version = (float)substr($ua, 30);
-        return self::$encodeToIe6
-            ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1')))
-            : ($version < 7);
-    }
-    
-    protected $_content = '';
-    protected $_headers = array();
-    protected $_encodeMethod = array('', '');
-    protected $_useMbStrlen = false;
-}
diff --git a/inc/lib/minify/JSMin.php b/inc/lib/minify/JSMin.php
deleted file mode 100755
index 9840d8b3..00000000
--- a/inc/lib/minify/JSMin.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-/**
- * JSMin.php - modified PHP implementation of Douglas Crockford's JSMin.
- *
- * <code>
- * $minifiedJs = JSMin::minify($js);
- * </code>
- *
- * This is a modified port of jsmin.c. Improvements:
- *
- * Does not choke on some regexp literals containing quote characters. E.g. /'/
- *
- * Spaces are preserved after some add/sub operators, so they are not mistakenly
- * converted to post-inc/dec. E.g. a + ++b -> a+ ++b
- *
- * Preserves multi-line comments that begin with /*!
- *
- * PHP 5 or higher is required.
- *
- * Permission is hereby granted to use this version of the library under the
- * same terms as jsmin.c, which has the following license:
- *
- * --
- * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * The Software shall be used for Good, not Evil.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- * --
- *
- * @package JSMin
- * @author Ryan Grove <ryan@wonko.com> (PHP port)
- * @author Steve Clay <steve@mrclay.org> (modifications + cleanup)
- * @author Andrea Giammarchi <http://www.3site.eu> (spaceBeforeRegExp)
- * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
- * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
- * @license http://opensource.org/licenses/mit-license.php MIT License
- * @link http://code.google.com/p/jsmin-php/
- */
-
-class JSMin {
-    const ORD_LF            = 10;
-    const ORD_SPACE         = 32;
-    const ACTION_KEEP_A     = 1;
-    const ACTION_DELETE_A   = 2;
-    const ACTION_DELETE_A_B = 3;
-
-    protected $a           = "\n";
-    protected $b           = '';
-    protected $input       = '';
-    protected $inputIndex  = 0;
-    protected $inputLength = 0;
-    protected $lookAhead   = null;
-    protected $output      = '';
-    protected $lastByteOut  = '';
-    protected $keptComment = '';
-
-    /**
-     * Minify Javascript.
-     *
-     * @param string $js Javascript to be minified
-     *
-     * @return string
-     */
-    public static function minify($js)
-    {
-        $jsmin = new JSMin($js);
-        return $jsmin->min();
-    }
-
-    /**
-     * @param string $input
-     */
-    public function __construct($input)
-    {
-        $this->input = $input;
-    }
-
-    /**
-     * Perform minification, return result
-     *
-     * @return string
-     */
-    public function min()
-    {
-        if ($this->output !== '') { // min already run
-            return $this->output;
-        }
-
-        $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
-            $mbIntEnc = mb_internal_encoding();
-            mb_internal_encoding('8bit');
-        }
-        $this->input = str_replace("\r\n", "\n", $this->input);
-        $this->inputLength = strlen($this->input);
-
-        $this->action(self::ACTION_DELETE_A_B);
-
-        while ($this->a !== null) {
-            // determine next command
-            $command = self::ACTION_KEEP_A; // default
-            if ($this->a === ' ') {
-                if (($this->lastByteOut === '+' || $this->lastByteOut === '-')
-                        && ($this->b === $this->lastByteOut)) {
-                    // Don't delete this space. If we do, the addition/subtraction
-                    // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
-                    $command = self::ACTION_DELETE_A;
-                }
-            } elseif ($this->a === "\n") {
-                if ($this->b === ' ') {
-                    $command = self::ACTION_DELETE_A_B;
-
-                    // in case of mbstring.func_overload & 2, must check for null b,
-                    // otherwise mb_strpos will give WARNING
-                } elseif ($this->b === null
-                          || (false === strpos('{[(+-!~', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
-                    $command = self::ACTION_DELETE_A;
-                }
-            } elseif (! $this->isAlphaNum($this->a)) {
-                if ($this->b === ' '
-                    || ($this->b === "\n"
-                        && (false === strpos('}])+-"\'', $this->a)))) {
-                    $command = self::ACTION_DELETE_A_B;
-                }
-            }
-            $this->action($command);
-        }
-        $this->output = trim($this->output);
-
-        if ($mbIntEnc !== null) {
-            mb_internal_encoding($mbIntEnc);
-        }
-        return $this->output;
-    }
-
-    /**
-     * ACTION_KEEP_A = Output A. Copy B to A. Get the next B.
-     * ACTION_DELETE_A = Copy B to A. Get the next B.
-     * ACTION_DELETE_A_B = Get the next B.
-     *
-     * @param int $command
-     * @throws JSMin_UnterminatedRegExpException|JSMin_UnterminatedStringException
-     */
-    protected function action($command)
-    {
-        // make sure we don't compress "a + ++b" to "a+++b", etc.
-        if ($command === self::ACTION_DELETE_A_B
-            && $this->b === ' '
-            && ($this->a === '+' || $this->a === '-')) {
-            // Note: we're at an addition/substraction operator; the inputIndex
-            // will certainly be a valid index
-            if ($this->input[$this->inputIndex] === $this->a) {
-                // This is "+ +" or "- -". Don't delete the space.
-                $command = self::ACTION_KEEP_A;
-            }
-        }
-
-        switch ($command) {
-            case self::ACTION_KEEP_A: // 1
-                $this->output .= $this->a;
-
-                if ($this->keptComment) {
-                    $this->output = rtrim($this->output, "\n");
-                    $this->output .= $this->keptComment;
-                    $this->keptComment = '';
-                }
-
-                $this->lastByteOut = $this->a;
-
-                // fallthrough intentional
-            case self::ACTION_DELETE_A: // 2
-                $this->a = $this->b;
-                if ($this->a === "'" || $this->a === '"') { // string literal
-                    $str = $this->a; // in case needed for exception
-                    for(;;) {
-                        $this->output .= $this->a;
-                        $this->lastByteOut = $this->a;
-
-                        $this->a = $this->get();
-                        if ($this->a === $this->b) { // end quote
-                            break;
-                        }
-                        if ($this->isEOF($this->a)) {
-                            $byte = $this->inputIndex - 1;
-                            throw new JSMin_UnterminatedStringException(
-                                "JSMin: Unterminated String at byte {$byte}: {$str}");
-                        }
-                        $str .= $this->a;
-                        if ($this->a === '\\') {
-                            $this->output .= $this->a;
-                            $this->lastByteOut = $this->a;
-
-                            $this->a       = $this->get();
-                            $str .= $this->a;
-                        }
-                    }
-                }
-
-                // fallthrough intentional
-            case self::ACTION_DELETE_A_B: // 3
-                $this->b = $this->next();
-                if ($this->b === '/' && $this->isRegexpLiteral()) {
-                    $this->output .= $this->a . $this->b;
-                    $pattern = '/'; // keep entire pattern in case we need to report it in the exception
-                    for(;;) {
-                        $this->a = $this->get();
-                        $pattern .= $this->a;
-                        if ($this->a === '[') {
-                            for(;;) {
-                                $this->output .= $this->a;
-                                $this->a = $this->get();
-                                $pattern .= $this->a;
-                                if ($this->a === ']') {
-                                    break;
-                                }
-                                if ($this->a === '\\') {
-                                    $this->output .= $this->a;
-                                    $this->a = $this->get();
-                                    $pattern .= $this->a;
-                                }
-                                if ($this->isEOF($this->a)) {
-                                    throw new JSMin_UnterminatedRegExpException(
-                                        "JSMin: Unterminated set in RegExp at byte "
-                                            . $this->inputIndex .": {$pattern}");
-                                }
-                            }
-                        }
-
-                        if ($this->a === '/') { // end pattern
-                            break; // while (true)
-                        } elseif ($this->a === '\\') {
-                            $this->output .= $this->a;
-                            $this->a = $this->get();
-                            $pattern .= $this->a;
-                        } elseif ($this->isEOF($this->a)) {
-                            $byte = $this->inputIndex - 1;
-                            throw new JSMin_UnterminatedRegExpException(
-                                "JSMin: Unterminated RegExp at byte {$byte}: {$pattern}");
-                        }
-                        $this->output .= $this->a;
-                        $this->lastByteOut = $this->a;
-                    }
-                    $this->b = $this->next();
-                }
-            // end case ACTION_DELETE_A_B
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isRegexpLiteral()
-    {
-        if (false !== strpos("(,=:[!&|?+-~*{;", $this->a)) {
-            // we obviously aren't dividing
-            return true;
-        }
-
-		// we have to check for a preceding keyword, and we don't need to pattern
-		// match over the whole output.
-		$recentOutput = substr($this->output, -10);
-
-		// check if return/typeof directly precede a pattern without a space
-		foreach (array('return', 'typeof') as $keyword) {
-            if ($this->a !== substr($keyword, -1)) {
-                // certainly wasn't keyword
-                continue;
-            }
-            if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
-                if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
-                    return true;
-                }
-            }
-        }
-
-		// check all keywords
-		if ($this->a === ' ' || $this->a === "\n") {
-			if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
-				if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
-					return true;
-				}
-			}
-        }
-
-        return false;
-    }
-
-    /**
-     * Return the next character from stdin. Watch out for lookahead. If the character is a control character,
-     * translate it to a space or linefeed.
-     *
-     * @return string
-     */
-    protected function get()
-    {
-        $c = $this->lookAhead;
-        $this->lookAhead = null;
-        if ($c === null) {
-            // getc(stdin)
-            if ($this->inputIndex < $this->inputLength) {
-                $c = $this->input[$this->inputIndex];
-                $this->inputIndex += 1;
-            } else {
-                $c = null;
-            }
-        }
-        if (ord($c) >= self::ORD_SPACE || $c === "\n" || $c === null) {
-            return $c;
-        }
-        if ($c === "\r") {
-            return "\n";
-        }
-        return ' ';
-    }
-
-    /**
-     * Does $a indicate end of input?
-     *
-     * @param string $a
-     * @return bool
-     */
-    protected function isEOF($a)
-    {
-        return ord($a) <= self::ORD_LF;
-    }
-
-    /**
-     * Get next char (without getting it). If is ctrl character, translate to a space or newline.
-     *
-     * @return string
-     */
-    protected function peek()
-    {
-        $this->lookAhead = $this->get();
-        return $this->lookAhead;
-    }
-
-    /**
-     * Return true if the character is a letter, digit, underscore, dollar sign, or non-ASCII character.
-     *
-     * @param string $c
-     *
-     * @return bool
-     */
-    protected function isAlphaNum($c)
-    {
-        return (preg_match('/^[a-z0-9A-Z_\\$\\\\]$/', $c) || ord($c) > 126);
-    }
-
-    /**
-     * Consume a single line comment from input (possibly retaining it)
-     */
-    protected function consumeSingleLineComment()
-    {
-        $comment = '';
-        while (true) {
-            $get = $this->get();
-            $comment .= $get;
-            if (ord($get) <= self::ORD_LF) { // end of line reached
-                // if IE conditional comment
-                if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
-                    $this->keptComment .= "/{$comment}";
-                }
-                return;
-            }
-        }
-    }
-
-    /**
-     * Consume a multiple line comment from input (possibly retaining it)
-     *
-     * @throws JSMin_UnterminatedCommentException
-     */
-    protected function consumeMultipleLineComment()
-    {
-        $this->get();
-        $comment = '';
-        for(;;) {
-            $get = $this->get();
-            if ($get === '*') {
-                if ($this->peek() === '/') { // end of comment reached
-                    $this->get();
-                    if (0 === strpos($comment, '!')) {
-                        // preserved by YUI Compressor
-                        if (!$this->keptComment) {
-                            // don't prepend a newline if two comments right after one another
-                            $this->keptComment = "\n";
-                        }
-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
-                    } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
-                        // IE conditional
-                        $this->keptComment .= "/*{$comment}*/";
-                    }
-                    return;
-                }
-            } elseif ($get === null) {
-                throw new JSMin_UnterminatedCommentException(
-                    "JSMin: Unterminated comment at byte {$this->inputIndex}: /*{$comment}");
-            }
-            $comment .= $get;
-        }
-    }
-
-    /**
-     * Get the next character, skipping over comments. Some comments may be preserved.
-     *
-     * @return string
-     */
-    protected function next()
-    {
-        $get = $this->get();
-        if ($get === '/') {
-            switch ($this->peek()) {
-                case '/':
-                    $this->consumeSingleLineComment();
-                    $get = "\n";
-                    break;
-                case '*':
-                    $this->consumeMultipleLineComment();
-                    $get = ' ';
-                    break;
-            }
-        }
-        return $get;
-    }
-}
-
-class JSMin_UnterminatedStringException extends Exception {}
-class JSMin_UnterminatedCommentException extends Exception {}
-class JSMin_UnterminatedRegExpException extends Exception {}
diff --git a/inc/lib/minify/JSMinPlus.php b/inc/lib/minify/JSMinPlus.php
deleted file mode 100755
index 5a3c5bdf..00000000
--- a/inc/lib/minify/JSMinPlus.php
+++ /dev/null
@@ -1,2086 +0,0 @@
-<?php
-
-/**
- * JSMinPlus version 1.4
- *
- * Minifies a javascript file using a javascript parser
- *
- * This implements a PHP port of Brendan Eich's Narcissus open source javascript engine (in javascript)
- * References: http://en.wikipedia.org/wiki/Narcissus_(JavaScript_engine)
- * Narcissus sourcecode: http://mxr.mozilla.org/mozilla/source/js/narcissus/
- * JSMinPlus weblog: http://crisp.tweakblogs.net/blog/cat/716
- *
- * Tino Zijdel <crisp@tweakers.net>
- *
- * Usage: $minified = JSMinPlus::minify($script [, $filename])
- *
- * Versionlog (see also changelog.txt):
- * 23-07-2011 - remove dynamic creation of OP_* and KEYWORD_* defines and declare them on top
- *              reduce memory footprint by minifying by block-scope
- *              some small byte-saving and performance improvements
- * 12-05-2009 - fixed hook:colon precedence, fixed empty body in loop and if-constructs
- * 18-04-2009 - fixed crashbug in PHP 5.2.9 and several other bugfixes
- * 12-04-2009 - some small bugfixes and performance improvements
- * 09-04-2009 - initial open sourced version 1.0
- *
- * Latest version of this script: http://files.tweakers.net/jsminplus/jsminplus.zip
- *
- */
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Tino Zijdel <crisp@tweakers.net>
- * PHP port, modifications and minifier routine are (C) 2009-2011
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define('TOKEN_END', 1);
-define('TOKEN_NUMBER', 2);
-define('TOKEN_IDENTIFIER', 3);
-define('TOKEN_STRING', 4);
-define('TOKEN_REGEXP', 5);
-define('TOKEN_NEWLINE', 6);
-define('TOKEN_CONDCOMMENT_START', 7);
-define('TOKEN_CONDCOMMENT_END', 8);
-
-define('JS_SCRIPT', 100);
-define('JS_BLOCK', 101);
-define('JS_LABEL', 102);
-define('JS_FOR_IN', 103);
-define('JS_CALL', 104);
-define('JS_NEW_WITH_ARGS', 105);
-define('JS_INDEX', 106);
-define('JS_ARRAY_INIT', 107);
-define('JS_OBJECT_INIT', 108);
-define('JS_PROPERTY_INIT', 109);
-define('JS_GETTER', 110);
-define('JS_SETTER', 111);
-define('JS_GROUP', 112);
-define('JS_LIST', 113);
-
-define('JS_MINIFIED', 999);
-
-define('DECLARED_FORM', 0);
-define('EXPRESSED_FORM', 1);
-define('STATEMENT_FORM', 2);
-
-/* Operators */
-define('OP_SEMICOLON', ';');
-define('OP_COMMA', ',');
-define('OP_HOOK', '?');
-define('OP_COLON', ':');
-define('OP_OR', '||');
-define('OP_AND', '&&');
-define('OP_BITWISE_OR', '|');
-define('OP_BITWISE_XOR', '^');
-define('OP_BITWISE_AND', '&');
-define('OP_STRICT_EQ', '===');
-define('OP_EQ', '==');
-define('OP_ASSIGN', '=');
-define('OP_STRICT_NE', '!==');
-define('OP_NE', '!=');
-define('OP_LSH', '<<');
-define('OP_LE', '<=');
-define('OP_LT', '<');
-define('OP_URSH', '>>>');
-define('OP_RSH', '>>');
-define('OP_GE', '>=');
-define('OP_GT', '>');
-define('OP_INCREMENT', '++');
-define('OP_DECREMENT', '--');
-define('OP_PLUS', '+');
-define('OP_MINUS', '-');
-define('OP_MUL', '*');
-define('OP_DIV', '/');
-define('OP_MOD', '%');
-define('OP_NOT', '!');
-define('OP_BITWISE_NOT', '~');
-define('OP_DOT', '.');
-define('OP_LEFT_BRACKET', '[');
-define('OP_RIGHT_BRACKET', ']');
-define('OP_LEFT_CURLY', '{');
-define('OP_RIGHT_CURLY', '}');
-define('OP_LEFT_PAREN', '(');
-define('OP_RIGHT_PAREN', ')');
-define('OP_CONDCOMMENT_END', '@*/');
-
-define('OP_UNARY_PLUS', 'U+');
-define('OP_UNARY_MINUS', 'U-');
-
-/* Keywords */
-define('KEYWORD_BREAK', 'break');
-define('KEYWORD_CASE', 'case');
-define('KEYWORD_CATCH', 'catch');
-define('KEYWORD_CONST', 'const');
-define('KEYWORD_CONTINUE', 'continue');
-define('KEYWORD_DEBUGGER', 'debugger');
-define('KEYWORD_DEFAULT', 'default');
-define('KEYWORD_DELETE', 'delete');
-define('KEYWORD_DO', 'do');
-define('KEYWORD_ELSE', 'else');
-define('KEYWORD_ENUM', 'enum');
-define('KEYWORD_FALSE', 'false');
-define('KEYWORD_FINALLY', 'finally');
-define('KEYWORD_FOR', 'for');
-define('KEYWORD_FUNCTION', 'function');
-define('KEYWORD_IF', 'if');
-define('KEYWORD_IN', 'in');
-define('KEYWORD_INSTANCEOF', 'instanceof');
-define('KEYWORD_NEW', 'new');
-define('KEYWORD_NULL', 'null');
-define('KEYWORD_RETURN', 'return');
-define('KEYWORD_SWITCH', 'switch');
-define('KEYWORD_THIS', 'this');
-define('KEYWORD_THROW', 'throw');
-define('KEYWORD_TRUE', 'true');
-define('KEYWORD_TRY', 'try');
-define('KEYWORD_TYPEOF', 'typeof');
-define('KEYWORD_VAR', 'var');
-define('KEYWORD_VOID', 'void');
-define('KEYWORD_WHILE', 'while');
-define('KEYWORD_WITH', 'with');
-
-
-class JSMinPlus
-{
-	private $parser;
-	private $reserved = array(
-		'break', 'case', 'catch', 'continue', 'default', 'delete', 'do',
-		'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
-		'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
-		'void', 'while', 'with',
-		// Words reserved for future use
-		'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
-		'double', 'enum', 'export', 'extends', 'final', 'float', 'goto',
-		'implements', 'import', 'int', 'interface', 'long', 'native',
-		'package', 'private', 'protected', 'public', 'short', 'static',
-		'super', 'synchronized', 'throws', 'transient', 'volatile',
-		// These are not reserved, but should be taken into account
-		// in isValidIdentifier (See jslint source code)
-		'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined'
-	);
-
-	private function __construct()
-	{
-		$this->parser = new JSParser($this);
-	}
-
-	public static function minify($js, $filename='')
-	{
-		static $instance;
-
-		// this is a singleton
-		if(!$instance)
-			$instance = new JSMinPlus();
-
-		return $instance->min($js, $filename);
-	}
-
-	private function min($js, $filename)
-	{
-		try
-		{
-			$n = $this->parser->parse($js, $filename, 1);
-			return $this->parseTree($n);
-		}
-		catch(Exception $e)
-		{
-			echo $e->getMessage() . "\n";
-		}
-
-		return false;
-	}
-
-	public function parseTree($n, $noBlockGrouping = false)
-	{
-		$s = '';
-
-		switch ($n->type)
-		{
-			case JS_MINIFIED:
-				$s = $n->value;
-			break;
-
-			case JS_SCRIPT:
-				// we do nothing yet with funDecls or varDecls
-				$noBlockGrouping = true;
-			// FALL THROUGH
-
-			case JS_BLOCK:
-				$childs = $n->treeNodes;
-				$lastType = 0;
-				for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$type = $childs[$i]->type;
-					$t = $this->parseTree($childs[$i]);
-					if (strlen($t))
-					{
-						if ($c)
-						{
-							$s = rtrim($s, ';');
-
-							if ($type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM)
-							{
-								// put declared functions on a new line
-								$s .= "\n";
-							}
-							elseif ($type == KEYWORD_VAR && $type == $lastType)
-							{
-								// mutiple var-statements can go into one
-								$t = ',' . substr($t, 4);
-							}
-							else
-							{
-								// add terminator
-								$s .= ';';
-							}
-						}
-
-						$s .= $t;
-
-						$c++;
-						$lastType = $type;
-					}
-				}
-
-				if ($c > 1 && !$noBlockGrouping)
-				{
-					$s = '{' . $s . '}';
-				}
-			break;
-
-			case KEYWORD_FUNCTION:
-				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
-				$params = $n->params;
-				for ($i = 0, $j = count($params); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $params[$i];
-				$s .= '){' . $this->parseTree($n->body, true) . '}';
-			break;
-
-			case KEYWORD_IF:
-				$s = 'if(' . $this->parseTree($n->condition) . ')';
-				$thenPart = $this->parseTree($n->thenPart);
-				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
-
-				// empty if-statement
-				if ($thenPart == '')
-					$thenPart = ';';
-
-				if ($elsePart)
-				{
-					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
-					if ($thenPart != ';' && $thenPart[0] != '{')
-						$thenPart = '{' . $thenPart . '}';
-
-					$s .= $thenPart . 'else';
-
-					// we could check for more, but that hardly ever applies so go for performance
-					if ($elsePart[0] != '{')
-						$s .= ' ';
-
-					$s .= $elsePart;
-				}
-				else
-				{
-					$s .= $thenPart;
-				}
-			break;
-
-			case KEYWORD_SWITCH:
-				$s = 'switch(' . $this->parseTree($n->discriminant) . '){';
-				$cases = $n->cases;
-				for ($i = 0, $j = count($cases); $i < $j; $i++)
-				{
-					$case = $cases[$i];
-					if ($case->type == KEYWORD_CASE)
-						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
-					else
-						$s .= 'default:';
-
-					$statement = $this->parseTree($case->statements, true);
-					if ($statement)
-					{
-						$s .= $statement;
-						// no terminator for last statement
-						if ($i + 1 < $j)
-							$s .= ';';
-					}
-				}
-				$s .= '}';
-			break;
-
-			case KEYWORD_FOR:
-				$s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
-					. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
-					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case KEYWORD_WHILE:
-				$s = 'while(' . $this->parseTree($n->condition) . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case JS_FOR_IN:
-				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
-
-				$body  = $this->parseTree($n->body);
-				if ($body == '')
-					$body = ';';
-
-				$s .= $body;
-			break;
-
-			case KEYWORD_DO:
-				$s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
-			break;
-
-			case KEYWORD_BREAK:
-			case KEYWORD_CONTINUE:
-				$s = $n->value . ($n->label ? ' ' . $n->label : '');
-			break;
-
-			case KEYWORD_TRY:
-				$s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
-				$catchClauses = $n->catchClauses;
-				for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
-				{
-					$t = $catchClauses[$i];
-					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
-				}
-				if ($n->finallyBlock)
-					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
-			break;
-
-			case KEYWORD_THROW:
-			case KEYWORD_RETURN:
-				$s = $n->type;
-				if ($n->value)
-				{
-					$t = $this->parseTree($n->value);
-					if (strlen($t))
-					{
-						if ($this->isWordChar($t[0]) || $t[0] == '\\')
-							$s .= ' ';
-
-						$s .= $t;
-					}
-				}
-			break;
-
-			case KEYWORD_WITH:
-				$s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
-			break;
-
-			case KEYWORD_VAR:
-			case KEYWORD_CONST:
-				$s = $n->value . ' ';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$t = $childs[$i];
-					$s .= ($i ? ',' : '') . $t->name;
-					$u = $t->initializer;
-					if ($u)
-						$s .= '=' . $this->parseTree($u);
-				}
-			break;
-
-			case KEYWORD_IN:
-			case KEYWORD_INSTANCEOF:
-				$left = $this->parseTree($n->treeNodes[0]);
-				$right = $this->parseTree($n->treeNodes[1]);
-
-				$s = $left;
-
-				if ($this->isWordChar(substr($left, -1)))
-					$s .= ' ';
-
-				$s .= $n->type;
-
-				if ($this->isWordChar($right[0]) || $right[0] == '\\')
-					$s .= ' ';
-
-				$s .= $right;
-			break;
-
-			case KEYWORD_DELETE:
-			case KEYWORD_TYPEOF:
-				$right = $this->parseTree($n->treeNodes[0]);
-
-				$s = $n->type;
-
-				if ($this->isWordChar($right[0]) || $right[0] == '\\')
-					$s .= ' ';
-
-				$s .= $right;
-			break;
-
-			case KEYWORD_VOID:
-				$s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
-			break;
-
-			case KEYWORD_DEBUGGER:
-				throw new Exception('NOT IMPLEMENTED: DEBUGGER');
-			break;
-
-			case TOKEN_CONDCOMMENT_START:
-			case TOKEN_CONDCOMMENT_END:
-				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= $this->parseTree($childs[$i]);
-			break;
-
-			case OP_SEMICOLON:
-				if ($expression = $n->expression)
-					$s = $this->parseTree($expression);
-			break;
-
-			case JS_LABEL:
-				$s = $n->label . ':' . $this->parseTree($n->statement);
-			break;
-
-			case OP_COMMA:
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-			break;
-
-			case OP_ASSIGN:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case OP_HOOK:
-				$s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
-			break;
-
-			case OP_OR: case OP_AND:
-			case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND:
-			case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
-			case OP_LT: case OP_LE: case OP_GE: case OP_GT:
-			case OP_LSH: case OP_RSH: case OP_URSH:
-			case OP_MUL: case OP_DIV: case OP_MOD:
-				$s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case OP_PLUS:
-			case OP_MINUS:
-				$left = $this->parseTree($n->treeNodes[0]);
-				$right = $this->parseTree($n->treeNodes[1]);
-
-				switch ($n->treeNodes[1]->type)
-				{
-					case OP_PLUS:
-					case OP_MINUS:
-					case OP_INCREMENT:
-					case OP_DECREMENT:
-					case OP_UNARY_PLUS:
-					case OP_UNARY_MINUS:
-						$s = $left . $n->type . ' ' . $right;
-					break;
-
-					case TOKEN_STRING:
-						//combine concatted strings with same quotestyle
-						if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
-						{
-							$s = substr($left, 0, -1) . substr($right, 1);
-							break;
-						}
-					// FALL THROUGH
-
-					default:
-						$s = $left . $n->type . $right;
-				}
-			break;
-
-			case OP_NOT:
-			case OP_BITWISE_NOT:
-			case OP_UNARY_PLUS:
-			case OP_UNARY_MINUS:
-				$s = $n->value . $this->parseTree($n->treeNodes[0]);
-			break;
-
-			case OP_INCREMENT:
-			case OP_DECREMENT:
-				if ($n->postfix)
-					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
-				else
-					$s = $n->value . $this->parseTree($n->treeNodes[0]);
-			break;
-
-			case OP_DOT:
-				$s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
-			break;
-
-			case JS_INDEX:
-				$s = $this->parseTree($n->treeNodes[0]);
-				// See if we can replace named index with a dot saving 3 bytes
-				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
-					$n->treeNodes[1]->type == TOKEN_STRING &&
-					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
-				)
-					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
-				else
-					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
-			break;
-
-			case JS_LIST:
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-			break;
-
-			case JS_CALL:
-				$s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
-			break;
-
-			case KEYWORD_NEW:
-			case JS_NEW_WITH_ARGS:
-				$s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
-			break;
-
-			case JS_ARRAY_INIT:
-				$s = '[';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
-				}
-				$s .= ']';
-			break;
-
-			case JS_OBJECT_INIT:
-				$s = '{';
-				$childs = $n->treeNodes;
-				for ($i = 0, $j = count($childs); $i < $j; $i++)
-				{
-					$t = $childs[$i];
-					if ($i)
-						$s .= ',';
-					if ($t->type == JS_PROPERTY_INIT)
-					{
-						// Ditch the quotes when the index is a valid identifier
-						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
-							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
-						)
-							$s .= substr($t->treeNodes[0]->value, 1, -1);
-						else
-							$s .= $t->treeNodes[0]->value;
-
-						$s .= ':' . $this->parseTree($t->treeNodes[1]);
-					}
-					else
-					{
-						$s .= $t->type == JS_GETTER ? 'get' : 'set';
-						$s .= ' ' . $t->name . '(';
-						$params = $t->params;
-						for ($i = 0, $j = count($params); $i < $j; $i++)
-							$s .= ($i ? ',' : '') . $params[$i];
-						$s .= '){' . $this->parseTree($t->body, true) . '}';
-					}
-				}
-				$s .= '}';
-			break;
-
-			case TOKEN_NUMBER:
-				$s = $n->value;
-				if (preg_match('/^([1-9]+)(0{3,})$/', $s, $m))
-					$s = $m[1] . 'e' . strlen($m[2]);
-			break;
-
-			case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
-			case TOKEN_IDENTIFIER: case TOKEN_STRING: case TOKEN_REGEXP:
-				$s = $n->value;
-			break;
-
-			case JS_GROUP:
-				if (in_array(
-					$n->treeNodes[0]->type,
-					array(
-						JS_ARRAY_INIT, JS_OBJECT_INIT, JS_GROUP,
-						TOKEN_NUMBER, TOKEN_STRING, TOKEN_REGEXP, TOKEN_IDENTIFIER,
-						KEYWORD_NULL, KEYWORD_THIS, KEYWORD_TRUE, KEYWORD_FALSE
-					)
-				))
-				{
-					$s = $this->parseTree($n->treeNodes[0]);
-				}
-				else
-				{
-					$s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
-				}
-			break;
-
-			default:
-				throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
-		}
-
-		return $s;
-	}
-
-	private function isValidIdentifier($string)
-	{
-		return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
-	}
-
-	private function isWordChar($char)
-	{
-		return $char == '_' || $char == '$' || ctype_alnum($char);
-	}
-}
-
-class JSParser
-{
-	private $t;
-	private $minifier;
-
-	private $opPrecedence = array(
-		';' => 0,
-		',' => 1,
-		'=' => 2, '?' => 2, ':' => 2,
-		// The above all have to have the same precedence, see bug 330975
-		'||' => 4,
-		'&&' => 5,
-		'|' => 6,
-		'^' => 7,
-		'&' => 8,
-		'==' => 9, '!=' => 9, '===' => 9, '!==' => 9,
-		'<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10,
-		'<<' => 11, '>>' => 11, '>>>' => 11,
-		'+' => 12, '-' => 12,
-		'*' => 13, '/' => 13, '%' => 13,
-		'delete' => 14, 'void' => 14, 'typeof' => 14,
-		'!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14,
-		'++' => 15, '--' => 15,
-		'new' => 16,
-		'.' => 17,
-		JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0,
-		JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0
-	);
-
-	private $opArity = array(
-		',' => -2,
-		'=' => 2,
-		'?' => 3,
-		'||' => 2,
-		'&&' => 2,
-		'|' => 2,
-		'^' => 2,
-		'&' => 2,
-		'==' => 2, '!=' => 2, '===' => 2, '!==' => 2,
-		'<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2,
-		'<<' => 2, '>>' => 2, '>>>' => 2,
-		'+' => 2, '-' => 2,
-		'*' => 2, '/' => 2, '%' => 2,
-		'delete' => 1, 'void' => 1, 'typeof' => 1,
-		'!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1,
-		'++' => 1, '--' => 1,
-		'new' => 1,
-		'.' => 2,
-		JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2,
-		JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1,
-		TOKEN_CONDCOMMENT_START => 1, TOKEN_CONDCOMMENT_END => 1
-	);
-
-	public function __construct($minifier=null)
-	{
-		$this->minifier = $minifier;
-		$this->t = new JSTokenizer();
-	}
-
-	public function parse($s, $f, $l)
-	{
-		// initialize tokenizer
-		$this->t->init($s, $f, $l);
-
-		$x = new JSCompilerContext(false);
-		$n = $this->Script($x);
-		if (!$this->t->isDone())
-			throw $this->t->newSyntaxError('Syntax error');
-
-		return $n;
-	}
-
-	private function Script($x)
-	{
-		$n = $this->Statements($x);
-		$n->type = JS_SCRIPT;
-		$n->funDecls = $x->funDecls;
-		$n->varDecls = $x->varDecls;
-
-		// minify by scope
-		if ($this->minifier)
-		{
-			$n->value = $this->minifier->parseTree($n);
-
-			// clear tree from node to save memory
-			$n->treeNodes = null;
-			$n->funDecls = null;
-			$n->varDecls = null;
-
-			$n->type = JS_MINIFIED;
-		}
-
-		return $n;
-	}
-
-	private function Statements($x)
-	{
-		$n = new JSNode($this->t, JS_BLOCK);
-		array_push($x->stmtStack, $n);
-
-		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
-			$n->addNode($this->Statement($x));
-
-		array_pop($x->stmtStack);
-
-		return $n;
-	}
-
-	private function Block($x)
-	{
-		$this->t->mustMatch(OP_LEFT_CURLY);
-		$n = $this->Statements($x);
-		$this->t->mustMatch(OP_RIGHT_CURLY);
-
-		return $n;
-	}
-
-	private function Statement($x)
-	{
-		$tt = $this->t->get();
-		$n2 = null;
-
-		// Cases for statements ending in a right curly return early, avoiding the
-		// common semicolon insertion magic after this switch.
-		switch ($tt)
-		{
-			case KEYWORD_FUNCTION:
-				return $this->FunctionDefinition(
-					$x,
-					true,
-					count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM
-				);
-			break;
-
-			case OP_LEFT_CURLY:
-				$n = $this->Statements($x);
-				$this->t->mustMatch(OP_RIGHT_CURLY);
-			return $n;
-
-			case KEYWORD_IF:
-				$n = new JSNode($this->t);
-				$n->condition = $this->ParenExpression($x);
-				array_push($x->stmtStack, $n);
-				$n->thenPart = $this->Statement($x);
-				$n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null;
-				array_pop($x->stmtStack);
-			return $n;
-
-			case KEYWORD_SWITCH:
-				$n = new JSNode($this->t);
-				$this->t->mustMatch(OP_LEFT_PAREN);
-				$n->discriminant = $this->Expression($x);
-				$this->t->mustMatch(OP_RIGHT_PAREN);
-				$n->cases = array();
-				$n->defaultIndex = -1;
-
-				array_push($x->stmtStack, $n);
-
-				$this->t->mustMatch(OP_LEFT_CURLY);
-
-				while (($tt = $this->t->get()) != OP_RIGHT_CURLY)
-				{
-					switch ($tt)
-					{
-						case KEYWORD_DEFAULT:
-							if ($n->defaultIndex >= 0)
-								throw $this->t->newSyntaxError('More than one switch default');
-							// FALL THROUGH
-						case KEYWORD_CASE:
-							$n2 = new JSNode($this->t);
-							if ($tt == KEYWORD_DEFAULT)
-								$n->defaultIndex = count($n->cases);
-							else
-								$n2->caseLabel = $this->Expression($x, OP_COLON);
-								break;
-						default:
-							throw $this->t->newSyntaxError('Invalid switch case');
-					}
-
-					$this->t->mustMatch(OP_COLON);
-					$n2->statements = new JSNode($this->t, JS_BLOCK);
-					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
-						$n2->statements->addNode($this->Statement($x));
-
-					array_push($n->cases, $n2);
-				}
-
-				array_pop($x->stmtStack);
-			return $n;
-
-			case KEYWORD_FOR:
-				$n = new JSNode($this->t);
-				$n->isLoop = true;
-				$this->t->mustMatch(OP_LEFT_PAREN);
-
-				if (($tt = $this->t->peek()) != OP_SEMICOLON)
-				{
-					$x->inForLoopInit = true;
-					if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST)
-					{
-						$this->t->get();
-						$n2 = $this->Variables($x);
-					}
-					else
-					{
-						$n2 = $this->Expression($x);
-					}
-					$x->inForLoopInit = false;
-				}
-
-				if ($n2 && $this->t->match(KEYWORD_IN))
-				{
-					$n->type = JS_FOR_IN;
-					if ($n2->type == KEYWORD_VAR)
-					{
-						if (count($n2->treeNodes) != 1)
-						{
-							throw $this->t->SyntaxError(
-								'Invalid for..in left-hand side',
-								$this->t->filename,
-								$n2->lineno
-							);
-						}
-
-						// NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
-						$n->iterator = $n2->treeNodes[0];
-						$n->varDecl = $n2;
-					}
-					else
-					{
-						$n->iterator = $n2;
-						$n->varDecl = null;
-					}
-
-					$n->object = $this->Expression($x);
-				}
-				else
-				{
-					$n->setup = $n2 ? $n2 : null;
-					$this->t->mustMatch(OP_SEMICOLON);
-					$n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x);
-					$this->t->mustMatch(OP_SEMICOLON);
-					$n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x);
-				}
-
-				$this->t->mustMatch(OP_RIGHT_PAREN);
-				$n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_WHILE:
-			        $n = new JSNode($this->t);
-			        $n->isLoop = true;
-			        $n->condition = $this->ParenExpression($x);
-			        $n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_DO:
-				$n = new JSNode($this->t);
-				$n->isLoop = true;
-				$n->body = $this->nest($x, $n, KEYWORD_WHILE);
-				$n->condition = $this->ParenExpression($x);
-				if (!$x->ecmaStrictMode)
-				{
-					// <script language="JavaScript"> (without version hints) may need
-					// automatic semicolon insertion without a newline after do-while.
-					// See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-					$this->t->match(OP_SEMICOLON);
-					return $n;
-				}
-			break;
-
-			case KEYWORD_BREAK:
-			case KEYWORD_CONTINUE:
-				$n = new JSNode($this->t);
-
-				if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER)
-				{
-					$this->t->get();
-					$n->label = $this->t->currentToken()->value;
-				}
-
-				$ss = $x->stmtStack;
-				$i = count($ss);
-				$label = $n->label;
-				if ($label)
-				{
-					do
-					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Label not found');
-					}
-					while ($ss[$i]->label != $label);
-				}
-				else
-				{
-					do
-					{
-						if (--$i < 0)
-							throw $this->t->newSyntaxError('Invalid ' . $tt);
-					}
-					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
-				}
-
-				$n->target = $ss[$i];
-			break;
-
-			case KEYWORD_TRY:
-				$n = new JSNode($this->t);
-				$n->tryBlock = $this->Block($x);
-				$n->catchClauses = array();
-
-				while ($this->t->match(KEYWORD_CATCH))
-				{
-					$n2 = new JSNode($this->t);
-					$this->t->mustMatch(OP_LEFT_PAREN);
-					$n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value;
-
-					if ($this->t->match(KEYWORD_IF))
-					{
-						if ($x->ecmaStrictMode)
-							throw $this->t->newSyntaxError('Illegal catch guard');
-
-						if (count($n->catchClauses) && !end($n->catchClauses)->guard)
-							throw $this->t->newSyntaxError('Guarded catch after unguarded');
-
-						$n2->guard = $this->Expression($x);
-					}
-					else
-					{
-						$n2->guard = null;
-					}
-
-					$this->t->mustMatch(OP_RIGHT_PAREN);
-					$n2->block = $this->Block($x);
-					array_push($n->catchClauses, $n2);
-				}
-
-				if ($this->t->match(KEYWORD_FINALLY))
-					$n->finallyBlock = $this->Block($x);
-
-				if (!count($n->catchClauses) && !$n->finallyBlock)
-					throw $this->t->newSyntaxError('Invalid try statement');
-			return $n;
-
-			case KEYWORD_CATCH:
-			case KEYWORD_FINALLY:
-				throw $this->t->newSyntaxError($tt + ' without preceding try');
-
-			case KEYWORD_THROW:
-				$n = new JSNode($this->t);
-				$n->value = $this->Expression($x);
-			break;
-
-			case KEYWORD_RETURN:
-				if (!$x->inFunction)
-					throw $this->t->newSyntaxError('Invalid return');
-
-				$n = new JSNode($this->t);
-				$tt = $this->t->peekOnSameLine();
-				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-					$n->value = $this->Expression($x);
-				else
-					$n->value = null;
-			break;
-
-			case KEYWORD_WITH:
-				$n = new JSNode($this->t);
-				$n->object = $this->ParenExpression($x);
-				$n->body = $this->nest($x, $n);
-			return $n;
-
-			case KEYWORD_VAR:
-			case KEYWORD_CONST:
-			        $n = $this->Variables($x);
-			break;
-
-			case TOKEN_CONDCOMMENT_START:
-			case TOKEN_CONDCOMMENT_END:
-				$n = new JSNode($this->t);
-			return $n;
-
-			case KEYWORD_DEBUGGER:
-				$n = new JSNode($this->t);
-			break;
-
-			case TOKEN_NEWLINE:
-			case OP_SEMICOLON:
-				$n = new JSNode($this->t, OP_SEMICOLON);
-				$n->expression = null;
-			return $n;
-
-			default:
-				if ($tt == TOKEN_IDENTIFIER)
-				{
-					$this->t->scanOperand = false;
-					$tt = $this->t->peek();
-					$this->t->scanOperand = true;
-					if ($tt == OP_COLON)
-					{
-						$label = $this->t->currentToken()->value;
-						$ss = $x->stmtStack;
-						for ($i = count($ss) - 1; $i >= 0; --$i)
-						{
-							if ($ss[$i]->label == $label)
-								throw $this->t->newSyntaxError('Duplicate label');
-						}
-
-						$this->t->get();
-						$n = new JSNode($this->t, JS_LABEL);
-						$n->label = $label;
-						$n->statement = $this->nest($x, $n);
-
-						return $n;
-					}
-				}
-
-				$n = new JSNode($this->t, OP_SEMICOLON);
-				$this->t->unget();
-				$n->expression = $this->Expression($x);
-				$n->end = $n->expression->end;
-			break;
-		}
-
-		if ($this->t->lineno == $this->t->currentToken()->lineno)
-		{
-			$tt = $this->t->peekOnSameLine();
-			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
-				throw $this->t->newSyntaxError('Missing ; before statement');
-		}
-
-		$this->t->match(OP_SEMICOLON);
-
-		return $n;
-	}
-
-	private function FunctionDefinition($x, $requireName, $functionForm)
-	{
-		$f = new JSNode($this->t);
-
-		if ($f->type != KEYWORD_FUNCTION)
-			$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
-
-		if ($this->t->match(TOKEN_IDENTIFIER))
-			$f->name = $this->t->currentToken()->value;
-		elseif ($requireName)
-			throw $this->t->newSyntaxError('Missing function identifier');
-
-		$this->t->mustMatch(OP_LEFT_PAREN);
-			$f->params = array();
-
-		while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
-		{
-			if ($tt != TOKEN_IDENTIFIER)
-				throw $this->t->newSyntaxError('Missing formal parameter');
-
-			array_push($f->params, $this->t->currentToken()->value);
-
-			if ($this->t->peek() != OP_RIGHT_PAREN)
-				$this->t->mustMatch(OP_COMMA);
-		}
-
-		$this->t->mustMatch(OP_LEFT_CURLY);
-
-		$x2 = new JSCompilerContext(true);
-		$f->body = $this->Script($x2);
-
-		$this->t->mustMatch(OP_RIGHT_CURLY);
-		$f->end = $this->t->currentToken()->end;
-
-		$f->functionForm = $functionForm;
-		if ($functionForm == DECLARED_FORM)
-			array_push($x->funDecls, $f);
-
-		return $f;
-	}
-
-	private function Variables($x)
-	{
-		$n = new JSNode($this->t);
-
-		do
-		{
-			$this->t->mustMatch(TOKEN_IDENTIFIER);
-
-			$n2 = new JSNode($this->t);
-			$n2->name = $n2->value;
-
-			if ($this->t->match(OP_ASSIGN))
-			{
-				if ($this->t->currentToken()->assignOp)
-					throw $this->t->newSyntaxError('Invalid variable initialization');
-
-				$n2->initializer = $this->Expression($x, OP_COMMA);
-			}
-
-			$n2->readOnly = $n->type == KEYWORD_CONST;
-
-			$n->addNode($n2);
-			array_push($x->varDecls, $n2);
-		}
-		while ($this->t->match(OP_COMMA));
-
-		return $n;
-	}
-
-	private function Expression($x, $stop=false)
-	{
-		$operators = array();
-		$operands = array();
-		$n = false;
-
-		$bl = $x->bracketLevel;
-		$cl = $x->curlyLevel;
-		$pl = $x->parenLevel;
-		$hl = $x->hookLevel;
-
-		while (($tt = $this->t->get()) != TOKEN_END)
-		{
-			if ($tt == $stop &&
-				$x->bracketLevel == $bl &&
-				$x->curlyLevel == $cl &&
-				$x->parenLevel == $pl &&
-				$x->hookLevel == $hl
-			)
-			{
-				// Stop only if tt matches the optional stop parameter, and that
-				// token is not quoted by some kind of bracket.
-				break;
-			}
-
-			switch ($tt)
-			{
-				case OP_SEMICOLON:
-					// NB: cannot be empty, Statement handled that.
-					break 2;
-
-				case OP_HOOK:
-					if ($this->t->scanOperand)
-						break 2;
-
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					array_push($operators, new JSNode($this->t));
-
-					++$x->hookLevel;
-					$this->t->scanOperand = true;
-					$n = $this->Expression($x);
-
-					if (!$this->t->match(OP_COLON))
-						break 2;
-
-					--$x->hookLevel;
-					array_push($operands, $n);
-				break;
-
-				case OP_COLON:
-					if ($x->hookLevel)
-						break 2;
-
-					throw $this->t->newSyntaxError('Invalid label');
-				break;
-
-				case OP_ASSIGN:
-					if ($this->t->scanOperand)
-						break 2;
-
-					// Use >, not >=, for right-associative ASSIGN
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					array_push($operators, new JSNode($this->t));
-					end($operands)->assignOp = $this->t->currentToken()->assignOp;
-					$this->t->scanOperand = true;
-				break;
-
-				case KEYWORD_IN:
-					// An in operator should not be parsed if we're parsing the head of
-					// a for (...) loop, unless it is in the then part of a conditional
-					// expression, or parenthesized somehow.
-					if ($x->inForLoopInit && !$x->hookLevel &&
-						!$x->bracketLevel && !$x->curlyLevel &&
-						!$x->parenLevel
-					)
-						break 2;
-				// FALL THROUGH
-				case OP_COMMA:
-					// A comma operator should not be parsed if we're parsing the then part
-					// of a conditional expression unless it's parenthesized somehow.
-					if ($tt == OP_COMMA && $x->hookLevel &&
-						!$x->bracketLevel && !$x->curlyLevel &&
-						!$x->parenLevel
-					)
-						break 2;
-				// Treat comma as left-associative so reduce can fold left-heavy
-				// COMMA trees into a single array.
-				// FALL THROUGH
-				case OP_OR:
-				case OP_AND:
-				case OP_BITWISE_OR:
-				case OP_BITWISE_XOR:
-				case OP_BITWISE_AND:
-				case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
-				case OP_LT: case OP_LE: case OP_GE: case OP_GT:
-				case KEYWORD_INSTANCEOF:
-				case OP_LSH: case OP_RSH: case OP_URSH:
-				case OP_PLUS: case OP_MINUS:
-				case OP_MUL: case OP_DIV: case OP_MOD:
-				case OP_DOT:
-					if ($this->t->scanOperand)
-						break 2;
-
-					while (	!empty($operators) &&
-						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
-					)
-						$this->reduce($operators, $operands);
-
-					if ($tt == OP_DOT)
-					{
-						$this->t->mustMatch(TOKEN_IDENTIFIER);
-						array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
-					}
-					else
-					{
-						array_push($operators, new JSNode($this->t));
-						$this->t->scanOperand = true;
-					}
-				break;
-
-				case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
-				case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
-				case KEYWORD_NEW:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operators, new JSNode($this->t));
-				break;
-
-				case OP_INCREMENT: case OP_DECREMENT:
-					if ($this->t->scanOperand)
-					{
-						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
-					}
-					else
-					{
-						// Don't cross a line boundary for postfix {in,de}crement.
-						$t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
-						if ($t && $t->lineno != $this->t->lineno)
-							break 2;
-
-						if (!empty($operators))
-						{
-							// Use >, not >=, so postfix has higher precedence than prefix.
-							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
-								$this->reduce($operators, $operands);
-						}
-
-						$n = new JSNode($this->t, $tt, array_pop($operands));
-						$n->postfix = true;
-						array_push($operands, $n);
-					}
-				break;
-
-				case KEYWORD_FUNCTION:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
-					$this->t->scanOperand = false;
-				break;
-
-				case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
-				case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					array_push($operands, new JSNode($this->t));
-					$this->t->scanOperand = false;
-				break;
-
-				case TOKEN_CONDCOMMENT_START:
-				case TOKEN_CONDCOMMENT_END:
-					if ($this->t->scanOperand)
-						array_push($operators, new JSNode($this->t));
-					else
-						array_push($operands, new JSNode($this->t));
-				break;
-
-				case OP_LEFT_BRACKET:
-					if ($this->t->scanOperand)
-					{
-						// Array initialiser.  Parse using recursive descent, as the
-						// sub-grammar here is not an operator grammar.
-						$n = new JSNode($this->t, JS_ARRAY_INIT);
-						while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET)
-						{
-							if ($tt == OP_COMMA)
-							{
-								$this->t->get();
-								$n->addNode(null);
-								continue;
-							}
-
-							$n->addNode($this->Expression($x, OP_COMMA));
-							if (!$this->t->match(OP_COMMA))
-								break;
-						}
-
-						$this->t->mustMatch(OP_RIGHT_BRACKET);
-						array_push($operands, $n);
-						$this->t->scanOperand = false;
-					}
-					else
-					{
-						// Property indexing operator.
-						array_push($operators, new JSNode($this->t, JS_INDEX));
-						$this->t->scanOperand = true;
-						++$x->bracketLevel;
-					}
-				break;
-
-				case OP_RIGHT_BRACKET:
-					if ($this->t->scanOperand || $x->bracketLevel == $bl)
-						break 2;
-
-					while ($this->reduce($operators, $operands)->type != JS_INDEX)
-						continue;
-
-					--$x->bracketLevel;
-				break;
-
-				case OP_LEFT_CURLY:
-					if (!$this->t->scanOperand)
-						break 2;
-
-					// Object initialiser.  As for array initialisers (see above),
-					// parse using recursive descent.
-					++$x->curlyLevel;
-					$n = new JSNode($this->t, JS_OBJECT_INIT);
-					while (!$this->t->match(OP_RIGHT_CURLY))
-					{
-						do
-						{
-							$tt = $this->t->get();
-							$tv = $this->t->currentToken()->value;
-							if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
-							{
-								if ($x->ecmaStrictMode)
-									throw $this->t->newSyntaxError('Illegal property accessor');
-
-								$n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
-							}
-							else
-							{
-								switch ($tt)
-								{
-									case TOKEN_IDENTIFIER:
-									case TOKEN_NUMBER:
-									case TOKEN_STRING:
-										$id = new JSNode($this->t);
-									break;
-
-									case OP_RIGHT_CURLY:
-										if ($x->ecmaStrictMode)
-											throw $this->t->newSyntaxError('Illegal trailing ,');
-									break 3;
-
-									default:
-										throw $this->t->newSyntaxError('Invalid property name');
-								}
-
-								$this->t->mustMatch(OP_COLON);
-								$n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA)));
-							}
-						}
-						while ($this->t->match(OP_COMMA));
-
-						$this->t->mustMatch(OP_RIGHT_CURLY);
-						break;
-					}
-
-					array_push($operands, $n);
-					$this->t->scanOperand = false;
-					--$x->curlyLevel;
-				break;
-
-				case OP_RIGHT_CURLY:
-					if (!$this->t->scanOperand && $x->curlyLevel != $cl)
-						throw new Exception('PANIC: right curly botch');
-				break 2;
-
-				case OP_LEFT_PAREN:
-					if ($this->t->scanOperand)
-					{
-						array_push($operators, new JSNode($this->t, JS_GROUP));
-					}
-					else
-					{
-						while (	!empty($operators) &&
-							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
-						)
-							$this->reduce($operators, $operands);
-
-						// Handle () now, to regularize the n-ary case for n > 0.
-						// We must set scanOperand in case there are arguments and
-						// the first one is a regexp or unary+/-.
-						$n = end($operators);
-						$this->t->scanOperand = true;
-						if ($this->t->match(OP_RIGHT_PAREN))
-						{
-							if ($n && $n->type == KEYWORD_NEW)
-							{
-								array_pop($operators);
-								$n->addNode(array_pop($operands));
-							}
-							else
-							{
-								$n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
-							}
-
-							array_push($operands, $n);
-							$this->t->scanOperand = false;
-							break;
-						}
-
-						if ($n && $n->type == KEYWORD_NEW)
-							$n->type = JS_NEW_WITH_ARGS;
-						else
-							array_push($operators, new JSNode($this->t, JS_CALL));
-					}
-
-					++$x->parenLevel;
-				break;
-
-				case OP_RIGHT_PAREN:
-					if ($this->t->scanOperand || $x->parenLevel == $pl)
-						break 2;
-
-					while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
-						$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
-					)
-					{
-						continue;
-					}
-
-					if ($tt != JS_GROUP)
-					{
-						$n = end($operands);
-						if ($n->treeNodes[1]->type != OP_COMMA)
-							$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
-						else
-							$n->treeNodes[1]->type = JS_LIST;
-					}
-
-					--$x->parenLevel;
-				break;
-
-				// Automatic semicolon insertion means we may scan across a newline
-				// and into the beginning of another statement.  If so, break out of
-				// the while loop and let the t.scanOperand logic handle errors.
-				default:
-					break 2;
-			}
-		}
-
-		if ($x->hookLevel != $hl)
-			throw $this->t->newSyntaxError('Missing : in conditional expression');
-
-		if ($x->parenLevel != $pl)
-			throw $this->t->newSyntaxError('Missing ) in parenthetical');
-
-		if ($x->bracketLevel != $bl)
-			throw $this->t->newSyntaxError('Missing ] in index expression');
-
-		if ($this->t->scanOperand)
-			throw $this->t->newSyntaxError('Missing operand');
-
-		// Resume default mode, scanning for operands, not operators.
-		$this->t->scanOperand = true;
-		$this->t->unget();
-
-		while (count($operators))
-			$this->reduce($operators, $operands);
-
-		return array_pop($operands);
-	}
-
-	private function ParenExpression($x)
-	{
-		$this->t->mustMatch(OP_LEFT_PAREN);
-		$n = $this->Expression($x);
-		$this->t->mustMatch(OP_RIGHT_PAREN);
-
-		return $n;
-	}
-
-	// Statement stack and nested statement handler.
-	private function nest($x, $node, $end = false)
-	{
-		array_push($x->stmtStack, $node);
-		$n = $this->statement($x);
-		array_pop($x->stmtStack);
-
-		if ($end)
-			$this->t->mustMatch($end);
-
-		return $n;
-	}
-
-	private function reduce(&$operators, &$operands)
-	{
-		$n = array_pop($operators);
-		$op = $n->type;
-		$arity = $this->opArity[$op];
-		$c = count($operands);
-		if ($arity == -2)
-		{
-			// Flatten left-associative trees
-			if ($c >= 2)
-			{
-				$left = $operands[$c - 2];
-				if ($left->type == $op)
-				{
-					$right = array_pop($operands);
-					$left->addNode($right);
-					return $left;
-				}
-			}
-			$arity = 2;
-		}
-
-		// Always use push to add operands to n, to update start and end
-		$a = array_splice($operands, $c - $arity);
-		for ($i = 0; $i < $arity; $i++)
-			$n->addNode($a[$i]);
-
-		// Include closing bracket or postfix operator in [start,end]
-		$te = $this->t->currentToken()->end;
-		if ($n->end < $te)
-			$n->end = $te;
-
-		array_push($operands, $n);
-
-		return $n;
-	}
-}
-
-class JSCompilerContext
-{
-	public $inFunction = false;
-	public $inForLoopInit = false;
-	public $ecmaStrictMode = false;
-	public $bracketLevel = 0;
-	public $curlyLevel = 0;
-	public $parenLevel = 0;
-	public $hookLevel = 0;
-
-	public $stmtStack = array();
-	public $funDecls = array();
-	public $varDecls = array();
-
-	public function __construct($inFunction)
-	{
-		$this->inFunction = $inFunction;
-	}
-}
-
-class JSNode
-{
-	private $type;
-	private $value;
-	private $lineno;
-	private $start;
-	private $end;
-
-	public $treeNodes = array();
-	public $funDecls = array();
-	public $varDecls = array();
-
-	public function __construct($t, $type=0)
-	{
-		if ($token = $t->currentToken())
-		{
-			$this->type = $type ? $type : $token->type;
-			$this->value = $token->value;
-			$this->lineno = $token->lineno;
-			$this->start = $token->start;
-			$this->end = $token->end;
-		}
-		else
-		{
-			$this->type = $type;
-			$this->lineno = $t->lineno;
-		}
-
-		if (($numargs = func_num_args()) > 2)
-		{
-			$args = func_get_args();
-			for ($i = 2; $i < $numargs; $i++)
-				$this->addNode($args[$i]);
-		}
-	}
-
-	// we don't want to bloat our object with all kind of specific properties, so we use overloading
-	public function __set($name, $value)
-	{
-		$this->$name = $value;
-	}
-
-	public function __get($name)
-	{
-		if (isset($this->$name))
-			return $this->$name;
-
-		return null;
-	}
-
-	public function addNode($node)
-	{
-		if ($node !== null)
-		{
-			if ($node->start < $this->start)
-				$this->start = $node->start;
-			if ($this->end < $node->end)
-				$this->end = $node->end;
-		}
-
-		$this->treeNodes[] = $node;
-	}
-}
-
-class JSTokenizer
-{
-	private $cursor = 0;
-	private $source;
-
-	public $tokens = array();
-	public $tokenIndex = 0;
-	public $lookahead = 0;
-	public $scanNewlines = false;
-	public $scanOperand = true;
-
-	public $filename;
-	public $lineno;
-
-	private $keywords = array(
-		'break',
-		'case', 'catch', 'const', 'continue',
-		'debugger', 'default', 'delete', 'do',
-		'else', 'enum',
-		'false', 'finally', 'for', 'function',
-		'if', 'in', 'instanceof',
-		'new', 'null',
-		'return',
-		'switch',
-		'this', 'throw', 'true', 'try', 'typeof',
-		'var', 'void',
-		'while', 'with'
-	);
-
-	private $opTypeNames = array(
-		';', ',', '?', ':', '||', '&&', '|', '^',
-		'&', '===', '==', '=', '!==', '!=', '<<', '<=',
-		'<', '>>>', '>>', '>=', '>', '++', '--', '+',
-		'-', '*', '/', '%', '!', '~', '.', '[',
-		']', '{', '}', '(', ')', '@*/'
-	);
-
-	private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%');
-	private $opRegExp;
-
-	public function __construct()
-	{
-		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', $this->opTypeNames)) . ')#';
-	}
-
-	public function init($source, $filename = '', $lineno = 1)
-	{
-		$this->source = $source;
-		$this->filename = $filename ? $filename : '[inline]';
-		$this->lineno = $lineno;
-
-		$this->cursor = 0;
-		$this->tokens = array();
-		$this->tokenIndex = 0;
-		$this->lookahead = 0;
-		$this->scanNewlines = false;
-		$this->scanOperand = true;
-	}
-
-	public function getInput($chunksize)
-	{
-		if ($chunksize)
-			return substr($this->source, $this->cursor, $chunksize);
-
-		return substr($this->source, $this->cursor);
-	}
-
-	public function isDone()
-	{
-		return $this->peek() == TOKEN_END;
-	}
-
-	public function match($tt)
-	{
-		return $this->get() == $tt || $this->unget();
-	}
-
-	public function mustMatch($tt)
-	{
-	        if (!$this->match($tt))
-			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
-
-		return $this->currentToken();
-	}
-
-	public function peek()
-	{
-		if ($this->lookahead)
-		{
-			$next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
-			if ($this->scanNewlines && $next->lineno != $this->lineno)
-				$tt = TOKEN_NEWLINE;
-			else
-				$tt = $next->type;
-		}
-		else
-		{
-			$tt = $this->get();
-			$this->unget();
-		}
-
-		return $tt;
-	}
-
-	public function peekOnSameLine()
-	{
-		$this->scanNewlines = true;
-		$tt = $this->peek();
-		$this->scanNewlines = false;
-
-		return $tt;
-	}
-
-	public function currentToken()
-	{
-		if (!empty($this->tokens))
-			return $this->tokens[$this->tokenIndex];
-	}
-
-	public function get($chunksize = 1000)
-	{
-		while($this->lookahead)
-		{
-			$this->lookahead--;
-			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
-			$token = $this->tokens[$this->tokenIndex];
-			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
-				return $token->type;
-		}
-
-		$conditional_comment = false;
-
-		// strip whitespace and comments
-		while(true)
-		{
-			$input = $this->getInput($chunksize);
-
-			// whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!)
-			$re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/';
-			if (preg_match($re, $input, $match))
-			{
-				$spaces = $match[0];
-				$spacelen = strlen($spaces);
-				$this->cursor += $spacelen;
-				if (!$this->scanNewlines)
-					$this->lineno += substr_count($spaces, "\n");
-
-				if ($spacelen == $chunksize)
-					continue; // complete chunk contained whitespace
-
-				$input = $this->getInput($chunksize);
-				if ($input == '' || $input[0] != '/')
-					break;
-			}
-
-			// Comments
-			if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
-			{
-				if (!$chunksize)
-					break;
-
-				// retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
-				$chunksize = null;
-				continue;
-			}
-
-			// check if this is a conditional (JScript) comment
-			if (!empty($match[1]))
-			{
-				$match[0] = '/*' . $match[1];
-				$conditional_comment = true;
-				break;
-			}
-			else
-			{
-				$this->cursor += strlen($match[0]);
-				$this->lineno += substr_count($match[0], "\n");
-			}
-		}
-
-		if ($input == '')
-		{
-			$tt = TOKEN_END;
-			$match = array('');
-		}
-		elseif ($conditional_comment)
-		{
-			$tt = TOKEN_CONDCOMMENT_START;
-		}
-		else
-		{
-			switch ($input[0])
-			{
-				case '0':
-					// hexadecimal
-					if (($input[1] == 'x' || $input[1] == 'X') && preg_match('/^0x[0-9a-f]+/i', $input, $match))
-					{
-						$tt = TOKEN_NUMBER;
-						break;
-					}
-				// FALL THROUGH
-
-				case '1': case '2': case '3': case '4': case '5':
-				case '6': case '7': case '8': case '9':
-					// should always match
-					preg_match('/^\d+(?:\.\d*)?(?:[eE][-+]?\d+)?/', $input, $match);
-					$tt = TOKEN_NUMBER;
-				break;
-
-				case "'":
-					if (preg_match('/^\'(?:[^\\\\\'\r\n]++|\\\\(?:.|\r?\n))*\'/', $input, $match))
-					{
-						$tt = TOKEN_STRING;
-					}
-					else
-					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
-
-						throw $this->newSyntaxError('Unterminated string literal');
-					}
-				break;
-
-				case '"':
-					if (preg_match('/^"(?:[^\\\\"\r\n]++|\\\\(?:.|\r?\n))*"/', $input, $match))
-					{
-						$tt = TOKEN_STRING;
-					}
-					else
-					{
-						if ($chunksize)
-							return $this->get(null); // retry with a full chunk fetch
-
-						throw $this->newSyntaxError('Unterminated string literal');
-					}
-				break;
-
-				case '/':
-					if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match))
-					{
-						$tt = TOKEN_REGEXP;
-						break;
-					}
-				// FALL THROUGH
-
-				case '|':
-				case '^':
-				case '&':
-				case '<':
-				case '>':
-				case '+':
-				case '-':
-				case '*':
-				case '%':
-				case '=':
-				case '!':
-					// should always match
-					preg_match($this->opRegExp, $input, $match);
-					$op = $match[0];
-					if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=')
-					{
-						$tt = OP_ASSIGN;
-						$match[0] .= '=';
-					}
-					else
-					{
-						$tt = $op;
-						if ($this->scanOperand)
-						{
-							if ($op == OP_PLUS)
-								$tt = OP_UNARY_PLUS;
-							elseif ($op == OP_MINUS)
-								$tt = OP_UNARY_MINUS;
-						}
-						$op = null;
-					}
-				break;
-
-				case '.':
-					if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match))
-					{
-						$tt = TOKEN_NUMBER;
-						break;
-					}
-				// FALL THROUGH
-
-				case ';':
-				case ',':
-				case '?':
-				case ':':
-				case '~':
-				case '[':
-				case ']':
-				case '{':
-				case '}':
-				case '(':
-				case ')':
-					// these are all single
-					$match = array($input[0]);
-					$tt = $input[0];
-				break;
-
-				case '@':
-					// check end of conditional comment
-					if (substr($input, 0, 3) == '@*/')
-					{
-						$match = array('@*/');
-						$tt = TOKEN_CONDCOMMENT_END;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-				break;
-
-				case "\n":
-					if ($this->scanNewlines)
-					{
-						$match = array("\n");
-						$tt = TOKEN_NEWLINE;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-				break;
-
-				default:
-					// FIXME: add support for unicode and unicode escape sequence \uHHHH
-					if (preg_match('/^[$\w]+/', $input, $match))
-					{
-						$tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
-					}
-					else
-						throw $this->newSyntaxError('Illegal token');
-			}
-		}
-
-		$this->tokenIndex = ($this->tokenIndex + 1) & 3;
-
-		if (!isset($this->tokens[$this->tokenIndex]))
-			$this->tokens[$this->tokenIndex] = new JSToken();
-
-		$token = $this->tokens[$this->tokenIndex];
-		$token->type = $tt;
-
-		if ($tt == OP_ASSIGN)
-			$token->assignOp = $op;
-
-		$token->start = $this->cursor;
-
-		$token->value = $match[0];
-		$this->cursor += strlen($match[0]);
-
-		$token->end = $this->cursor;
-		$token->lineno = $this->lineno;
-
-		return $tt;
-	}
-
-	public function unget()
-	{
-		if (++$this->lookahead == 4)
-			throw $this->newSyntaxError('PANIC: too much lookahead!');
-
-		$this->tokenIndex = ($this->tokenIndex - 1) & 3;
-	}
-
-	public function newSyntaxError($m)
-	{
-		return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
-	}
-}
-
-class JSToken
-{
-	public $type;
-	public $value;
-	public $start;
-	public $end;
-	public $lineno;
-	public $assignOp;
-}
diff --git a/inc/lib/minify/Minify.php b/inc/lib/minify/Minify.php
deleted file mode 100755
index 2b38f89b..00000000
--- a/inc/lib/minify/Minify.php
+++ /dev/null
@@ -1,608 +0,0 @@
-<?php
-/**
- * Class Minify  
- * @package Minify
- */
- 
-/**
- * Minify - Combines, minifies, and caches JavaScript and CSS files on demand.
- *
- * See README for usage instructions (for now).
- *
- * This library was inspired by {@link mailto:flashkot@mail.ru jscsscomp by Maxim Martynyuk}
- * and by the article {@link http://www.hunlock.com/blogs/Supercharged_Javascript "Supercharged JavaScript" by Patrick Hunlock}.
- *
- * Requires PHP 5.1.0.
- * Tested on PHP 5.1.6.
- *
- * @package Minify
- * @author Ryan Grove <ryan@wonko.com>
- * @author Stephen Clay <steve@mrclay.org>
- * @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved.
- * @license http://opensource.org/licenses/bsd-license.php  New BSD License
- * @link http://code.google.com/p/minify/
- */
-class Minify {
-    
-    const VERSION = '2.2.0';
-    const TYPE_CSS = 'text/css';
-    const TYPE_HTML = 'text/html';
-    // there is some debate over the ideal JS Content-Type, but this is the
-    // Apache default and what Yahoo! uses..
-    const TYPE_JS = 'application/x-javascript';
-    const URL_DEBUG = 'http://code.google.com/p/minify/wiki/Debugging';
-    
-    /**
-     * How many hours behind are the file modification times of uploaded files?
-     * 
-     * If you upload files from Windows to a non-Windows server, Windows may report
-     * incorrect mtimes for the files. Immediately after modifying and uploading a 
-     * file, use the touch command to update the mtime on the server. If the mtime 
-     * jumps ahead by a number of hours, set this variable to that number. If the mtime 
-     * moves back, this should not be needed.
-     *
-     * @var int $uploaderHoursBehind
-     */
-    public static $uploaderHoursBehind = 0;
-    
-    /**
-     * If this string is not empty AND the serve() option 'bubbleCssImports' is
-     * NOT set, then serve() will check CSS files for @import declarations that
-     * appear too late in the combined stylesheet. If found, serve() will prepend
-     * the output with this warning.
-     *
-     * @var string $importWarning
-     */
-    public static $importWarning = "/* See http://code.google.com/p/minify/wiki/CommonProblems#@imports_can_appear_in_invalid_locations_in_combined_CSS_files */\n";
-
-    /**
-     * Has the DOCUMENT_ROOT been set in user code?
-     * 
-     * @var bool
-     */
-    public static $isDocRootSet = false;
-
-    /**
-     * Specify a cache object (with identical interface as Minify_Cache_File) or
-     * a path to use with Minify_Cache_File.
-     * 
-     * If not called, Minify will not use a cache and, for each 200 response, will 
-     * need to recombine files, minify and encode the output.
-     *
-     * @param mixed $cache object with identical interface as Minify_Cache_File or
-     * a directory path, or null to disable caching. (default = '')
-     * 
-     * @param bool $fileLocking (default = true) This only applies if the first
-     * parameter is a string.
-     *
-     * @return null
-     */
-    public static function setCache($cache = '', $fileLocking = true)
-    {
-        if (is_string($cache)) {
-            self::$_cache = new Minify_Cache_File($cache, $fileLocking);
-        } else {
-            self::$_cache = $cache;
-        }
-    }
-    
-    /**
-     * Serve a request for a minified file. 
-     * 
-     * Here are the available options and defaults in the base controller:
-     * 
-     * 'isPublic' : send "public" instead of "private" in Cache-Control 
-     * headers, allowing shared caches to cache the output. (default true)
-     * 
-     * 'quiet' : set to true to have serve() return an array rather than sending
-     * any headers/output (default false)
-     * 
-     * 'encodeOutput' : set to false to disable content encoding, and not send
-     * the Vary header (default true)
-     * 
-     * 'encodeMethod' : generally you should let this be determined by 
-     * HTTP_Encoder (leave null), but you can force a particular encoding
-     * to be returned, by setting this to 'gzip' or '' (no encoding)
-     * 
-     * 'encodeLevel' : level of encoding compression (0 to 9, default 9)
-     * 
-     * 'contentTypeCharset' : appended to the Content-Type header sent. Set to a falsey
-     * value to remove. (default 'utf-8')  
-     * 
-     * 'maxAge' : set this to the number of seconds the client should use its cache
-     * before revalidating with the server. This sets Cache-Control: max-age and the
-     * Expires header. Unlike the old 'setExpires' setting, this setting will NOT
-     * prevent conditional GETs. Note this has nothing to do with server-side caching.
-     * 
-     * 'rewriteCssUris' : If true, serve() will automatically set the 'currentDir'
-     * minifier option to enable URI rewriting in CSS files (default true)
-     * 
-     * 'bubbleCssImports' : If true, all @import declarations in combined CSS
-     * files will be move to the top. Note this may alter effective CSS values
-     * due to a change in order. (default false)
-     * 
-     * 'debug' : set to true to minify all sources with the 'Lines' controller, which
-     * eases the debugging of combined files. This also prevents 304 responses.
-     * @see Minify_Lines::minify()
-     * 
-     * 'minifiers' : to override Minify's default choice of minifier function for 
-     * a particular content-type, specify your callback under the key of the 
-     * content-type:
-     * <code>
-     * // call customCssMinifier($css) for all CSS minification
-     * $options['minifiers'][Minify::TYPE_CSS] = 'customCssMinifier';
-     * 
-     * // don't minify Javascript at all
-     * $options['minifiers'][Minify::TYPE_JS] = '';
-     * </code>
-     * 
-     * 'minifierOptions' : to send options to the minifier function, specify your options
-     * under the key of the content-type. E.g. To send the CSS minifier an option: 
-     * <code>
-     * // give CSS minifier array('optionName' => 'optionValue') as 2nd argument 
-     * $options['minifierOptions'][Minify::TYPE_CSS]['optionName'] = 'optionValue';
-     * </code>
-     * 
-     * 'contentType' : (optional) this is only needed if your file extension is not 
-     * js/css/html. The given content-type will be sent regardless of source file
-     * extension, so this should not be used in a Groups config with other
-     * Javascript/CSS files.
-     * 
-     * Any controller options are documented in that controller's setupSources() method.
-     * 
-     * @param mixed $controller instance of subclass of Minify_Controller_Base or string
-     * name of controller. E.g. 'Files'
-     * 
-     * @param array $options controller/serve options
-     * 
-     * @return null|array if the 'quiet' option is set to true, an array
-     * with keys "success" (bool), "statusCode" (int), "content" (string), and
-     * "headers" (array).
-     *
-     * @throws Exception
-     */
-    public static function serve($controller, $options = array())
-    {
-        if (! self::$isDocRootSet && 0 === stripos(PHP_OS, 'win')) {
-            self::setDocRoot();
-        }
-
-        if (is_string($controller)) {
-            // make $controller into object
-            $class = 'Minify_Controller_' . $controller;
-            $controller = new $class();
-            /* @var Minify_Controller_Base $controller */
-        }
-        
-        // set up controller sources and mix remaining options with
-        // controller defaults
-        $options = $controller->setupSources($options);
-        $options = $controller->analyzeSources($options);
-        self::$_options = $controller->mixInDefaultOptions($options);
-        
-        // check request validity
-        if (! $controller->sources) {
-            // invalid request!
-            if (! self::$_options['quiet']) {
-                self::_errorExit(self::$_options['badRequestHeader'], self::URL_DEBUG);
-            } else {
-                list(,$statusCode) = explode(' ', self::$_options['badRequestHeader']);
-                return array(
-                    'success' => false
-                    ,'statusCode' => (int)$statusCode
-                    ,'content' => ''
-                    ,'headers' => array()
-                );
-            }
-        }
-        
-        self::$_controller = $controller;
-        
-        if (self::$_options['debug']) {
-            self::_setupDebug($controller->sources);
-            self::$_options['maxAge'] = 0;
-        }
-        
-        // determine encoding
-        if (self::$_options['encodeOutput']) {
-            $sendVary = true;
-            if (self::$_options['encodeMethod'] !== null) {
-                // controller specifically requested this
-                $contentEncoding = self::$_options['encodeMethod'];
-            } else {
-                // sniff request header
-                // depending on what the client accepts, $contentEncoding may be
-                // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling
-                // getAcceptedEncoding(false, false) leaves out compress and deflate as options.
-                list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false, false);
-                $sendVary = ! HTTP_Encoder::isBuggyIe();
-            }
-        } else {
-            self::$_options['encodeMethod'] = ''; // identity (no encoding)
-        }
-        
-        // check client cache
-        $cgOptions = array(
-            'lastModifiedTime' => self::$_options['lastModifiedTime']
-            ,'isPublic' => self::$_options['isPublic']
-            ,'encoding' => self::$_options['encodeMethod']
-        );
-        if (self::$_options['maxAge'] > 0) {
-            $cgOptions['maxAge'] = self::$_options['maxAge'];
-        } elseif (self::$_options['debug']) {
-            $cgOptions['invalidate'] = true;
-        }
-        $cg = new HTTP_ConditionalGet($cgOptions);
-        if ($cg->cacheIsValid) {
-            // client's cache is valid
-            if (! self::$_options['quiet']) {
-                $cg->sendHeaders();
-                return;
-            } else {
-                return array(
-                    'success' => true
-                    ,'statusCode' => 304
-                    ,'content' => ''
-                    ,'headers' => $cg->getHeaders()
-                );
-            }
-        } else {
-            // client will need output
-            $headers = $cg->getHeaders();
-            unset($cg);
-        }
-        
-        if (self::$_options['contentType'] === self::TYPE_CSS
-            && self::$_options['rewriteCssUris']) {
-            foreach($controller->sources as $key => $source) {
-                if ($source->filepath 
-                    && !isset($source->minifyOptions['currentDir'])
-                    && !isset($source->minifyOptions['prependRelativePath'])
-                ) {
-                    $source->minifyOptions['currentDir'] = dirname($source->filepath);
-                }
-            }
-        }
-        
-        // check server cache
-        if (null !== self::$_cache && ! self::$_options['debug']) {
-            // using cache
-            // the goal is to use only the cache methods to sniff the length and 
-            // output the content, as they do not require ever loading the file into
-            // memory.
-            $cacheId = self::_getCacheId();
-            $fullCacheId = (self::$_options['encodeMethod'])
-                ? $cacheId . '.gz'
-                : $cacheId;
-            // check cache for valid entry
-            $cacheIsReady = self::$_cache->isValid($fullCacheId, self::$_options['lastModifiedTime']); 
-            if ($cacheIsReady) {
-                $cacheContentLength = self::$_cache->getSize($fullCacheId);    
-            } else {
-                // generate & cache content
-                try {
-                    $content = self::_combineMinify();
-                } catch (Exception $e) {
-                    self::$_controller->log($e->getMessage());
-                    if (! self::$_options['quiet']) {
-                        self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
-                    }
-                    throw $e;
-                }
-                self::$_cache->store($cacheId, $content);
-                if (function_exists('gzencode') && self::$_options['encodeMethod']) {
-                    self::$_cache->store($cacheId . '.gz', gzencode($content, self::$_options['encodeLevel']));
-                }
-            }
-        } else {
-            // no cache
-            $cacheIsReady = false;
-            try {
-                $content = self::_combineMinify();
-            } catch (Exception $e) {
-                self::$_controller->log($e->getMessage());
-                if (! self::$_options['quiet']) {
-                    self::_errorExit(self::$_options['errorHeader'], self::URL_DEBUG);
-                }
-                throw $e;
-            }
-        }
-        if (! $cacheIsReady && self::$_options['encodeMethod']) {
-            // still need to encode
-            $content = gzencode($content, self::$_options['encodeLevel']);
-        }
-        
-        // add headers
-        $headers['Content-Length'] = $cacheIsReady
-            ? $cacheContentLength
-            : ((function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-                ? mb_strlen($content, '8bit')
-                : strlen($content)
-            );
-        $headers['Content-Type'] = self::$_options['contentTypeCharset']
-            ? self::$_options['contentType'] . '; charset=' . self::$_options['contentTypeCharset']
-            : self::$_options['contentType'];
-        if (self::$_options['encodeMethod'] !== '') {
-            $headers['Content-Encoding'] = $contentEncoding;
-        }
-        if (self::$_options['encodeOutput'] && $sendVary) {
-            $headers['Vary'] = 'Accept-Encoding';
-        }
-
-        if (! self::$_options['quiet']) {
-            // output headers & content
-            foreach ($headers as $name => $val) {
-                header($name . ': ' . $val);
-            }
-            if ($cacheIsReady) {
-                self::$_cache->display($fullCacheId);
-            } else {
-                echo $content;
-            }
-        } else {
-            return array(
-                'success' => true
-                ,'statusCode' => 200
-                ,'content' => $cacheIsReady
-                    ? self::$_cache->fetch($fullCacheId)
-                    : $content
-                ,'headers' => $headers
-            );
-        }
-    }
-    
-    /**
-     * Return combined minified content for a set of sources
-     *
-     * No internal caching will be used and the content will not be HTTP encoded.
-     * 
-     * @param array $sources array of filepaths and/or Minify_Source objects
-     * 
-     * @param array $options (optional) array of options for serve. By default
-     * these are already set: quiet = true, encodeMethod = '', lastModifiedTime = 0.
-     * 
-     * @return string
-     */
-    public static function combine($sources, $options = array())
-    {
-        $cache = self::$_cache;
-        self::$_cache = null;
-        $options = array_merge(array(
-            'files' => (array)$sources
-            ,'quiet' => true
-            ,'encodeMethod' => ''
-            ,'lastModifiedTime' => 0
-        ), $options);
-        $out = self::serve('Files', $options);
-        self::$_cache = $cache;
-        return $out['content'];
-    }
-    
-    /**
-     * Set $_SERVER['DOCUMENT_ROOT']. On IIS, the value is created from SCRIPT_FILENAME and SCRIPT_NAME.
-     * 
-     * @param string $docRoot value to use for DOCUMENT_ROOT
-     */
-    public static function setDocRoot($docRoot = '')
-    {
-        self::$isDocRootSet = true;
-        if ($docRoot) {
-            $_SERVER['DOCUMENT_ROOT'] = $docRoot;
-        } elseif (isset($_SERVER['SERVER_SOFTWARE'])
-                  && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/')) {
-            $_SERVER['DOCUMENT_ROOT'] = substr(
-                $_SERVER['SCRIPT_FILENAME']
-                ,0
-                ,strlen($_SERVER['SCRIPT_FILENAME']) - strlen($_SERVER['SCRIPT_NAME']));
-            $_SERVER['DOCUMENT_ROOT'] = rtrim($_SERVER['DOCUMENT_ROOT'], '\\');
-        }
-    }
-    
-    /**
-     * Any Minify_Cache_* object or null (i.e. no server cache is used)
-     *
-     * @var Minify_Cache_File
-     */
-    private static $_cache = null;
-    
-    /**
-     * Active controller for current request
-     *
-     * @var Minify_Controller_Base
-     */
-    protected static $_controller = null;
-    
-    /**
-     * Options for current request
-     *
-     * @var array
-     */
-    protected static $_options = null;
-
-    /**
-     * @param string $header
-     *
-     * @param string $url
-     */
-    protected static function _errorExit($header, $url)
-    {
-        $url = htmlspecialchars($url, ENT_QUOTES);
-        list(,$h1) = explode(' ', $header, 2);
-        $h1 = htmlspecialchars($h1);
-        // FastCGI environments require 3rd arg to header() to be set
-        list(, $code) = explode(' ', $header, 3);
-        header($header, true, $code);
-        header('Content-Type: text/html; charset=utf-8');
-        echo "<h1>$h1</h1>";
-        echo "<p>Please see <a href='$url'>$url</a>.</p>";
-        exit();
-    }
-
-    /**
-     * Set up sources to use Minify_Lines
-     *
-     * @param Minify_Source[] $sources Minify_Source instances
-     */
-    protected static function _setupDebug($sources)
-    {
-        foreach ($sources as $source) {
-            $source->minifier = array('Minify_Lines', 'minify');
-            $id = $source->getId();
-            $source->minifyOptions = array(
-                'id' => (is_file($id) ? basename($id) : $id)
-            );
-        }
-    }
-    
-    /**
-     * Combines sources and minifies the result.
-     *
-     * @return string
-     *
-     * @throws Exception
-     */
-    protected static function _combineMinify()
-    {
-        $type = self::$_options['contentType']; // ease readability
-        
-        // when combining scripts, make sure all statements separated and
-        // trailing single line comment is terminated
-        $implodeSeparator = ($type === self::TYPE_JS)
-            ? "\n;"
-            : '';
-        // allow the user to pass a particular array of options to each
-        // minifier (designated by type). source objects may still override
-        // these
-        $defaultOptions = isset(self::$_options['minifierOptions'][$type])
-            ? self::$_options['minifierOptions'][$type]
-            : array();
-        // if minifier not set, default is no minification. source objects
-        // may still override this
-        $defaultMinifier = isset(self::$_options['minifiers'][$type])
-            ? self::$_options['minifiers'][$type]
-            : false;
-
-        // process groups of sources with identical minifiers/options
-        $content = array();
-        $i = 0;
-        $l = count(self::$_controller->sources);
-        $groupToProcessTogether = array();
-        $lastMinifier = null;
-        $lastOptions = null;
-        do {
-            // get next source
-            $source = null;
-            if ($i < $l) {
-                $source = self::$_controller->sources[$i];
-                /* @var Minify_Source $source */
-                $sourceContent = $source->getContent();
-
-                // allow the source to override our minifier and options
-                $minifier = (null !== $source->minifier)
-                    ? $source->minifier
-                    : $defaultMinifier;
-                $options = (null !== $source->minifyOptions)
-                    ? array_merge($defaultOptions, $source->minifyOptions)
-                    : $defaultOptions;
-            }
-            // do we need to process our group right now?
-            if ($i > 0                               // yes, we have at least the first group populated
-                && (
-                    ! $source                        // yes, we ran out of sources
-                    || $type === self::TYPE_CSS      // yes, to process CSS individually (avoiding PCRE bugs/limits)
-                    || $minifier !== $lastMinifier   // yes, minifier changed
-                    || $options !== $lastOptions)    // yes, options changed
-                )
-            {
-                // minify previous sources with last settings
-                $imploded = implode($implodeSeparator, $groupToProcessTogether);
-                $groupToProcessTogether = array();
-                if ($lastMinifier) {
-                    try {
-                        $content[] = call_user_func($lastMinifier, $imploded, $lastOptions);
-                    } catch (Exception $e) {
-                        throw new Exception("Exception in minifier: " . $e->getMessage());
-                    }
-                } else {
-                    $content[] = $imploded;
-                }
-            }
-            // add content to the group
-            if ($source) {
-                $groupToProcessTogether[] = $sourceContent;
-                $lastMinifier = $minifier;
-                $lastOptions = $options;
-            }
-            $i++;
-        } while ($source);
-
-        $content = implode($implodeSeparator, $content);
-        
-        if ($type === self::TYPE_CSS && false !== strpos($content, '@import')) {
-            $content = self::_handleCssImports($content);
-        }
-        
-        // do any post-processing (esp. for editing build URIs)
-        if (self::$_options['postprocessorRequire']) {
-            require_once self::$_options['postprocessorRequire'];
-        }
-        if (self::$_options['postprocessor']) {
-            $content = call_user_func(self::$_options['postprocessor'], $content, $type);
-        }
-        return $content;
-    }
-    
-    /**
-     * Make a unique cache id for for this request.
-     * 
-     * Any settings that could affect output are taken into consideration  
-     *
-     * @param string $prefix
-     *
-     * @return string
-     */
-    protected static function _getCacheId($prefix = 'minify')
-    {
-        $name = preg_replace('/[^a-zA-Z0-9\\.=_,]/', '', self::$_controller->selectionId);
-        $name = preg_replace('/\\.+/', '.', $name);
-        $name = substr($name, 0, 100 - 34 - strlen($prefix));
-        $md5 = md5(serialize(array(
-            Minify_Source::getDigest(self::$_controller->sources)
-            ,self::$_options['minifiers'] 
-            ,self::$_options['minifierOptions']
-            ,self::$_options['postprocessor']
-            ,self::$_options['bubbleCssImports']
-            ,self::VERSION
-        )));
-        return "{$prefix}_{$name}_{$md5}";
-    }
-    
-    /**
-     * Bubble CSS @imports to the top or prepend a warning if an import is detected not at the top.
-     *
-     * @param string $css
-     *
-     * @return string
-     */
-    protected static function _handleCssImports($css)
-    {
-        if (self::$_options['bubbleCssImports']) {
-            // bubble CSS imports
-            preg_match_all('/@import.*?;/', $css, $imports);
-            $css = implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css);
-        } else if ('' !== self::$importWarning) {
-            // remove comments so we don't mistake { in a comment as a block
-            $noCommentCss = preg_replace('@/\\*[\\s\\S]*?\\*/@', '', $css);
-            $lastImportPos = strrpos($noCommentCss, '@import');
-            $firstBlockPos = strpos($noCommentCss, '{');
-            if (false !== $lastImportPos
-                && false !== $firstBlockPos
-                && $firstBlockPos < $lastImportPos
-            ) {
-                // { appears before @import : prepend warning
-                $css = self::$importWarning . $css;
-            }
-        }
-        return $css;
-    }
-}
diff --git a/inc/lib/minify/Minify/Build.php b/inc/lib/minify/Minify/Build.php
deleted file mode 100755
index 1185fbe7..00000000
--- a/inc/lib/minify/Minify/Build.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Class Minify_Build  
- * @package Minify
- */
-
-/**
- * Maintain a single last modification time for a group of Minify sources to
- * allow use of far off Expires headers in Minify.
- * 
- * <code>
- * // in config file
- * $groupSources = array(
- *   'js' => array('file1.js', 'file2.js')
- *   ,'css' => array('file1.css', 'file2.css', 'file3.css')
- * )
- * 
- * // during HTML generation
- * $jsBuild = new Minify_Build($groupSources['js']);
- * $cssBuild = new Minify_Build($groupSources['css']);
- * 
- * $script = "<script type='text/javascript' src='"
- *     . $jsBuild->uri('/min.php/js') . "'></script>";
- * $link = "<link rel='stylesheet' type='text/css' href='"
- *     . $cssBuild->uri('/min.php/css') . "'>";
- * 
- * // in min.php
- * Minify::serve('Groups', array(
- *   'groups' => $groupSources
- *   ,'setExpires' => (time() + 86400 * 365)
- * ));
- * </code>
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Build {
-    
-    /**
-     * Last modification time of all files in the build
-     * 
-     * @var int 
-     */
-    public $lastModified = 0;
-    
-    /**
-     * String to use as ampersand in uri(). Set this to '&' if
-     * you are not HTML-escaping URIs.
-     *
-     * @var string
-     */
-    public static $ampersand = '&amp;';
-    
-    /**
-     * Get a time-stamped URI
-     * 
-     * <code>
-     * echo $b->uri('/site.js');
-     * // outputs "/site.js?1678242"
-     * 
-     * echo $b->uri('/scriptaculous.js?load=effects');
-     * // outputs "/scriptaculous.js?load=effects&amp1678242"
-     * </code>
-     *
-     * @param string $uri
-     * @param boolean $forceAmpersand (default = false) Force the use of ampersand to 
-     * append the timestamp to the URI.
-     * @return string
-     */
-    public function uri($uri, $forceAmpersand = false) {
-        $sep = ($forceAmpersand || strpos($uri, '?') !== false)
-            ? self::$ampersand
-            : '?';
-        return "{$uri}{$sep}{$this->lastModified}";
-    }
-
-	/**
-     * Create a build object
-     * 
-     * @param array $sources array of Minify_Source objects and/or file paths
-     * 
-     * @return null
-     */
-    public function __construct($sources) 
-    {
-        $max = 0;
-        foreach ((array)$sources as $source) {
-            if ($source instanceof Minify_Source) {
-                $max = max($max, $source->lastModified);
-            } elseif (is_string($source)) {
-                if (0 === strpos($source, '//')) {
-                    $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1);
-                }
-                if (is_file($source)) {
-                    $max = max($max, filemtime($source));
-                }
-            }
-        }
-        $this->lastModified = $max;
-    }
-}
diff --git a/inc/lib/minify/Minify/CSS.php b/inc/lib/minify/Minify/CSS.php
deleted file mode 100755
index 32414551..00000000
--- a/inc/lib/minify/Minify/CSS.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php

-/**

- * Class Minify_CSS  

- * @package Minify

- */

-

-/**

- * Minify CSS

- *

- * This class uses Minify_CSS_Compressor and Minify_CSS_UriRewriter to 

- * minify CSS and rewrite relative URIs.

- * 

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author http://code.google.com/u/1stvamp/ (Issue 64 patch)

- */

-class Minify_CSS {

-    

-    /**

-     * Minify a CSS string

-     * 

-     * @param string $css

-     * 

-     * @param array $options available options:

-     * 

-     * 'preserveComments': (default true) multi-line comments that begin

-     * with "/*!" will be preserved with newlines before and after to

-     * enhance readability.

-     *

-     * 'removeCharsets': (default true) remove all @charset at-rules

-     * 

-     * 'prependRelativePath': (default null) if given, this string will be

-     * prepended to all relative URIs in import/url declarations

-     * 

-     * 'currentDir': (default null) if given, this is assumed to be the

-     * directory of the current CSS file. Using this, minify will rewrite

-     * all relative URIs in import/url declarations to correctly point to

-     * the desired files. For this to work, the files *must* exist and be

-     * visible by the PHP process.

-     *

-     * 'symlinks': (default = array()) If the CSS file is stored in 

-     * a symlink-ed directory, provide an array of link paths to

-     * target paths, where the link paths are within the document root. Because 

-     * paths need to be normalized for this to work, use "//" to substitute 

-     * the doc root in the link paths (the array keys). E.g.:

-     * <code>

-     * array('//symlink' => '/real/target/path') // unix

-     * array('//static' => 'D:\\staticStorage')  // Windows

-     * </code>

-     *

-     * 'docRoot': (default = $_SERVER['DOCUMENT_ROOT'])

-     * see Minify_CSS_UriRewriter::rewrite

-     * 

-     * @return string

-     */

-    public static function minify($css, $options = array()) 

-    {

-        $options = array_merge(array(

-            'compress' => true,

-            'removeCharsets' => true,

-            'preserveComments' => true,

-            'currentDir' => null,

-            'docRoot' => $_SERVER['DOCUMENT_ROOT'],

-            'prependRelativePath' => null,

-            'symlinks' => array(),

-        ), $options);

-        

-        if ($options['removeCharsets']) {

-            $css = preg_replace('/@charset[^;]+;\\s*/', '', $css);

-        }

-        if ($options['compress']) {

-            if (! $options['preserveComments']) {

-                $css = Minify_CSS_Compressor::process($css, $options);

-            } else {

-                $css = Minify_CommentPreserver::process(

-                    $css

-                    ,array('Minify_CSS_Compressor', 'process')

-                    ,array($options)

-                );

-            }

-        }

-        if (! $options['currentDir'] && ! $options['prependRelativePath']) {

-            return $css;

-        }

-        if ($options['currentDir']) {

-            return Minify_CSS_UriRewriter::rewrite(

-                $css

-                ,$options['currentDir']

-                ,$options['docRoot']

-                ,$options['symlinks']

-            );  

-        } else {

-            return Minify_CSS_UriRewriter::prepend(

-                $css

-                ,$options['prependRelativePath']

-            );

-        }

-    }

-}

diff --git a/inc/lib/minify/Minify/CSS/Compressor.php b/inc/lib/minify/Minify/CSS/Compressor.php
deleted file mode 100755
index c6cdd8b7..00000000
--- a/inc/lib/minify/Minify/CSS/Compressor.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php

-/**

- * Class Minify_CSS_Compressor 

- * @package Minify

- */

-

-/**

- * Compress CSS

- *

- * This is a heavy regex-based removal of whitespace, unnecessary

- * comments and tokens, and some CSS value minimization, where practical.

- * Many steps have been taken to avoid breaking comment-based hacks, 

- * including the ie5/mac filter (and its inversion), but expect tricky

- * hacks involving comment tokens in 'content' value strings to break

- * minimization badly. A test suite is available.

- * 

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author http://code.google.com/u/1stvamp/ (Issue 64 patch)

- */

-class Minify_CSS_Compressor {

-

-    /**

-     * Minify a CSS string

-     * 

-     * @param string $css

-     * 

-     * @param array $options (currently ignored)

-     * 

-     * @return string

-     */

-    public static function process($css, $options = array())

-    {

-        $obj = new Minify_CSS_Compressor($options);

-        return $obj->_process($css);

-    }

-    

-    /**

-     * @var array

-     */

-    protected $_options = null;

-    

-    /**

-     * Are we "in" a hack? I.e. are some browsers targetted until the next comment?

-     *

-     * @var bool

-     */

-    protected $_inHack = false;

-    

-    

-    /**

-     * Constructor

-     * 

-     * @param array $options (currently ignored)

-     */

-    private function __construct($options) {

-        $this->_options = $options;

-    }

-    

-    /**

-     * Minify a CSS string

-     * 

-     * @param string $css

-     * 

-     * @return string

-     */

-    protected function _process($css)

-    {

-        $css = str_replace("\r\n", "\n", $css);

-        

-        // preserve empty comment after '>'

-        // http://www.webdevout.net/css-hacks#in_css-selectors

-        $css = preg_replace('@>/\\*\\s*\\*/@', '>/*keep*/', $css);

-        

-        // preserve empty comment between property and value

-        // http://css-discuss.incutio.com/?page=BoxModelHack

-        $css = preg_replace('@/\\*\\s*\\*/\\s*:@', '/*keep*/:', $css);

-        $css = preg_replace('@:\\s*/\\*\\s*\\*/@', ':/*keep*/', $css);

-        

-        // apply callback to all valid comments (and strip out surrounding ws

-        $css = preg_replace_callback('@\\s*/\\*([\\s\\S]*?)\\*/\\s*@'

-            ,array($this, '_commentCB'), $css);

-

-        // remove ws around { } and last semicolon in declaration block

-        $css = preg_replace('/\\s*{\\s*/', '{', $css);

-        $css = preg_replace('/;?\\s*}\\s*/', '}', $css);

-        

-        // remove ws surrounding semicolons

-        $css = preg_replace('/\\s*;\\s*/', ';', $css);

-        

-        // remove ws around urls

-        $css = preg_replace('/

-                url\\(      # url(

-                \\s*

-                ([^\\)]+?)  # 1 = the URL (really just a bunch of non right parenthesis)

-                \\s*

-                \\)         # )

-            /x', 'url($1)', $css);

-        

-        // remove ws between rules and colons

-        $css = preg_replace('/

-                \\s*

-                ([{;])              # 1 = beginning of block or rule separator 

-                \\s*

-                ([\\*_]?[\\w\\-]+)  # 2 = property (and maybe IE filter)

-                \\s*

-                :

-                \\s*

-                (\\b|[#\'"-])        # 3 = first character of a value

-            /x', '$1$2:$3', $css);

-        

-        // remove ws in selectors

-        $css = preg_replace_callback('/

-                (?:              # non-capture

-                    \\s*

-                    [^~>+,\\s]+  # selector part

-                    \\s*

-                    [,>+~]       # combinators

-                )+

-                \\s*

-                [^~>+,\\s]+      # selector part

-                {                # open declaration block

-            /x'

-            ,array($this, '_selectorsCB'), $css);

-        

-        // minimize hex colors

-        $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i'

-            , '$1#$2$3$4$5', $css);

-        

-        // remove spaces between font families

-        $css = preg_replace_callback('/font-family:([^;}]+)([;}])/'

-            ,array($this, '_fontFamilyCB'), $css);

-        

-        $css = preg_replace('/@import\\s+url/', '@import url', $css);

-        

-        // replace any ws involving newlines with a single newline

-        $css = preg_replace('/[ \\t]*\\n+\\s*/', "\n", $css);

-        

-        // separate common descendent selectors w/ newlines (to limit line lengths)

-        $css = preg_replace('/([\\w#\\.\\*]+)\\s+([\\w#\\.\\*]+){/', "$1\n$2{", $css);

-        

-        // Use newline after 1st numeric value (to limit line lengths).

-        $css = preg_replace('/

-            ((?:padding|margin|border|outline):\\d+(?:px|em)?) # 1 = prop : 1st numeric value

-            \\s+

-            /x'

-            ,"$1\n", $css);

-        

-        // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/

-        $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css);

-            

-        return trim($css);

-    }

-    

-    /**

-     * Replace what looks like a set of selectors  

-     *

-     * @param array $m regex matches

-     * 

-     * @return string

-     */

-    protected function _selectorsCB($m)

-    {

-        // remove ws around the combinators

-        return preg_replace('/\\s*([,>+~])\\s*/', '$1', $m[0]);

-    }

-    

-    /**

-     * Process a comment and return a replacement

-     * 

-     * @param array $m regex matches

-     * 

-     * @return string

-     */

-    protected function _commentCB($m)

-    {

-        $hasSurroundingWs = (trim($m[0]) !== $m[1]);

-        $m = $m[1]; 

-        // $m is the comment content w/o the surrounding tokens, 

-        // but the return value will replace the entire comment.

-        if ($m === 'keep') {

-            return '/**/';

-        }

-        if ($m === '" "') {

-            // component of http://tantek.com/CSS/Examples/midpass.html

-            return '/*" "*/';

-        }

-        if (preg_match('@";\\}\\s*\\}/\\*\\s+@', $m)) {

-            // component of http://tantek.com/CSS/Examples/midpass.html

-            return '/*";}}/* */';

-        }

-        if ($this->_inHack) {

-            // inversion: feeding only to one browser

-            if (preg_match('@

-                    ^/               # comment started like /*/

-                    \\s*

-                    (\\S[\\s\\S]+?)  # has at least some non-ws content

-                    \\s*

-                    /\\*             # ends like /*/ or /**/

-                @x', $m, $n)) {

-                // end hack mode after this comment, but preserve the hack and comment content

-                $this->_inHack = false;

-                return "/*/{$n[1]}/**/";

-            }

-        }

-        if (substr($m, -1) === '\\') { // comment ends like \*/

-            // begin hack mode and preserve hack

-            $this->_inHack = true;

-            return '/*\\*/';

-        }

-        if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */

-            // begin hack mode and preserve hack

-            $this->_inHack = true;

-            return '/*/*/';

-        }

-        if ($this->_inHack) {

-            // a regular comment ends hack mode but should be preserved

-            $this->_inHack = false;

-            return '/**/';

-        }

-        // Issue 107: if there's any surrounding whitespace, it may be important, so 

-        // replace the comment with a single space

-        return $hasSurroundingWs // remove all other comments

-            ? ' '

-            : '';

-    }

-    

-    /**

-     * Process a font-family listing and return a replacement

-     * 

-     * @param array $m regex matches

-     * 

-     * @return string   

-     */

-    protected function _fontFamilyCB($m)

-    {

-        // Issue 210: must not eliminate WS between words in unquoted families

-        $pieces = preg_split('/(\'[^\']+\'|"[^"]+")/', $m[1], null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

-        $out = 'font-family:';

-        while (null !== ($piece = array_shift($pieces))) {

-            if ($piece[0] !== '"' && $piece[0] !== "'") {

-                $piece = preg_replace('/\\s+/', ' ', $piece);

-                $piece = preg_replace('/\\s?,\\s?/', ',', $piece);

-            }

-            $out .= $piece;

-        }

-        return $out . $m[2];

-    }

-}

diff --git a/inc/lib/minify/Minify/CSS/UriRewriter.php b/inc/lib/minify/Minify/CSS/UriRewriter.php
deleted file mode 100755
index 43cc2548..00000000
--- a/inc/lib/minify/Minify/CSS/UriRewriter.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- * Class Minify_CSS_UriRewriter  
- * @package Minify
- */
-
-/**
- * Rewrite file-relative URIs as root-relative in CSS files
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_CSS_UriRewriter {
-    
-    /**
-     * rewrite() and rewriteRelative() append debugging information here
-     *
-     * @var string
-     */
-    public static $debugText = '';
-    
-    /**
-     * In CSS content, rewrite file relative URIs as root relative
-     * 
-     * @param string $css
-     * 
-     * @param string $currentDir The directory of the current CSS file.
-     * 
-     * @param string $docRoot The document root of the web site in which 
-     * the CSS file resides (default = $_SERVER['DOCUMENT_ROOT']).
-     * 
-     * @param array $symlinks (default = array()) If the CSS file is stored in 
-     * a symlink-ed directory, provide an array of link paths to
-     * target paths, where the link paths are within the document root. Because 
-     * paths need to be normalized for this to work, use "//" to substitute 
-     * the doc root in the link paths (the array keys). E.g.:
-     * <code>
-     * array('//symlink' => '/real/target/path') // unix
-     * array('//static' => 'D:\\staticStorage')  // Windows
-     * </code>
-     * 
-     * @return string
-     */
-    public static function rewrite($css, $currentDir, $docRoot = null, $symlinks = array()) 
-    {
-        self::$_docRoot = self::_realpath(
-            $docRoot ? $docRoot : $_SERVER['DOCUMENT_ROOT']
-        );
-        self::$_currentDir = self::_realpath($currentDir);
-        self::$_symlinks = array();
-        
-        // normalize symlinks
-        foreach ($symlinks as $link => $target) {
-            $link = ($link === '//')
-                ? self::$_docRoot
-                : str_replace('//', self::$_docRoot . '/', $link);
-            $link = strtr($link, '/', DIRECTORY_SEPARATOR);
-            self::$_symlinks[$link] = self::_realpath($target);
-        }
-        
-        self::$debugText .= "docRoot    : " . self::$_docRoot . "\n"
-                          . "currentDir : " . self::$_currentDir . "\n";
-        if (self::$_symlinks) {
-            self::$debugText .= "symlinks : " . var_export(self::$_symlinks, 1) . "\n";
-        }
-        self::$debugText .= "\n";
-        
-        $css = self::_trimUrls($css);
-        
-        // rewrite
-        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
-            ,array(self::$className, '_processUriCB'), $css);
-        $css = preg_replace_callback('/url\\(\\s*([\'"](.*?)[\'"]|[^\\)\\s]+)\\s*\\)/'
-            ,array(self::$className, '_processUriCB'), $css);
-
-        return $css;
-    }
-    
-    /**
-     * In CSS content, prepend a path to relative URIs
-     * 
-     * @param string $css
-     * 
-     * @param string $path The path to prepend.
-     * 
-     * @return string
-     */
-    public static function prepend($css, $path)
-    {
-        self::$_prependPath = $path;
-        
-        $css = self::_trimUrls($css);
-        
-        // append
-        $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/'
-            ,array(self::$className, '_processUriCB'), $css);
-        $css = preg_replace_callback('/url\\(\\s*([\'"](.*?)[\'"]|[^\\)\\s]+)\\s*\\)/'
-            ,array(self::$className, '_processUriCB'), $css);
-
-        self::$_prependPath = null;
-        return $css;
-    }
-    
-    /**
-     * Get a root relative URI from a file relative URI
-     *
-     * <code>
-     * Minify_CSS_UriRewriter::rewriteRelative(
-     *       '../img/hello.gif'
-     *     , '/home/user/www/css'  // path of CSS file
-     *     , '/home/user/www'      // doc root
-     * );
-     * // returns '/img/hello.gif'
-     * 
-     * // example where static files are stored in a symlinked directory
-     * Minify_CSS_UriRewriter::rewriteRelative(
-     *       'hello.gif'
-     *     , '/var/staticFiles/theme'
-     *     , '/home/user/www'
-     *     , array('/home/user/www/static' => '/var/staticFiles')
-     * );
-     * // returns '/static/theme/hello.gif'
-     * </code>
-     * 
-     * @param string $uri file relative URI
-     * 
-     * @param string $realCurrentDir realpath of the current file's directory.
-     * 
-     * @param string $realDocRoot realpath of the site document root.
-     * 
-     * @param array $symlinks (default = array()) If the file is stored in 
-     * a symlink-ed directory, provide an array of link paths to
-     * real target paths, where the link paths "appear" to be within the document 
-     * root. E.g.:
-     * <code>
-     * array('/home/foo/www/not/real/path' => '/real/target/path') // unix
-     * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path')  // Windows
-     * </code>
-     * 
-     * @return string
-     */
-    public static function rewriteRelative($uri, $realCurrentDir, $realDocRoot, $symlinks = array())
-    {
-        // prepend path with current dir separator (OS-independent)
-        $path = strtr($realCurrentDir, '/', DIRECTORY_SEPARATOR)  
-            . DIRECTORY_SEPARATOR . strtr($uri, '/', DIRECTORY_SEPARATOR);
-        
-        self::$debugText .= "file-relative URI  : {$uri}\n"
-                          . "path prepended     : {$path}\n";
-        
-        // "unresolve" a symlink back to doc root
-        foreach ($symlinks as $link => $target) {
-            if (0 === strpos($path, $target)) {
-                // replace $target with $link
-                $path = $link . substr($path, strlen($target));
-                
-                self::$debugText .= "symlink unresolved : {$path}\n";
-                
-                break;
-            }
-        }
-        // strip doc root
-        $path = substr($path, strlen($realDocRoot));
-        
-        self::$debugText .= "docroot stripped   : {$path}\n";
-        
-        // fix to root-relative URI
-        $uri = strtr($path, '/\\', '//');
-        $uri = self::removeDots($uri);
-      
-        self::$debugText .= "traversals removed : {$uri}\n\n";
-        
-        return $uri;
-    }
-
-    /**
-     * Remove instances of "./" and "../" where possible from a root-relative URI
-     *
-     * @param string $uri
-     *
-     * @return string
-     */
-    public static function removeDots($uri)
-    {
-        $uri = str_replace('/./', '/', $uri);
-        // inspired by patch from Oleg Cherniy
-        do {
-            $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed);
-        } while ($changed);
-        return $uri;
-    }
-    
-    /**
-     * Defines which class to call as part of callbacks, change this
-     * if you extend Minify_CSS_UriRewriter
-     *
-     * @var string
-     */
-    protected static $className = 'Minify_CSS_UriRewriter';
-
-    /**
-     * Get realpath with any trailing slash removed. If realpath() fails,
-     * just remove the trailing slash.
-     * 
-     * @param string $path
-     * 
-     * @return mixed path with no trailing slash
-     */
-    protected static function _realpath($path)
-    {
-        $realPath = realpath($path);
-        if ($realPath !== false) {
-            $path = $realPath;
-        }
-        return rtrim($path, '/\\');
-    }
-
-    /**
-     * Directory of this stylesheet
-     *
-     * @var string
-     */
-    private static $_currentDir = '';
-
-    /**
-     * DOC_ROOT
-     *
-     * @var string
-     */
-    private static $_docRoot = '';
-
-    /**
-     * directory replacements to map symlink targets back to their
-     * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath'
-     *
-     * @var array
-     */
-    private static $_symlinks = array();
-
-    /**
-     * Path to prepend
-     *
-     * @var string
-     */
-    private static $_prependPath = null;
-
-    /**
-     * @param string $css
-     *
-     * @return string
-     */
-    private static function _trimUrls($css)
-    {
-        return preg_replace('/
-            url\\(      # url(
-            \\s*
-            ([^\\)]+?)  # 1 = URI (assuming does not contain ")")
-            \\s*
-            \\)         # )
-        /x', 'url($1)', $css);
-    }
-
-    /**
-     * @param array $m
-     *
-     * @return string
-     */
-    private static function _processUriCB($m)
-    {
-        // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'
-        $isImport = ($m[0][0] === '@');
-        // determine URI and the quote character (if any)
-        if ($isImport) {
-            $quoteChar = $m[1];
-            $uri = $m[2];
-        } else {
-            // $m[1] is either quoted or not
-            $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"')
-                ? $m[1][0]
-                : '';
-            $uri = ($quoteChar === '')
-                ? $m[1]
-                : substr($m[1], 1, strlen($m[1]) - 2);
-        }
-        // if not root/scheme relative and not starts with scheme
-        if (!preg_match('~^(/|[a-z]+\:)~', $uri)) {
-            // URI is file-relative: rewrite depending on options
-            if (self::$_prependPath === null) {
-                $uri = self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks);
-            } else {
-                $uri = self::$_prependPath . $uri;
-                if ($uri[0] === '/') {
-                    $root = '';
-                    $rootRelative = $uri;
-                    $uri = $root . self::removeDots($rootRelative);
-                } elseif (preg_match('@^((https?\:)?//([^/]+))/@', $uri, $m) && (false !== strpos($m[3], '.'))) {
-                    $root = $m[1];
-                    $rootRelative = substr($uri, strlen($root));
-                    $uri = $root . self::removeDots($rootRelative);
-                }
-            }
-        }
-        return $isImport
-            ? "@import {$quoteChar}{$uri}{$quoteChar}"
-            : "url({$quoteChar}{$uri}{$quoteChar})";
-    }
-}
diff --git a/inc/lib/minify/Minify/Cache/APC.php b/inc/lib/minify/Minify/Cache/APC.php
deleted file mode 100755
index 24ab0462..00000000
--- a/inc/lib/minify/Minify/Cache/APC.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_APC
- * @package Minify
- */
-
-/**
- * APC-based cache class for Minify
- * 
- * <code>
- * Minify::setCache(new Minify_Cache_APC());
- * </code>
- * 
- * @package Minify
- * @author Chris Edwards
- **/
-class Minify_Cache_APC {
-
-    /**
-     * Create a Minify_Cache_APC object, to be passed to
-     * Minify::setCache().
-     *
-     *
-     * @param int $expire seconds until expiration (default = 0
-     * meaning the item will not get an expiration date)
-     *
-     * @return null
-     */
-    public function __construct($expire = 0)
-    {
-        $this->_exp = $expire;
-    }
-
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id
-     *
-     * @param string $data
-     *
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        return apc_store($id, "{$_SERVER['REQUEST_TIME']}|{$data}", $this->_exp);
-    }
-
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id
-     *
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        if (! $this->_fetch($id)) {
-            return false;
-        }
-        return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-            ? mb_strlen($this->_data, '8bit')
-            : strlen($this->_data);
-    }
-
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id
-     *
-     * @param int $srcMtime mtime of the original source file(s)
-     *
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
-    }
-
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id
-     */
-    public function display($id)
-    {
-        echo $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-    /**
-     * Fetch the cached content
-     *
-     * @param string $id cache id
-     *
-     * @return string
-     */
-    public function fetch($id)
-    {
-        return $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-    private $_exp = null;
-
-    // cache of most recently fetched id
-    private $_lm = null;
-    private $_data = null;
-    private $_id = null;
-
-    /**
-     * Fetch data and timestamp from apc, store in instance
-     *
-     * @param string $id
-     *
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = apc_fetch($id);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
-}
diff --git a/inc/lib/minify/Minify/Cache/File.php b/inc/lib/minify/Minify/Cache/File.php
deleted file mode 100755
index c228eb2b..00000000
--- a/inc/lib/minify/Minify/Cache/File.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_File  
- * @package Minify
- */
-
-class Minify_Cache_File {
-    
-    public function __construct($path = '', $fileLocking = false)
-    {
-        if (! $path) {
-            $path = self::tmp();
-        }
-        $this->_locking = $fileLocking;
-        $this->_path = $path;
-    }
-
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @param string $data
-     * 
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        $flag = $this->_locking
-            ? LOCK_EX
-            : null;
-        $file = $this->_path . '/' . $id;
-        if (! @file_put_contents($file, $data, $flag)) {
-            $this->_log("Minify_Cache_File: Write failed to '$file'");
-        }
-        // write control
-        if ($data !== $this->fetch($id)) {
-            @unlink($file);
-            $this->_log("Minify_Cache_File: Post-write read failed for '$file'");
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        return filesize($this->_path . '/' . $id);
-    }
-    
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @param int $srcMtime mtime of the original source file(s)
-     * 
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        $file = $this->_path . '/' . $id;
-        return (is_file($file) && (filemtime($file) >= $srcMtime));
-    }
-    
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id (e.g. a filename)
-     */
-    public function display($id)
-    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            flock($fp, LOCK_SH);
-            fpassthru($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-        } else {
-            readfile($this->_path . '/' . $id);            
-        }
-    }
-    
-	/**
-     * Fetch the cached content
-     *
-     * @param string $id cache id (e.g. a filename)
-     * 
-     * @return string
-     */
-    public function fetch($id)
-    {
-        if ($this->_locking) {
-            $fp = fopen($this->_path . '/' . $id, 'rb');
-            if (!$fp) {
-                return false;
-            }
-            flock($fp, LOCK_SH);
-            $ret = stream_get_contents($fp);
-            flock($fp, LOCK_UN);
-            fclose($fp);
-            return $ret;
-        } else {
-            return file_get_contents($this->_path . '/' . $id);
-        }
-    }
-    
-    /**
-     * Fetch the cache path used
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Get a usable temp directory
-     *
-     * Adapted from Solar/Dir.php
-     * @author Paul M. Jones <pmjones@solarphp.com>
-     * @license http://opensource.org/licenses/bsd-license.php BSD
-     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
-     *
-     * @return string
-     */
-    public static function tmp()
-    {
-        static $tmp = null;
-        if (! $tmp) {
-            $tmp = function_exists('sys_get_temp_dir')
-                ? sys_get_temp_dir()
-                : self::_tmp();
-            $tmp = rtrim($tmp, DIRECTORY_SEPARATOR);
-        }
-        return $tmp;
-    }
-
-    /**
-     * Returns the OS-specific directory for temporary files
-     *
-     * @author Paul M. Jones <pmjones@solarphp.com>
-     * @license http://opensource.org/licenses/bsd-license.php BSD
-     * @link http://solarphp.com/trac/core/browser/trunk/Solar/Dir.php
-     *
-     * @return string
-     */
-    protected static function _tmp()
-    {
-        // non-Windows system?
-        if (strtolower(substr(PHP_OS, 0, 3)) != 'win') {
-            $tmp = empty($_ENV['TMPDIR']) ? getenv('TMPDIR') : $_ENV['TMPDIR'];
-            if ($tmp) {
-                return $tmp;
-            } else {
-                return '/tmp';
-            }
-        }
-        // Windows 'TEMP'
-        $tmp = empty($_ENV['TEMP']) ? getenv('TEMP') : $_ENV['TEMP'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // Windows 'TMP'
-        $tmp = empty($_ENV['TMP']) ? getenv('TMP') : $_ENV['TMP'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // Windows 'windir'
-        $tmp = empty($_ENV['windir']) ? getenv('windir') : $_ENV['windir'];
-        if ($tmp) {
-            return $tmp;
-        }
-        // final fallback for Windows
-        return getenv('SystemRoot') . '\\temp';
-    }
-
-    /**
-     * Send message to the Minify logger
-     * @param string $msg
-     * @return null
-     */
-    protected function _log($msg)
-    {
-        Minify_Logger::log($msg);
-    }
-    
-    private $_path = null;
-    private $_locking = null;
-}
diff --git a/inc/lib/minify/Minify/Cache/Memcache.php b/inc/lib/minify/Minify/Cache/Memcache.php
deleted file mode 100755
index 72bf454b..00000000
--- a/inc/lib/minify/Minify/Cache/Memcache.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_Memcache
- * @package Minify
- */
-
-/**
- * Memcache-based cache class for Minify
- * 
- * <code>
- * // fall back to disk caching if memcache can't connect
- * $memcache = new Memcache;
- * if ($memcache->connect('localhost', 11211)) {
- *     Minify::setCache(new Minify_Cache_Memcache($memcache));
- * } else {
- *     Minify::setCache();
- * }
- * </code>
- **/
-class Minify_Cache_Memcache {
-    
-    /**
-     * Create a Minify_Cache_Memcache object, to be passed to 
-     * Minify::setCache().
-     *
-     * @param Memcache $memcache already-connected instance
-     * 
-     * @param int $expire seconds until expiration (default = 0
-     * meaning the item will not get an expiration date)
-     * 
-     * @return null
-     */
-    public function __construct($memcache, $expire = 0)
-    {
-        $this->_mc = $memcache;
-        $this->_exp = $expire;
-    }
-    
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id
-     * 
-     * @param string $data
-     * 
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp);
-    }
-    
-    
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id
-     * 
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        if (! $this->_fetch($id)) {
-            return false;
-        }
-        return (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-            ? mb_strlen($this->_data, '8bit')
-            : strlen($this->_data);
-    }
-    
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id
-     * 
-     * @param int $srcMtime mtime of the original source file(s)
-     * 
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        return ($this->_fetch($id) && ($this->_lm >= $srcMtime));
-    }
-    
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id
-     */
-    public function display($id)
-    {
-        echo $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-    
-	/**
-     * Fetch the cached content
-     *
-     * @param string $id cache id
-     * 
-     * @return string
-     */
-    public function fetch($id)
-    {
-        return $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-    
-    private $_mc = null;
-    private $_exp = null;
-    
-    // cache of most recently fetched id
-    private $_lm = null;
-    private $_data = null;
-    private $_id = null;
-    
-	/**
-     * Fetch data and timestamp from memcache, store in instance
-     * 
-     * @param string $id
-     * 
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = $this->_mc->get($id);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
-}
diff --git a/inc/lib/minify/Minify/Cache/ZendPlatform.php b/inc/lib/minify/Minify/Cache/ZendPlatform.php
deleted file mode 100755
index 3130d69a..00000000
--- a/inc/lib/minify/Minify/Cache/ZendPlatform.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/**
- * Class Minify_Cache_ZendPlatform
- * @package Minify
- */
-
-
-/**
- * ZendPlatform-based cache class for Minify
- *
- * Based on Minify_Cache_APC, uses output_cache_get/put (currently deprecated)
- * 
- * <code>
- * Minify::setCache(new Minify_Cache_ZendPlatform());
- * </code>
- *
- * @package Minify
- * @author Patrick van Dissel
- */
-class Minify_Cache_ZendPlatform {
-
-
-    /**
-     * Create a Minify_Cache_ZendPlatform object, to be passed to
-     * Minify::setCache().
-     *
-     * @param int $expire seconds until expiration (default = 0
-     * meaning the item will not get an expiration date)
-     *
-     * @return null
-     */
-    public function __construct($expire = 0)
-    {
-        $this->_exp = $expire;
-    }
-
-
-    /**
-     * Write data to cache.
-     *
-     * @param string $id cache id
-     *
-     * @param string $data
-     *
-     * @return bool success
-     */
-    public function store($id, $data)
-    {
-        return output_cache_put($id, "{$_SERVER['REQUEST_TIME']}|{$data}");
-    }
-
-
-    /**
-     * Get the size of a cache entry
-     *
-     * @param string $id cache id
-     *
-     * @return int size in bytes
-     */
-    public function getSize($id)
-    {
-        return $this->_fetch($id)
-            ? strlen($this->_data)
-            : false;
-    }
-
-
-    /**
-     * Does a valid cache entry exist?
-     *
-     * @param string $id cache id
-     *
-     * @param int $srcMtime mtime of the original source file(s)
-     *
-     * @return bool exists
-     */
-    public function isValid($id, $srcMtime)
-    {
-        $ret = ($this->_fetch($id) && ($this->_lm >= $srcMtime));
-        return $ret;
-    }
-
-
-    /**
-     * Send the cached content to output
-     *
-     * @param string $id cache id
-     */
-    public function display($id)
-    {
-        echo $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-
-    /**
-     * Fetch the cached content
-     *
-     * @param string $id cache id
-     *
-     * @return string
-     */
-    public function fetch($id)
-    {
-        return $this->_fetch($id)
-            ? $this->_data
-            : '';
-    }
-
-
-    private $_exp = null;
-
-
-    // cache of most recently fetched id
-    private $_lm = null;
-    private $_data = null;
-    private $_id = null;
-
-
-    /**
-     * Fetch data and timestamp from ZendPlatform, store in instance
-     *
-     * @param string $id
-     *
-     * @return bool success
-     */
-    private function _fetch($id)
-    {
-        if ($this->_id === $id) {
-            return true;
-        }
-        $ret = output_cache_get($id, $this->_exp);
-        if (false === $ret) {
-            $this->_id = null;
-            return false;
-        }
-        list($this->_lm, $this->_data) = explode('|', $ret, 2);
-        $this->_id = $id;
-        return true;
-    }
-}
diff --git a/inc/lib/minify/Minify/CommentPreserver.php b/inc/lib/minify/Minify/CommentPreserver.php
deleted file mode 100755
index 7a359bf9..00000000
--- a/inc/lib/minify/Minify/CommentPreserver.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * Class Minify_CommentPreserver 
- * @package Minify
- */
-
-/**
- * Process a string in pieces preserving C-style comments that begin with "/*!"
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_CommentPreserver {
-    
-    /**
-     * String to be prepended to each preserved comment
-     *
-     * @var string
-     */
-    public static $prepend = "\n";
-    
-    /**
-     * String to be appended to each preserved comment
-     *
-     * @var string
-     */
-    public static $append = "\n";
-    
-    /**
-     * Process a string outside of C-style comments that begin with "/*!"
-     *
-     * On each non-empty string outside these comments, the given processor 
-     * function will be called. The comments will be surrounded by 
-     * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append.
-     * 
-     * @param string $content
-     * @param callback $processor function
-     * @param array $args array of extra arguments to pass to the processor 
-     * function (default = array())
-     * @return string
-     */
-    public static function process($content, $processor, $args = array())
-    {
-        $ret = '';
-        while (true) {
-            list($beforeComment, $comment, $afterComment) = self::_nextComment($content);
-            if ('' !== $beforeComment) {
-                $callArgs = $args;
-                array_unshift($callArgs, $beforeComment);
-                $ret .= call_user_func_array($processor, $callArgs);    
-            }
-            if (false === $comment) {
-                break;
-            }
-            $ret .= $comment;
-            $content = $afterComment;
-        }
-        return $ret;
-    }
-    
-    /**
-     * Extract comments that YUI Compressor preserves.
-     * 
-     * @param string $in input
-     * 
-     * @return array 3 elements are returned. If a YUI comment is found, the
-     * 2nd element is the comment and the 1st and 3rd are the surrounding
-     * strings. If no comment is found, the entire string is returned as the 
-     * 1st element and the other two are false.
-     */
-    private static function _nextComment($in)
-    {
-        if (
-            false === ($start = strpos($in, '/*!'))
-            || false === ($end = strpos($in, '*/', $start + 3))
-        ) {
-            return array($in, false, false);
-        }
-        $ret = array(
-            substr($in, 0, $start)
-            ,self::$prepend . '/*!' . substr($in, $start + 3, $end - $start - 1) . self::$append
-        );
-        $endChars = (strlen($in) - $end - 2);
-        $ret[] = (0 === $endChars)
-            ? ''
-            : substr($in, -$endChars);
-        return $ret;
-    }
-}
diff --git a/inc/lib/minify/Minify/Controller/Base.php b/inc/lib/minify/Minify/Controller/Base.php
deleted file mode 100755
index 5a863290..00000000
--- a/inc/lib/minify/Minify/Controller/Base.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Base  
- * @package Minify
- */
-
-/**
- * Base class for Minify controller
- * 
- * The controller class validates a request and uses it to create sources
- * for minification and set options like contentType. It's also responsible
- * for loading minifier code upon request.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-abstract class Minify_Controller_Base {
-    
-    /**
-     * Setup controller sources and set an needed options for Minify::source
-     * 
-     * You must override this method in your subclass controller to set 
-     * $this->sources. If the request is NOT valid, make sure $this->sources 
-     * is left an empty array. Then strip any controller-specific options from 
-     * $options and return it. To serve files, $this->sources must be an array of
-     * Minify_Source objects.
-     * 
-     * @param array $options controller and Minify options
-     * 
-     * @return array $options Minify::serve options
-     */
-    abstract public function setupSources($options);
-    
-    /**
-     * Get default Minify options for this controller.
-     * 
-     * Override in subclass to change defaults
-     *
-     * @return array options for Minify
-     */
-    public function getDefaultMinifyOptions() {
-        return array(
-            'isPublic' => true
-            ,'encodeOutput' => function_exists('gzdeflate')
-            ,'encodeMethod' => null // determine later
-            ,'encodeLevel' => 9
-            ,'minifierOptions' => array() // no minifier options
-            ,'contentTypeCharset' => 'utf-8'
-            ,'maxAge' => 1800 // 30 minutes
-            ,'rewriteCssUris' => true
-            ,'bubbleCssImports' => false
-            ,'quiet' => false // serve() will send headers and output
-            ,'debug' => false
-            
-            // if you override these, the response codes MUST be directly after
-            // the first space.
-            ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request'
-            ,'errorHeader'      => 'HTTP/1.0 500 Internal Server Error'
-            
-            // callback function to see/modify content of all sources
-            ,'postprocessor' => null
-            // file to require to load preprocessor
-            ,'postprocessorRequire' => null
-        );
-    }  
-
-    /**
-     * Get default minifiers for this controller.
-     * 
-     * Override in subclass to change defaults
-     *
-     * @return array minifier callbacks for common types
-     */
-    public function getDefaultMinifers() {
-        $ret[Minify::TYPE_JS] = array('JSMin', 'minify');
-        $ret[Minify::TYPE_CSS] = array('Minify_CSS', 'minify');
-        $ret[Minify::TYPE_HTML] = array('Minify_HTML', 'minify');
-        return $ret;
-    }
-    
-    /**
-     * Is a user-given file within an allowable directory, existing,
-     * and having an extension js/css/html/txt ?
-     * 
-     * This is a convenience function for controllers that have to accept
-     * user-given paths
-     *
-     * @param string $file full file path (already processed by realpath())
-     * 
-     * @param array $safeDirs directories where files are safe to serve. Files can also
-     * be in subdirectories of these directories.
-     * 
-     * @return bool file is safe
-     *
-     * @deprecated use checkAllowDirs, checkNotHidden instead
-     */
-    public static function _fileIsSafe($file, $safeDirs)
-    {
-        $pathOk = false;
-        foreach ((array)$safeDirs as $safeDir) {
-            if (strpos($file, $safeDir) === 0) {
-                $pathOk = true;
-                break;
-            }
-        }
-        $base = basename($file);
-        if (! $pathOk || ! is_file($file) || $base[0] === '.') {
-            return false;
-        }
-        list($revExt) = explode('.', strrev($base));
-        return in_array(strrev($revExt), array('js', 'css', 'html', 'txt'));
-    }
-
-    /**
-     * @param string $file
-     * @param array $allowDirs
-     * @param string $uri
-     * @return bool
-     * @throws Exception
-     */
-    public static function checkAllowDirs($file, $allowDirs, $uri)
-    {
-        foreach ((array)$allowDirs as $allowDir) {
-            if (strpos($file, $allowDir) === 0) {
-                return true;
-            }
-        }
-        throw new Exception("File '$file' is outside \$allowDirs. If the path is"
-            . " resolved via an alias/symlink, look into the \$min_symlinks option."
-            . " E.g. \$min_symlinks['/" . dirname($uri) . "'] = '" . dirname($file) . "';");
-    }
-
-    /**
-     * @param string $file
-     * @throws Exception
-     */
-    public static function checkNotHidden($file)
-    {
-        $b = basename($file);
-        if (0 === strpos($b, '.')) {
-            throw new Exception("Filename '$b' starts with period (may be hidden)");
-        }
-    }
-
-    /**
-     * instances of Minify_Source, which provide content and any individual minification needs.
-     *
-     * @var array
-     * 
-     * @see Minify_Source
-     */
-    public $sources = array();
-    
-    /**
-     * Short name to place inside cache id
-     *
-     * The setupSources() method may choose to set this, making it easier to
-     * recognize a particular set of sources/settings in the cache folder. It
-     * will be filtered and truncated to make the final cache id <= 250 bytes.
-     * 
-     * @var string
-     */
-    public $selectionId = '';
-
-    /**
-     * Mix in default controller options with user-given options
-     * 
-     * @param array $options user options
-     * 
-     * @return array mixed options
-     */
-    public final function mixInDefaultOptions($options)
-    {
-        $ret = array_merge(
-            $this->getDefaultMinifyOptions(), $options
-        );
-        if (! isset($options['minifiers'])) {
-            $options['minifiers'] = array();
-        }
-        $ret['minifiers'] = array_merge(
-            $this->getDefaultMinifers(), $options['minifiers']
-        );
-        return $ret;
-    }
-    
-    /**
-     * Analyze sources (if there are any) and set $options 'contentType' 
-     * and 'lastModifiedTime' if they already aren't.
-     * 
-     * @param array $options options for Minify
-     * 
-     * @return array options for Minify
-     */
-    public final function analyzeSources($options = array()) 
-    {
-        if ($this->sources) {
-            if (! isset($options['contentType'])) {
-                $options['contentType'] = Minify_Source::getContentType($this->sources);
-            }
-            // last modified is needed for caching, even if setExpires is set
-            if (! isset($options['lastModifiedTime'])) {
-                $max = 0;
-                foreach ($this->sources as $source) {
-                    $max = max($source->lastModified, $max);
-                }
-                $options['lastModifiedTime'] = $max;
-            }    
-        }
-        return $options;
-    }
-
-    /**
-     * Send message to the Minify logger
-     *
-     * @param string $msg
-     *
-     * @return null
-     */
-    public function log($msg) {
-        Minify_Logger::log($msg);
-    }
-}
diff --git a/inc/lib/minify/Minify/Controller/Files.php b/inc/lib/minify/Minify/Controller/Files.php
deleted file mode 100755
index f084cd07..00000000
--- a/inc/lib/minify/Minify/Controller/Files.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Files  
- * @package Minify
- */
-
-/**
- * Controller class for minifying a set of files
- * 
- * E.g. the following would serve the minified Javascript for a site
- * <code>
- * Minify::serve('Files', array(
- *     'files' => array(
- *         '//js/jquery.js'
- *         ,'//js/plugins.js'
- *         ,'/home/username/file.js'
- *     )
- * ));
- * </code>
- * 
- * As a shortcut, the controller will replace "//" at the beginning
- * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'.
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Files extends Minify_Controller_Base {
-    
-    /**
-     * Set up file sources
-     * 
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     * Controller options:
-     * 
-     * 'files': (required) array of complete file paths, or a single path
-     */
-    public function setupSources($options) {
-        // strip controller options
-        
-        $files = $options['files'];
-        // if $files is a single object, casting will break it
-        if (is_object($files)) {
-            $files = array($files);
-        } elseif (! is_array($files)) {
-            $files = (array)$files;
-        }
-        unset($options['files']);
-        
-        $sources = array();
-        foreach ($files as $file) {
-            if ($file instanceof Minify_Source) {
-                $sources[] = $file;
-                continue;
-            }
-            if (0 === strpos($file, '//')) {
-                $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-            }
-            $realPath = realpath($file);
-            if (is_file($realPath)) {
-                $sources[] = new Minify_Source(array(
-                    'filepath' => $realPath
-                ));    
-            } else {
-                $this->log("The path \"{$file}\" could not be found (or was not a file)");
-                return $options;
-            }
-        }
-        if ($sources) {
-            $this->sources = $sources;
-        }
-        return $options;
-    }
-}
-
diff --git a/inc/lib/minify/Minify/Controller/Groups.php b/inc/lib/minify/Minify/Controller/Groups.php
deleted file mode 100755
index c4c25db1..00000000
--- a/inc/lib/minify/Minify/Controller/Groups.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Groups  
- * @package Minify
- */
-
-/**
- * Controller class for serving predetermined groups of minimized sets, selected
- * by PATH_INFO
- * 
- * <code>
- * Minify::serve('Groups', array( 
- *     'groups' => array(
- *         'css' => array('//css/type.css', '//css/layout.css')
- *        ,'js' => array('//js/jquery.js', '//js/site.js')
- *     )
- * ));
- * </code>
- * 
- * If the above code were placed in /serve.php, it would enable the URLs
- * /serve.php/js and /serve.php/css
- * 
- * As a shortcut, the controller will replace "//" at the beginning
- * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Groups extends Minify_Controller_Base {
-    
-    /**
-     * Set up groups of files as sources
-     * 
-     * @param array $options controller and Minify options
-     *
-     * 'groups': (required) array mapping PATH_INFO strings to arrays
-     * of complete file paths. @see Minify_Controller_Groups
-     *
-     * @return array Minify options
-     */
-    public function setupSources($options) {
-        // strip controller options
-        $groups = $options['groups'];
-        unset($options['groups']);
-        
-        // mod_fcgid places PATH_INFO in ORIG_PATH_INFO
-        $pi = isset($_SERVER['ORIG_PATH_INFO'])
-            ? substr($_SERVER['ORIG_PATH_INFO'], 1) 
-            : (isset($_SERVER['PATH_INFO'])
-                ? substr($_SERVER['PATH_INFO'], 1) 
-                : false
-            );
-        if (false === $pi || ! isset($groups[$pi])) {
-            // no PATH_INFO or not a valid group
-            $this->log("Missing PATH_INFO or no group set for \"$pi\"");
-            return $options;
-        }
-        $sources = array();
-        
-        $files = $groups[$pi];
-        // if $files is a single object, casting will break it
-        if (is_object($files)) {
-            $files = array($files);
-        } elseif (! is_array($files)) {
-            $files = (array)$files;
-        }
-        foreach ($files as $file) {
-            if ($file instanceof Minify_Source) {
-                $sources[] = $file;
-                continue;
-            }
-            if (0 === strpos($file, '//')) {
-                $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-            }
-            $realPath = realpath($file);
-            if (is_file($realPath)) {
-                $sources[] = new Minify_Source(array(
-                    'filepath' => $realPath
-                ));    
-            } else {
-                $this->log("The path \"{$file}\" could not be found (or was not a file)");
-                return $options;
-            }
-        }
-        if ($sources) {
-            $this->sources = $sources;
-        }
-        return $options;
-    }
-}
-
diff --git a/inc/lib/minify/Minify/Controller/MinApp.php b/inc/lib/minify/Minify/Controller/MinApp.php
deleted file mode 100755
index 6943ee6b..00000000
--- a/inc/lib/minify/Minify/Controller/MinApp.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_MinApp  
- * @package Minify
- */
-
-/**
- * Controller class for requests to /min/index.php
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_MinApp extends Minify_Controller_Base {
-    
-    /**
-     * Set up groups of files as sources
-     * 
-     * @param array $options controller and Minify options
-     *
-     * @return array Minify options
-     */
-    public function setupSources($options) {
-        // PHP insecure by default: realpath() and other FS functions can't handle null bytes.
-        foreach (array('g', 'b', 'f') as $key) {
-            if (isset($_GET[$key])) {
-                $_GET[$key] = str_replace("\x00", '', (string)$_GET[$key]);
-            }
-        }
-
-        // filter controller options
-        $cOptions = array_merge(
-            array(
-                'allowDirs' => '//'
-                ,'groupsOnly' => false
-                ,'groups' => array()
-                ,'noMinPattern' => '@[-\\.]min\\.(?:js|css)$@i' // matched against basename
-            )
-            ,(isset($options['minApp']) ? $options['minApp'] : array())
-        );
-        unset($options['minApp']);
-        $sources = array();
-        $this->selectionId = '';
-        $firstMissingResource = null;
-        if (isset($_GET['g'])) {
-            // add group(s)
-            $this->selectionId .= 'g=' . $_GET['g'];
-            $keys = explode(',', $_GET['g']);
-            if ($keys != array_unique($keys)) {
-                $this->log("Duplicate group key found.");
-                return $options;
-            }
-            $keys = explode(',', $_GET['g']);
-            foreach ($keys as $key) {
-                if (! isset($cOptions['groups'][$key])) {
-                    $this->log("A group configuration for \"{$key}\" was not found");
-                    return $options;
-                }
-                $files = $cOptions['groups'][$key];
-                // if $files is a single object, casting will break it
-                if (is_object($files)) {
-                    $files = array($files);
-                } elseif (! is_array($files)) {
-                    $files = (array)$files;
-                }
-                foreach ($files as $file) {
-                    if ($file instanceof Minify_Source) {
-                        $sources[] = $file;
-                        continue;
-                    }
-                    if (0 === strpos($file, '//')) {
-                        $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1);
-                    }
-                    $realpath = realpath($file);
-                    if ($realpath && is_file($realpath)) {
-                        $sources[] = $this->_getFileSource($realpath, $cOptions);
-                    } else {
-                        $this->log("The path \"{$file}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
-                        if (null === $firstMissingResource) {
-                            $firstMissingResource = basename($file);
-                            continue;
-                        } else {
-                            $secondMissingResource = basename($file);
-                            $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource'");
-                            return $options;
-                        }
-                    }
-                }
-                if ($sources) {
-                    try {
-                        $this->checkType($sources[0]);
-                    } catch (Exception $e) {
-                        $this->log($e->getMessage());
-                        return $options;
-                    }
-                }
-            }
-        }
-        if (! $cOptions['groupsOnly'] && isset($_GET['f'])) {
-            // try user files
-            // The following restrictions are to limit the URLs that minify will
-            // respond to.
-            if (// verify at least one file, files are single comma separated, 
-                // and are all same extension
-                ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f'], $m)
-                // no "//"
-                || strpos($_GET['f'], '//') !== false
-                // no "\"
-                || strpos($_GET['f'], '\\') !== false
-            ) {
-                $this->log("GET param 'f' was invalid");
-                return $options;
-            }
-            $ext = ".{$m[1]}";
-            try {
-                $this->checkType($m[1]);
-            } catch (Exception $e) {
-                $this->log($e->getMessage());
-                return $options;
-            }
-            $files = explode(',', $_GET['f']);
-            if ($files != array_unique($files)) {
-                $this->log("Duplicate files were specified");
-                return $options;
-            }
-            if (isset($_GET['b'])) {
-                // check for validity
-                if (preg_match('@^[^/]+(?:/[^/]+)*$@', $_GET['b'])
-                    && false === strpos($_GET['b'], '..')
-                    && $_GET['b'] !== '.') {
-                    // valid base
-                    $base = "/{$_GET['b']}/";       
-                } else {
-                    $this->log("GET param 'b' was invalid");
-                    return $options;
-                }
-            } else {
-                $base = '/';
-            }
-            $allowDirs = array();
-            foreach ((array)$cOptions['allowDirs'] as $allowDir) {
-                $allowDirs[] = realpath(str_replace('//', $_SERVER['DOCUMENT_ROOT'] . '/', $allowDir));
-            }
-            $basenames = array(); // just for cache id
-            foreach ($files as $file) {
-                $uri = $base . $file;
-                $path = $_SERVER['DOCUMENT_ROOT'] . $uri;
-                $realpath = realpath($path);
-                if (false === $realpath || ! is_file($realpath)) {
-                    $this->log("The path \"{$path}\" (realpath \"{$realpath}\") could not be found (or was not a file)");
-                    if (null === $firstMissingResource) {
-                        $firstMissingResource = $uri;
-                        continue;
-                    } else {
-                        $secondMissingResource = $uri;
-                        $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource`'");
-                        return $options;
-                    }
-                }
-                try {
-                    parent::checkNotHidden($realpath);
-                    parent::checkAllowDirs($realpath, $allowDirs, $uri);
-                } catch (Exception $e) {
-                    $this->log($e->getMessage());
-                    return $options;
-                }
-                $sources[] = $this->_getFileSource($realpath, $cOptions);
-                $basenames[] = basename($realpath, $ext);
-            }
-            if ($this->selectionId) {
-                $this->selectionId .= '_f=';
-            }
-            $this->selectionId .= implode(',', $basenames) . $ext;
-        }
-        if ($sources) {
-            if (null !== $firstMissingResource) {
-                array_unshift($sources, new Minify_Source(array(
-                    'id' => 'missingFile'
-                    // should not cause cache invalidation
-                    ,'lastModified' => 0
-                    // due to caching, filename is unreliable.
-                    ,'content' => "/* Minify: at least one missing file. See " . Minify::URL_DEBUG . " */\n"
-                    ,'minifier' => ''
-                )));
-            }
-            $this->sources = $sources;
-        } else {
-            $this->log("No sources to serve");
-        }
-        return $options;
-    }
-
-    /**
-     * @param string $file
-     *
-     * @param array $cOptions
-     *
-     * @return Minify_Source
-     */
-    protected function _getFileSource($file, $cOptions)
-    {
-        $spec['filepath'] = $file;
-        if ($cOptions['noMinPattern'] && preg_match($cOptions['noMinPattern'], basename($file))) {
-            if (preg_match('~\.css$~i', $file)) {
-                $spec['minifyOptions']['compress'] = false;
-            } else {
-                $spec['minifier'] = '';
-            }
-        }
-        return new Minify_Source($spec);
-    }
-
-    protected $_type = null;
-
-    /**
-     * Make sure that only source files of a single type are registered
-     *
-     * @param string $sourceOrExt
-     *
-     * @throws Exception
-     */
-    public function checkType($sourceOrExt)
-    {
-        if ($sourceOrExt === 'js') {
-            $type = Minify::TYPE_JS;
-        } elseif ($sourceOrExt === 'css') {
-            $type = Minify::TYPE_CSS;
-        } elseif ($sourceOrExt->contentType !== null) {
-            $type = $sourceOrExt->contentType;
-        } else {
-            return;
-        }
-        if ($this->_type === null) {
-            $this->_type = $type;
-        } elseif ($this->_type !== $type) {
-            throw new Exception('Content-Type mismatch');
-        }
-    }
-}
diff --git a/inc/lib/minify/Minify/Controller/Page.php b/inc/lib/minify/Minify/Controller/Page.php
deleted file mode 100755
index 1095fb46..00000000
--- a/inc/lib/minify/Minify/Controller/Page.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Page  
- * @package Minify
- */
-
-/**
- * Controller class for serving a single HTML page
- * 
- * @link http://code.google.com/p/minify/source/browse/trunk/web/examples/1/index.php#59
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Page extends Minify_Controller_Base {
-    
-    /**
-     * Set up source of HTML content
-     * 
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     * Controller options:
-     * 
-     * 'content': (required) HTML markup
-     * 
-     * 'id': (required) id of page (string for use in server-side caching)
-     * 
-     * 'lastModifiedTime': timestamp of when this content changed. This
-     * is recommended to allow both server and client-side caching.
-     * 
-     * 'minifyAll': should all CSS and Javascript blocks be individually 
-     * minified? (default false) 
-     *
-     * @todo Add 'file' option to read HTML file.
-     */
-    public function setupSources($options) {
-        if (isset($options['file'])) {
-            $sourceSpec = array(
-                'filepath' => $options['file']
-            );
-            $f = $options['file'];
-        } else {
-            // strip controller options
-            $sourceSpec = array(
-                'content' => $options['content']
-                ,'id' => $options['id']
-            );
-            $f = $options['id'];
-            unset($options['content'], $options['id']);
-        }
-        // something like "builder,index.php" or "directory,file.html"
-        $this->selectionId = strtr(substr($f, 1 + strlen(dirname(dirname($f)))), '/\\', ',,');
-
-        if (isset($options['minifyAll'])) {
-            // this will be the 2nd argument passed to Minify_HTML::minify()
-            $sourceSpec['minifyOptions'] = array(
-                'cssMinifier' => array('Minify_CSS', 'minify')
-                ,'jsMinifier' => array('JSMin', 'minify')
-            );
-            unset($options['minifyAll']);
-        }
-        $this->sources[] = new Minify_Source($sourceSpec);
-        
-        $options['contentType'] = Minify::TYPE_HTML;
-        return $options;
-    }
-}
-
diff --git a/inc/lib/minify/Minify/Controller/Version1.php b/inc/lib/minify/Minify/Controller/Version1.php
deleted file mode 100755
index 91fcf614..00000000
--- a/inc/lib/minify/Minify/Controller/Version1.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Class Minify_Controller_Version1  
- * @package Minify
- */
-
-/**
- * Controller class for emulating version 1 of minify.php (mostly a proof-of-concept)
- * 
- * <code>
- * Minify::serve('Version1');
- * </code>
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Controller_Version1 extends Minify_Controller_Base {
-    
-    /**
-     * Set up groups of files as sources
-     * 
-     * @param array $options controller and Minify options
-     * @return array Minify options
-     * 
-     */
-    public function setupSources($options) {
-        // PHP insecure by default: realpath() and other FS functions can't handle null bytes.
-        if (isset($_GET['files'])) {
-            $_GET['files'] = str_replace("\x00", '', (string)$_GET['files']);
-        }
-
-        self::_setupDefines();
-        if (MINIFY_USE_CACHE) {
-            $cacheDir = defined('MINIFY_CACHE_DIR')
-                ? MINIFY_CACHE_DIR
-                : '';
-            Minify::setCache($cacheDir);
-        }
-        $options['badRequestHeader'] = 'HTTP/1.0 404 Not Found';
-        $options['contentTypeCharset'] = MINIFY_ENCODING;
-
-        // The following restrictions are to limit the URLs that minify will
-        // respond to. Ideally there should be only one way to reference a file.
-        if (! isset($_GET['files'])
-            // verify at least one file, files are single comma separated, 
-            // and are all same extension
-            || ! preg_match('/^[^,]+\\.(css|js)(,[^,]+\\.\\1)*$/', $_GET['files'], $m)
-            // no "//" (makes URL rewriting easier)
-            || strpos($_GET['files'], '//') !== false
-            // no "\"
-            || strpos($_GET['files'], '\\') !== false
-            // no "./"
-            || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['files'])
-        ) {
-            return $options;
-        }
-
-        $files = explode(',', $_GET['files']);
-        if (count($files) > MINIFY_MAX_FILES) {
-            return $options;
-        }
-        
-        // strings for prepending to relative/absolute paths
-        $prependRelPaths = dirname($_SERVER['SCRIPT_FILENAME'])
-            . DIRECTORY_SEPARATOR;
-        $prependAbsPaths = $_SERVER['DOCUMENT_ROOT'];
-        
-        $goodFiles = array();
-        $hasBadSource = false;
-        
-        $allowDirs = isset($options['allowDirs'])
-            ? $options['allowDirs']
-            : MINIFY_BASE_DIR;
-        
-        foreach ($files as $file) {
-            // prepend appropriate string for abs/rel paths
-            $file = ($file[0] === '/' ? $prependAbsPaths : $prependRelPaths) . $file;
-            // make sure a real file!
-            $file = realpath($file);
-            // don't allow unsafe or duplicate files
-            if (parent::_fileIsSafe($file, $allowDirs) 
-                && !in_array($file, $goodFiles)) 
-            {
-                $goodFiles[] = $file;
-                $srcOptions = array(
-                    'filepath' => $file
-                );
-                $this->sources[] = new Minify_Source($srcOptions);
-            } else {
-                $hasBadSource = true;
-                break;
-            }
-        }
-        if ($hasBadSource) {
-            $this->sources = array();
-        }
-        if (! MINIFY_REWRITE_CSS_URLS) {
-            $options['rewriteCssUris'] = false;
-        }
-        return $options;
-    }
-    
-    private static function _setupDefines()
-    {
-        $defaults = array(
-            'MINIFY_BASE_DIR' => realpath($_SERVER['DOCUMENT_ROOT'])
-            ,'MINIFY_ENCODING' => 'utf-8'
-            ,'MINIFY_MAX_FILES' => 16
-            ,'MINIFY_REWRITE_CSS_URLS' => true
-            ,'MINIFY_USE_CACHE' => true
-        );
-        foreach ($defaults as $const => $val) {
-            if (! defined($const)) {
-                define($const, $val);
-            }
-        }
-    }
-}
-
diff --git a/inc/lib/minify/Minify/DebugDetector.php b/inc/lib/minify/Minify/DebugDetector.php
deleted file mode 100755
index 1def9748..00000000
--- a/inc/lib/minify/Minify/DebugDetector.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php

-

-/**

- * Detect whether request should be debugged

- *

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- */

-class Minify_DebugDetector {

-    public static function shouldDebugRequest($cookie, $get, $requestUri)

-    {

-        if (isset($get['debug'])) {

-            return true;

-        }

-        if (! empty($cookie['minifyDebug'])) {

-            foreach (preg_split('/\\s+/', $cookie['minifyDebug']) as $debugUri) {

-                $pattern = '@' . preg_quote($debugUri, '@') . '@i';

-                $pattern = str_replace(array('\\*', '\\?'), array('.*', '.'), $pattern);

-                if (preg_match($pattern, $requestUri)) {

-                    return true;

-                }

-            }

-        }

-        return false;

-    }

-}

diff --git a/inc/lib/minify/Minify/HTML.php b/inc/lib/minify/Minify/HTML.php
deleted file mode 100755
index 40f73076..00000000
--- a/inc/lib/minify/Minify/HTML.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php

-/**

- * Class Minify_HTML

- * @package Minify

- */

-

-/**

- * Compress HTML

- *

- * This is a heavy regex-based removal of whitespace, unnecessary comments and

- * tokens. IE conditional comments are preserved. There are also options to have

- * STYLE and SCRIPT blocks compressed by callback functions.

- *

- * A test suite is available.

- *

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- */

-class Minify_HTML {

-    /**

-     * @var boolean

-     */

-    protected $_jsCleanComments = true;

-

-    /**

-     * "Minify" an HTML page

-     *

-     * @param string $html

-     *

-     * @param array $options

-     *

-     * 'cssMinifier' : (optional) callback function to process content of STYLE

-     * elements.

-     *

-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT

-     * elements. Note: the type attribute is ignored.

-     *

-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If

-     * unset, minify will sniff for an XHTML doctype.

-     *

-     * @return string

-     */

-    public static function minify($html, $options = array()) {

-        $min = new self($html, $options);

-        return $min->process();

-    }

-

-

-    /**

-     * Create a minifier object

-     *

-     * @param string $html

-     *

-     * @param array $options

-     *

-     * 'cssMinifier' : (optional) callback function to process content of STYLE

-     * elements.

-     *

-     * 'jsMinifier' : (optional) callback function to process content of SCRIPT

-     * elements. Note: the type attribute is ignored.

-     *

-     * 'jsCleanComments' : (optional) whether to remove HTML comments beginning and end of script block

-     *

-     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If

-     * unset, minify will sniff for an XHTML doctype.

-     */

-    public function __construct($html, $options = array())

-    {

-        $this->_html = str_replace("\r\n", "\n", trim($html));

-        if (isset($options['xhtml'])) {

-            $this->_isXhtml = (bool)$options['xhtml'];

-        }

-        if (isset($options['cssMinifier'])) {

-            $this->_cssMinifier = $options['cssMinifier'];

-        }

-        if (isset($options['jsMinifier'])) {

-            $this->_jsMinifier = $options['jsMinifier'];

-        }

-        if (isset($options['jsCleanComments'])) {

-            $this->_jsCleanComments = (bool)$options['jsCleanComments'];

-        }

-    }

-

-

-    /**

-     * Minify the markeup given in the constructor

-     * 

-     * @return string

-     */

-    public function process()

-    {

-        if ($this->_isXhtml === null) {

-            $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));

-        }

-        

-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);

-        $this->_placeholders = array();

-        

-        // replace SCRIPTs (and minify) with placeholders

-        $this->_html = preg_replace_callback(

-            '/(\\s*)<script(\\b[^>]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i'

-            ,array($this, '_removeScriptCB')

-            ,$this->_html);

-        

-        // replace STYLEs (and minify) with placeholders

-        $this->_html = preg_replace_callback(

-            '/\\s*<style(\\b[^>]*>)([\\s\\S]*?)<\\/style>\\s*/i'

-            ,array($this, '_removeStyleCB')

-            ,$this->_html);

-        

-        // remove HTML comments (not containing IE conditional comments).

-        $this->_html = preg_replace_callback(

-            '/<!--([\\s\\S]*?)-->/'

-            ,array($this, '_commentCB')

-            ,$this->_html);

-        

-        // replace PREs with placeholders

-        $this->_html = preg_replace_callback('/\\s*<pre(\\b[^>]*?>[\\s\\S]*?<\\/pre>)\\s*/i'

-            ,array($this, '_removePreCB')

-            ,$this->_html);

-        

-        // replace TEXTAREAs with placeholders

-        $this->_html = preg_replace_callback(

-            '/\\s*<textarea(\\b[^>]*?>[\\s\\S]*?<\\/textarea>)\\s*/i'

-            ,array($this, '_removeTextareaCB')

-            ,$this->_html);

-        

-        // trim each line.

-        // @todo take into account attribute values that span multiple lines.

-        $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html);

-        

-        // remove ws around block/undisplayed elements

-        $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body'

-            .'|caption|center|col(?:group)?|dd|dir|div|dl|dt|fieldset|form'

-            .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta'

-            .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)'

-            .'|ul)\\b[^>]*>)/i', '$1', $this->_html);

-        

-        // remove ws outside of all elements

-        $this->_html = preg_replace(

-            '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?</'

-            ,'>$1$2$3<'

-            ,$this->_html);

-        

-        // use newlines before 1st attribute in open tags (to limit line lengths)

-        $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);

-        

-        // fill placeholders

-        $this->_html = str_replace(

-            array_keys($this->_placeholders)

-            ,array_values($this->_placeholders)

-            ,$this->_html

-        );

-        // issue 229: multi-pass to catch scripts that didn't get replaced in textareas

-        $this->_html = str_replace(

-            array_keys($this->_placeholders)

-            ,array_values($this->_placeholders)

-            ,$this->_html

-        );

-        return $this->_html;

-    }

-    

-    protected function _commentCB($m)

-    {

-        return (0 === strpos($m[1], '[') || false !== strpos($m[1], '<!['))

-            ? $m[0]

-            : '';

-    }

-    

-    protected function _reservePlace($content)

-    {

-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';

-        $this->_placeholders[$placeholder] = $content;

-        return $placeholder;

-    }

-

-    protected $_isXhtml = null;

-    protected $_replacementHash = null;

-    protected $_placeholders = array();

-    protected $_cssMinifier = null;

-    protected $_jsMinifier = null;

-

-    protected function _removePreCB($m)

-    {

-        return $this->_reservePlace("<pre{$m[1]}");

-    }

-    

-    protected function _removeTextareaCB($m)

-    {

-        return $this->_reservePlace("<textarea{$m[1]}");

-    }

-

-    protected function _removeStyleCB($m)

-    {

-        $openStyle = "<style{$m[1]}";

-        $css = $m[2];

-        // remove HTML comments

-        $css = preg_replace('/(?:^\\s*<!--|-->\\s*$)/', '', $css);

-        

-        // remove CDATA section markers

-        $css = $this->_removeCdata($css);

-        

-        // minify

-        $minifier = $this->_cssMinifier

-            ? $this->_cssMinifier

-            : 'trim';

-        $css = call_user_func($minifier, $css);

-        

-        return $this->_reservePlace($this->_needsCdata($css)

-            ? "{$openStyle}/*<![CDATA[*/{$css}/*]]>*/</style>"

-            : "{$openStyle}{$css}</style>"

-        );

-    }

-

-    protected function _removeScriptCB($m)

-    {

-        $openScript = "<script{$m[2]}";

-        $js = $m[3];

-        

-        // whitespace surrounding? preserve at least one space

-        $ws1 = ($m[1] === '') ? '' : ' ';

-        $ws2 = ($m[4] === '') ? '' : ' ';

-

-        // remove HTML comments (and ending "//" if present)

-        if ($this->_jsCleanComments) {

-            $js = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $js);

-        }

-

-        // remove CDATA section markers

-        $js = $this->_removeCdata($js);

-        

-        // minify

-        $minifier = $this->_jsMinifier

-            ? $this->_jsMinifier

-            : 'trim';

-        $js = call_user_func($minifier, $js);

-        

-        return $this->_reservePlace($this->_needsCdata($js)

-            ? "{$ws1}{$openScript}/*<![CDATA[*/{$js}/*]]>*/</script>{$ws2}"

-            : "{$ws1}{$openScript}{$js}</script>{$ws2}"

-        );

-    }

-

-    protected function _removeCdata($str)

-    {

-        return (false !== strpos($str, '<![CDATA['))

-            ? str_replace(array('<![CDATA[', ']]>'), '', $str)

-            : $str;

-    }

-    

-    protected function _needsCdata($str)

-    {

-        return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str));

-    }

-}

diff --git a/inc/lib/minify/Minify/HTML/Helper.php b/inc/lib/minify/Minify/HTML/Helper.php
deleted file mode 100755
index f92ab854..00000000
--- a/inc/lib/minify/Minify/HTML/Helper.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Class Minify_HTML_Helper
- * @package Minify
- */
-
-/**
- * Helpers for writing Minfy URIs into HTML
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_HTML_Helper {
-    public $rewriteWorks = true;
-    public $minAppUri = '/min';
-    public $groupsConfigFile = '';
-
-    /**
-     * Get an HTML-escaped Minify URI for a group or set of files
-     * 
-     * @param string|array $keyOrFiles a group key or array of filepaths/URIs
-     * @param array $opts options:
-     *   'farExpires' : (default true) append a modified timestamp for cache revving
-     *   'debug' : (default false) append debug flag
-     *   'charset' : (default 'UTF-8') for htmlspecialchars
-     *   'minAppUri' : (default '/min') URI of min directory
-     *   'rewriteWorks' : (default true) does mod_rewrite work in min app?
-     *   'groupsConfigFile' : specify if different
-     * @return string
-     */
-    public static function getUri($keyOrFiles, $opts = array())
-    {
-        $opts = array_merge(array( // default options
-            'farExpires' => true
-            ,'debug' => false
-            ,'charset' => 'UTF-8'
-            ,'minAppUri' => '/min'
-            ,'rewriteWorks' => true
-            ,'groupsConfigFile' => ''
-        ), $opts);
-        $h = new self;
-        $h->minAppUri = $opts['minAppUri'];
-        $h->rewriteWorks = $opts['rewriteWorks'];
-        $h->groupsConfigFile = $opts['groupsConfigFile'];
-        if (is_array($keyOrFiles)) {
-            $h->setFiles($keyOrFiles, $opts['farExpires']);
-        } else {
-            $h->setGroup($keyOrFiles, $opts['farExpires']);
-        }
-        $uri = $h->getRawUri($opts['farExpires'], $opts['debug']);
-        return htmlspecialchars($uri, ENT_QUOTES, $opts['charset']);
-    }
-
-    /**
-     * Get non-HTML-escaped URI to minify the specified files
-     *
-     * @param bool $farExpires
-     * @param bool $debug
-     * @return string
-     */
-    public function getRawUri($farExpires = true, $debug = false)
-    {
-        $path = rtrim($this->minAppUri, '/') . '/';
-        if (! $this->rewriteWorks) {
-            $path .= '?';
-        }
-        if (null === $this->_groupKey) {
-            // @todo: implement shortest uri
-            $path = self::_getShortestUri($this->_filePaths, $path);
-        } else {
-            $path .= "g=" . $this->_groupKey;
-        }
-        if ($debug) {
-            $path .= "&debug";
-        } elseif ($farExpires && $this->_lastModified) {
-            $path .= "&" . $this->_lastModified;
-        }
-        return $path;
-    }
-
-    /**
-     * Set the files that will comprise the URI we're building
-     *
-     * @param array $files
-     * @param bool $checkLastModified
-     */
-    public function setFiles($files, $checkLastModified = true)
-    {
-        $this->_groupKey = null;
-        if ($checkLastModified) {
-            $this->_lastModified = self::getLastModified($files);
-        }
-        // normalize paths like in /min/f=<paths>
-        foreach ($files as $k => $file) {
-            if (0 === strpos($file, '//')) {
-                $file = substr($file, 2);
-            } elseif (0 === strpos($file, '/')
-                      || 1 === strpos($file, ':\\')) {
-                $file = substr($file, strlen($_SERVER['DOCUMENT_ROOT']) + 1);
-            }
-            $file = strtr($file, '\\', '/');
-            $files[$k] = $file;
-        }
-        $this->_filePaths = $files;
-    }
-
-    /**
-     * Set the group of files that will comprise the URI we're building
-     *
-     * @param string $key
-     * @param bool $checkLastModified
-     */
-    public function setGroup($key, $checkLastModified = true)
-    {
-        $this->_groupKey = $key;
-        if ($checkLastModified) {
-            if (! $this->groupsConfigFile) {
-                $this->groupsConfigFile = dirname(dirname(dirname(dirname(__FILE__)))) . '/groupsConfig.php';
-            }
-            if (is_file($this->groupsConfigFile)) {
-                $gc = (require $this->groupsConfigFile);
-                $keys = explode(',', $key);
-                foreach ($keys as $key) {
-                    if (isset($gc[$key])) {
-                        $this->_lastModified = self::getLastModified($gc[$key], $this->_lastModified);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the max(lastModified) of all files
-     *
-     * @param array|string $sources
-     * @param int $lastModified
-     * @return int
-     */
-    public static function getLastModified($sources, $lastModified = 0)
-    {
-        $max = $lastModified;
-        foreach ((array)$sources as $source) {
-            if (is_object($source) && isset($source->lastModified)) {
-                $max = max($max, $source->lastModified);
-            } elseif (is_string($source)) {
-                if (0 === strpos($source, '//')) {
-                    $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1);
-                }
-                if (is_file($source)) {
-                    $max = max($max, filemtime($source));
-                }
-            }
-        }
-        return $max;
-    }
-
-    protected $_groupKey = null; // if present, URI will be like g=...
-    protected $_filePaths = array();
-    protected $_lastModified = null;
-
-    
-    /**
-     * In a given array of strings, find the character they all have at
-     * a particular index
-     *
-     * @param array $arr array of strings
-     * @param int $pos index to check
-     * @return mixed a common char or '' if any do not match
-     */
-    protected static function _getCommonCharAtPos($arr, $pos) {
-        if (!isset($arr[0][$pos])) {
-            return '';
-        }
-        $c = $arr[0][$pos];
-        $l = count($arr);
-        if ($l === 1) {
-            return $c;
-        }
-        for ($i = 1; $i < $l; ++$i) {
-            if ($arr[$i][$pos] !== $c) {
-                return '';
-            }
-        }
-        return $c;
-    }
-
-    /**
-     * Get the shortest URI to minify the set of source files
-     *
-     * @param array $paths root-relative URIs of files
-     * @param string $minRoot root-relative URI of the "min" application
-     * @return string
-     */
-    protected static function _getShortestUri($paths, $minRoot = '/min/') {
-        $pos = 0;
-        $base = '';
-        while (true) {
-            $c = self::_getCommonCharAtPos($paths, $pos);
-            if ($c === '') {
-                break;
-            } else {
-                $base .= $c;
-            }
-            ++$pos;
-        }
-        $base = preg_replace('@[^/]+$@', '', $base);
-        $uri = $minRoot . 'f=' . implode(',', $paths);
-        
-        if (substr($base, -1) === '/') {
-            // we have a base dir!
-            $basedPaths = $paths;
-            $l = count($paths);
-            for ($i = 0; $i < $l; ++$i) {
-                $basedPaths[$i] = substr($paths[$i], strlen($base));
-            }
-            $base = substr($base, 0, strlen($base) - 1);
-            $bUri = $minRoot . 'b=' . $base . '&f=' . implode(',', $basedPaths);
-
-            $uri = strlen($uri) < strlen($bUri)
-                ? $uri
-                : $bUri;
-        }
-        return $uri;
-    }
-}
diff --git a/inc/lib/minify/Minify/ImportProcessor.php b/inc/lib/minify/Minify/ImportProcessor.php
deleted file mode 100755
index bdfae547..00000000
--- a/inc/lib/minify/Minify/ImportProcessor.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php

-/**

- * Class Minify_ImportProcessor

- * @package Minify

- */

-

-/**

- * Linearize a CSS/JS file by including content specified by CSS import

- * declarations. In CSS files, relative URIs are fixed.

- *

- * @imports will be processed regardless of where they appear in the source

- * files; i.e. @imports commented out or in string content will still be

- * processed!

- *

- * This has a unit test but should be considered "experimental".

- *

- * @package Minify

- * @author Stephen Clay <steve@mrclay.org>

- * @author Simon Schick <simonsimcity@gmail.com>

- */

-class Minify_ImportProcessor {

-

-    public static $filesIncluded = array();

-

-    public static function process($file)

-    {

-        self::$filesIncluded = array();

-        self::$_isCss = (strtolower(substr($file, -4)) === '.css');

-        $obj = new Minify_ImportProcessor(dirname($file));

-        return $obj->_getContent($file);

-    }

-

-    // allows callback funcs to know the current directory

-    private $_currentDir = null;

-

-    // allows callback funcs to know the directory of the file that inherits this one

-    private $_previewsDir = null;

-

-    // allows _importCB to write the fetched content back to the obj

-    private $_importedContent = '';

-

-    private static $_isCss = null;

-

-    /**

-     * @param String $currentDir

-     * @param String $previewsDir Is only used internally

-     */

-    private function __construct($currentDir, $previewsDir = "")

-    {

-        $this->_currentDir = $currentDir;

-        $this->_previewsDir = $previewsDir;

-    }

-

-    private function _getContent($file, $is_imported = false)

-    {

-        $file = realpath($file);

-        if (! $file

-            || in_array($file, self::$filesIncluded)

-            || false === ($content = @file_get_contents($file))

-        ) {

-            // file missing, already included, or failed read

-            return '';

-        }

-        self::$filesIncluded[] = realpath($file);

-        $this->_currentDir = dirname($file);

-

-        // remove UTF-8 BOM if present

-        if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) {

-            $content = substr($content, 3);

-        }

-        // ensure uniform EOLs

-        $content = str_replace("\r\n", "\n", $content);

-

-        // process @imports

-        $content = preg_replace_callback(

-            '/

-                @import\\s+

-                (?:url\\(\\s*)?      # maybe url(

-                [\'"]?               # maybe quote

-                (.*?)                # 1 = URI

-                [\'"]?               # maybe end quote

-                (?:\\s*\\))?         # maybe )

-                ([a-zA-Z,\\s]*)?     # 2 = media list

-                ;                    # end token

-            /x'

-            ,array($this, '_importCB')

-            ,$content

-        );

-

-        // You only need to rework the import-path if the script is imported

-        if (self::$_isCss && $is_imported) {

-            // rewrite remaining relative URIs

-            $content = preg_replace_callback(

-                '/url\\(\\s*([^\\)\\s]+)\\s*\\)/'

-                ,array($this, '_urlCB')

-                ,$content

-            );

-        }

-

-        return $this->_importedContent . $content;

-    }

-

-    private function _importCB($m)

-    {

-        $url = $m[1];

-        $mediaList = preg_replace('/\\s+/', '', $m[2]);

-

-        if (strpos($url, '://') > 0) {

-            // protocol, leave in place for CSS, comment for JS

-            return self::$_isCss

-                ? $m[0]

-                : "/* Minify_ImportProcessor will not include remote content */";

-        }

-        if ('/' === $url[0]) {

-            // protocol-relative or root path

-            $url = ltrim($url, '/');

-            $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR

-                . strtr($url, '/', DIRECTORY_SEPARATOR);

-        } else {

-            // relative to current path

-            $file = $this->_currentDir . DIRECTORY_SEPARATOR

-                . strtr($url, '/', DIRECTORY_SEPARATOR);

-        }

-        $obj = new Minify_ImportProcessor(dirname($file), $this->_currentDir);

-        $content = $obj->_getContent($file, true);

-        if ('' === $content) {

-            // failed. leave in place for CSS, comment for JS

-            return self::$_isCss

-                ? $m[0]

-                : "/* Minify_ImportProcessor could not fetch '{$file}' */";

-        }

-        return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList))

-            ? $content

-            : "@media {$mediaList} {\n{$content}\n}\n";

-    }

-

-    private function _urlCB($m)

-    {

-        // $m[1] is either quoted or not

-        $quote = ($m[1][0] === "'" || $m[1][0] === '"')

-            ? $m[1][0]

-            : '';

-        $url = ($quote === '')

-            ? $m[1]

-            : substr($m[1], 1, strlen($m[1]) - 2);

-        if ('/' !== $url[0]) {

-            if (strpos($url, '//') > 0) {

-                // probably starts with protocol, do not alter

-            } else {

-                // prepend path with current dir separator (OS-independent)

-                $path = $this->_currentDir

-                    . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);

-                // update the relative path by the directory of the file that imported this one

-                $url = self::getPathDiff(realpath($this->_previewsDir), $path);

-            }

-        }

-        return "url({$quote}{$url}{$quote})";

-    }

-

-    /**

-     * @param string $from

-     * @param string $to

-     * @param string $ps

-     * @return string

-     */

-    private function getPathDiff($from, $to, $ps = DIRECTORY_SEPARATOR)

-    {

-        $realFrom = $this->truepath($from);

-        $realTo = $this->truepath($to);

-

-        $arFrom = explode($ps, rtrim($realFrom, $ps));

-        $arTo = explode($ps, rtrim($realTo, $ps));

-        while (count($arFrom) && count($arTo) && ($arFrom[0] == $arTo[0]))

-        {

-            array_shift($arFrom);

-            array_shift($arTo);

-        }

-        return str_pad("", count($arFrom) * 3, '..' . $ps) . implode($ps, $arTo);

-    }

-

-    /**

-     * This function is to replace PHP's extremely buggy realpath().

-     * @param string $path The original path, can be relative etc.

-     * @return string The resolved path, it might not exist.

-     * @see http://stackoverflow.com/questions/4049856/replace-phps-realpath

-     */

-    function truepath($path)

-    {

-        // whether $path is unix or not

-        $unipath = strlen($path) == 0 || $path{0} != '/';

-        // attempts to detect if path is relative in which case, add cwd

-        if (strpos($path, ':') === false && $unipath)

-            $path = $this->_currentDir . DIRECTORY_SEPARATOR . $path;

-

-        // resolve path parts (single dot, double dot and double delimiters)

-        $path = str_replace(array('/', '\\'), DIRECTORY_SEPARATOR, $path);

-        $parts = array_filter(explode(DIRECTORY_SEPARATOR, $path), 'strlen');

-        $absolutes = array();

-        foreach ($parts as $part) {

-            if ('.' == $part)

-                continue;

-            if ('..' == $part) {

-                array_pop($absolutes);

-            } else {

-                $absolutes[] = $part;

-            }

-        }

-        $path = implode(DIRECTORY_SEPARATOR, $absolutes);

-        // resolve any symlinks

-        if (file_exists($path) && linkinfo($path) > 0)

-            $path = readlink($path);

-        // put initial separator that could have been lost

-        $path = !$unipath ? '/' . $path : $path;

-        return $path;

-    }

-}

diff --git a/inc/lib/minify/Minify/JS/ClosureCompiler.php b/inc/lib/minify/Minify/JS/ClosureCompiler.php
deleted file mode 100755
index e067d7c8..00000000
--- a/inc/lib/minify/Minify/JS/ClosureCompiler.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Class Minify_JS_ClosureCompiler
- * @package Minify
- */
-
-/**
- * Minify Javascript using Google's Closure Compiler API
- *
- * @link http://code.google.com/closure/compiler/
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- *
- * @todo can use a stream wrapper to unit test this?
- */
-class Minify_JS_ClosureCompiler {
-
-    /**
-     * @var string The option key for the maximum POST byte size
-     */
-    const OPTION_MAX_BYTES = 'maxBytes';
-
-    /**
-     * @var string The option key for additional params. @see __construct
-     */
-    const OPTION_ADDITIONAL_OPTIONS = 'additionalParams';
-
-    /**
-     * @var string The option key for the fallback Minifier
-     */
-    const OPTION_FALLBACK_FUNCTION = 'fallbackFunc';
-
-    /**
-     * @var string The option key for the service URL
-     */
-    const OPTION_COMPILER_URL = 'compilerUrl';
-
-    /**
-     * @var int The default maximum POST byte size according to https://developers.google.com/closure/compiler/docs/api-ref
-     */
-    const DEFAULT_MAX_BYTES = 200000;
-
-    /**
-     * @var string[] $DEFAULT_OPTIONS The default options to pass to the compiler service
-     *
-     * @note This would be a constant if PHP allowed it
-     */
-    private static $DEFAULT_OPTIONS = array(
-        'output_format' => 'text',
-        'compilation_level' => 'SIMPLE_OPTIMIZATIONS'
-    );
-
-    /**
-     * @var string $url URL of compiler server. defaults to Google's
-     */
-    protected $serviceUrl = 'http://closure-compiler.appspot.com/compile';
-
-    /**
-     * @var int $maxBytes The maximum JS size that can be sent to the compiler server in bytes
-     */
-    protected $maxBytes = self::DEFAULT_MAX_BYTES;
-
-    /**
-     * @var string[] $additionalOptions Additional options to pass to the compiler service
-     */
-    protected $additionalOptions = array();
-
-    /**
-     * @var callable Function to minify JS if service fails. Default is JSMin
-     */
-    protected $fallbackMinifier = array('JSMin', 'minify');
-
-    /**
-     * Minify JavaScript code via HTTP request to a Closure Compiler API
-     *
-     * @param string $js input code
-     * @param array $options Options passed to __construct(). @see __construct
-     *
-     * @return string
-     */
-    public static function minify($js, array $options = array())
-    {
-        $obj = new self($options);
-        return $obj->min($js);
-    }
-
-    /**
-     * @param array $options Options with keys available below:
-     *
-     *  fallbackFunc     : (callable) function to minify if service unavailable. Default is JSMin.
-     *
-     *  compilerUrl      : (string) URL to closure compiler server
-     *
-     *  maxBytes         : (int) The maximum amount of bytes to be sent as js_code in the POST request.
-     *                     Defaults to 200000.
-     *
-     *  additionalParams : (string[]) Additional parameters to pass to the compiler server. Can be anything named
-     *                     in https://developers.google.com/closure/compiler/docs/api-ref except for js_code and
-     *                     output_info
-     */
-    public function __construct(array $options = array())
-    {
-        if (isset($options[self::OPTION_FALLBACK_FUNCTION])) {
-            $this->fallbackMinifier = $options[self::OPTION_FALLBACK_FUNCTION];
-        }
-        if (isset($options[self::OPTION_COMPILER_URL])) {
-            $this->serviceUrl = $options[self::OPTION_COMPILER_URL];
-        }
-        if (isset($options[self::OPTION_ADDITIONAL_OPTIONS]) && is_array($options[self::OPTION_ADDITIONAL_OPTIONS])) {
-            $this->additionalOptions = $options[self::OPTION_ADDITIONAL_OPTIONS];
-        }
-        if (isset($options[self::OPTION_MAX_BYTES])) {
-            $this->maxBytes = (int) $options[self::OPTION_MAX_BYTES];
-        }
-    }
-
-    /**
-     * Call the service to perform the minification
-     *
-     * @param string $js JavaScript code
-     * @return string
-     * @throws Minify_JS_ClosureCompiler_Exception
-     */
-    public function min($js)
-    {
-        $postBody = $this->buildPostBody($js);
-
-        if ($this->maxBytes > 0) {
-            $bytes = (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2))
-                ? mb_strlen($postBody, '8bit')
-                : strlen($postBody);
-            if ($bytes > $this->maxBytes) {
-                throw new Minify_JS_ClosureCompiler_Exception(
-                    'POST content larger than ' . $this->maxBytes . ' bytes'
-                );
-            }
-        }
-
-        $response = $this->getResponse($postBody);
-
-        if (preg_match('/^Error\(\d\d?\):/', $response)) {
-            if (is_callable($this->fallbackMinifier)) {
-                // use fallback
-                $response = "/* Received errors from Closure Compiler API:\n$response"
-                          . "\n(Using fallback minifier)\n*/\n";
-                $response .= call_user_func($this->fallbackMinifier, $js);
-            } else {
-                throw new Minify_JS_ClosureCompiler_Exception($response);
-            }
-        }
-
-        if ($response === '') {
-            $errors = $this->getResponse($this->buildPostBody($js, true));
-            throw new Minify_JS_ClosureCompiler_Exception($errors);
-        }
-
-        return $response;
-    }
-
-    /**
-     * Get the response for a given POST body
-     *
-     * @param string $postBody
-     * @return string
-     * @throws Minify_JS_ClosureCompiler_Exception
-     */
-    protected function getResponse($postBody)
-    {
-        $allowUrlFopen = preg_match('/1|yes|on|true/i', ini_get('allow_url_fopen'));
-
-        if ($allowUrlFopen) {
-            $contents = file_get_contents($this->serviceUrl, false, stream_context_create(array(
-                'http' => array(
-                    'method' => 'POST',
-                    'header' => "Content-type: application/x-www-form-urlencoded\r\nConnection: close\r\n",
-                    'content' => $postBody,
-                    'max_redirects' => 0,
-                    'timeout' => 15,
-                )
-            )));
-        } elseif (defined('CURLOPT_POST')) {
-            $ch = curl_init($this->serviceUrl);
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-type: application/x-www-form-urlencoded'));
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $postBody);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
-            $contents = curl_exec($ch);
-            curl_close($ch);
-        } else {
-            throw new Minify_JS_ClosureCompiler_Exception(
-               "Could not make HTTP request: allow_url_open is false and cURL not available"
-            );
-        }
-
-        if (false === $contents) {
-            throw new Minify_JS_ClosureCompiler_Exception(
-               "No HTTP response from server"
-            );
-        }
-
-        return trim($contents);
-    }
-
-    /**
-     * Build a POST request body
-     *
-     * @param string $js JavaScript code
-     * @param bool $returnErrors
-     * @return string
-     */
-    protected function buildPostBody($js, $returnErrors = false)
-    {
-        return http_build_query(
-            array_merge(
-                self::$DEFAULT_OPTIONS,
-                $this->additionalOptions,
-                array(
-                    'js_code' => $js,
-                    'output_info' => ($returnErrors ? 'errors' : 'compiled_code')
-                )
-            ),
-            null,
-            '&'
-        );
-    }
-}
-
-class Minify_JS_ClosureCompiler_Exception extends Exception {}
diff --git a/inc/lib/minify/Minify/Lines.php b/inc/lib/minify/Minify/Lines.php
deleted file mode 100755
index e999a6c2..00000000
--- a/inc/lib/minify/Minify/Lines.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Class Minify_Lines  
- * @package Minify
- */
-
-/**
- * Add line numbers in C-style comments for easier debugging of combined content
- *
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- * @author Adam Pedersen (Issue 55 fix)
- */
-class Minify_Lines {
-
-    /**
-     * Add line numbers in C-style comments
-     *
-     * This uses a very basic parser easily fooled by comment tokens inside
-     * strings or regexes, but, otherwise, generally clean code will not be 
-     * mangled. URI rewriting can also be performed.
-     *
-     * @param string $content
-     * 
-     * @param array $options available options:
-     * 
-     * 'id': (optional) string to identify file. E.g. file name/path
-     *
-     * 'currentDir': (default null) if given, this is assumed to be the
-     * directory of the current CSS file. Using this, minify will rewrite
-     * all relative URIs in import/url declarations to correctly point to
-     * the desired files, and prepend a comment with debugging information about
-     * this process.
-     * 
-     * @return string 
-     */
-    public static function minify($content, $options = array()) 
-    {
-        $id = (isset($options['id']) && $options['id'])
-            ? $options['id']
-            : '';
-        $content = str_replace("\r\n", "\n", $content);
-
-        // Hackily rewrite strings with XPath expressions that are
-        // likely to throw off our dumb parser (for Prototype 1.6.1).
-        $content = str_replace('"/*"', '"/"+"*"', $content);
-        $content = preg_replace('@([\'"])(\\.?//?)\\*@', '$1$2$1+$1*', $content);
-
-        $lines = explode("\n", $content);
-        $numLines = count($lines);
-        // determine left padding
-        $padTo = strlen((string) $numLines); // e.g. 103 lines = 3 digits
-        $inComment = false;
-        $i = 0;
-        $newLines = array();
-        while (null !== ($line = array_shift($lines))) {
-            if (('' !== $id) && (0 == $i % 50)) {
-                if ($inComment) {
-                    array_push($newLines, '', "/* {$id} *|", '');
-                } else {
-                    array_push($newLines, '', "/* {$id} */", '');
-                }
-            }
-            ++$i;
-            $newLines[] = self::_addNote($line, $i, $inComment, $padTo);
-            $inComment = self::_eolInComment($line, $inComment);
-        }
-        $content = implode("\n", $newLines) . "\n";
-        
-        // check for desired URI rewriting
-        if (isset($options['currentDir'])) {
-            Minify_CSS_UriRewriter::$debugText = '';
-            $content = Minify_CSS_UriRewriter::rewrite(
-                 $content
-                ,$options['currentDir']
-                ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT']
-                ,isset($options['symlinks']) ? $options['symlinks'] : array()
-            );
-            $content = "/* Minify_CSS_UriRewriter::\$debugText\n\n" 
-                     . Minify_CSS_UriRewriter::$debugText . "*/\n"
-                     . $content;
-        }
-        
-        return $content;
-    }
-    
-    /**
-     * Is the parser within a C-style comment at the end of this line?
-     *
-     * @param string $line current line of code
-     * 
-     * @param bool $inComment was the parser in a comment at the
-     * beginning of the line?
-     *
-     * @return bool
-     */
-    private static function _eolInComment($line, $inComment)
-    {
-        // crude way to avoid things like // */
-        $line = preg_replace('~//.*?(\\*/|/\\*).*~', '', $line);
-
-        while (strlen($line)) {
-            $search = $inComment
-                ? '*/'
-                : '/*';
-            $pos = strpos($line, $search);
-            if (false === $pos) {
-                return $inComment;
-            } else {
-                if ($pos == 0
-                    || ($inComment
-                        ? substr($line, $pos, 3)
-                        : substr($line, $pos-1, 3)) != '*/*')
-                {
-                        $inComment = ! $inComment;
-                }
-                $line = substr($line, $pos + 2);
-            }
-        }
-        return $inComment;
-    }
-    
-    /**
-     * Prepend a comment (or note) to the given line
-     *
-     * @param string $line current line of code
-     *
-     * @param string $note content of note/comment
-     * 
-     * @param bool $inComment was the parser in a comment at the
-     * beginning of the line?
-     *
-     * @param int $padTo minimum width of comment
-     * 
-     * @return string
-     */
-    private static function _addNote($line, $note, $inComment, $padTo)
-    {
-        return $inComment
-            ? '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' *| ' . $line
-            : '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' */ ' . $line;
-    }
-}
diff --git a/inc/lib/minify/Minify/Logger.php b/inc/lib/minify/Minify/Logger.php
deleted file mode 100755
index 8eb72f45..00000000
--- a/inc/lib/minify/Minify/Logger.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Class Minify_Logger  
- * @package Minify
- */
-
-/** 
- * Message logging class
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- *
- * @todo lose this singleton! pass log object in Minify::serve and distribute to others
- */
-class Minify_Logger {
-
-    /**
-     * Set logger object. 
-     *
-     * The object should have a method "log" that accepts a value as 1st argument and
-     * an optional string label as the 2nd.
-     *
-     * @param mixed $obj or a "falsey" value to disable
-     * @return null
-     */
-    public static function setLogger($obj = null) {
-        self::$_logger = $obj
-            ? $obj
-            : null;
-    }
-    
-    /**
-     * Pass a message to the logger (if set)
-     *
-     * @param string $msg message to log
-     * @return null
-     */
-    public static function log($msg, $label = 'Minify') {
-        if (! self::$_logger) return;
-        self::$_logger->log($msg, $label);
-    }
-    
-    /**
-     * @var mixed logger object (like FirePHP) or null (i.e. no logger available)
-     */
-    private static $_logger = null;
-}
diff --git a/inc/lib/minify/Minify/Packer.php b/inc/lib/minify/Minify/Packer.php
deleted file mode 100755
index 949c3eef..00000000
--- a/inc/lib/minify/Minify/Packer.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Class Minify_Packer
- *
- * To use this class you must first download the PHP port of Packer
- * and place the file "class.JavaScriptPacker.php" in /lib (or your
- * include_path). 
- * @link http://joliclic.free.fr/php/javascript-packer/en/
- *
- * Be aware that, as long as HTTP encoding is used, scripts minified with JSMin
- * will provide better client-side performance, as they need not be unpacked in
- * client-side code.
- * 
- * @package Minify  
- */
-
-if (false === (@include 'class.JavaScriptPacker.php')) {
-    trigger_error(
-        'The script "class.JavaScriptPacker.php" is required. Please see: http:'
-        .'//code.google.com/p/minify/source/browse/trunk/min/lib/Minify/Packer.php'
-        ,E_USER_ERROR
-    );
-}
-
-/**
- * Minify Javascript using Dean Edward's Packer
- * 
- * @package Minify
- */
-class Minify_Packer {
-    public static function minify($code, $options = array())
-    {
-        // @todo: set encoding options based on $options :)
-        $packer = new JavascriptPacker($code, 'Normal', true, false);
-        return trim($packer->pack());
-    }
-}
diff --git a/inc/lib/minify/Minify/Source.php b/inc/lib/minify/Minify/Source.php
deleted file mode 100755
index 5a85d10d..00000000
--- a/inc/lib/minify/Minify/Source.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Class Minify_Source  
- * @package Minify
- */
-
-/** 
- * A content source to be minified by Minify. 
- * 
- * This allows per-source minification options and the mixing of files with
- * content from other sources.
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_Source {
-
-    /**
-     * @var int time of last modification
-     */
-    public $lastModified = null;
-    
-    /**
-     * @var callback minifier function specifically for this source.
-     */
-    public $minifier = null;
-    
-    /**
-     * @var array minification options specific to this source.
-     */
-    public $minifyOptions = null;
-
-    /**
-     * @var string full path of file
-     */
-    public $filepath = null;
-    
-    /**
-     * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*)
-     */
-    public $contentType = null;
-    
-    /**
-     * Create a Minify_Source
-     * 
-     * In the $spec array(), you can either provide a 'filepath' to an existing
-     * file (existence will not be checked!) or give 'id' (unique string for 
-     * the content), 'content' (the string content) and 'lastModified' 
-     * (unixtime of last update).
-     * 
-     * As a shortcut, the controller will replace "//" at the beginning
-     * of a filepath with $_SERVER['DOCUMENT_ROOT'] . '/'.
-     *
-     * @param array $spec options
-     */
-    public function __construct($spec)
-    {
-        if (isset($spec['filepath'])) {
-            if (0 === strpos($spec['filepath'], '//')) {
-                $spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1);
-            }
-            $segments = explode('.', $spec['filepath']);
-            $ext = strtolower(array_pop($segments));
-            switch ($ext) {
-            case 'js'   : $this->contentType = 'application/x-javascript';
-                          break;
-            case 'css'  : $this->contentType = 'text/css';
-                          break;
-            case 'htm'  : // fallthrough
-            case 'html' : $this->contentType = 'text/html';
-                          break;
-            }
-            $this->filepath = $spec['filepath'];
-            $this->_id = $spec['filepath'];
-            $this->lastModified = filemtime($spec['filepath'])
-                // offset for Windows uploaders with out of sync clocks
-                + round(Minify::$uploaderHoursBehind * 3600);
-        } elseif (isset($spec['id'])) {
-            $this->_id = 'id::' . $spec['id'];
-            if (isset($spec['content'])) {
-                $this->_content = $spec['content'];
-            } else {
-                $this->_getContentFunc = $spec['getContentFunc'];
-            }
-            $this->lastModified = isset($spec['lastModified'])
-                ? $spec['lastModified']
-                : time();
-        }
-        if (isset($spec['contentType'])) {
-            $this->contentType = $spec['contentType'];
-        }
-        if (isset($spec['minifier'])) {
-            $this->minifier = $spec['minifier'];
-        }
-        if (isset($spec['minifyOptions'])) {
-            $this->minifyOptions = $spec['minifyOptions'];
-        }
-    }
-    
-    /**
-     * Get content
-     *
-     * @return string
-     */
-    public function getContent()
-    {
-        $content = (null !== $this->filepath)
-            ? file_get_contents($this->filepath)
-            : ((null !== $this->_content)
-                ? $this->_content
-                : call_user_func($this->_getContentFunc, $this->_id)
-            );
-        // remove UTF-8 BOM if present
-        return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3))
-            ? substr($content, 3)
-            : $content;
-    }
-    
-    /**
-     * Get id
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-    
-    /**
-     * Verifies a single minification call can handle all sources
-     *
-     * @param array $sources Minify_Source instances
-     * 
-     * @return bool true iff there no sources with specific minifier preferences.
-     */
-    public static function haveNoMinifyPrefs($sources)
-    {
-        foreach ($sources as $source) {
-            if (null !== $source->minifier
-                || null !== $source->minifyOptions) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /**
-     * Get unique string for a set of sources
-     *
-     * @param array $sources Minify_Source instances
-     * 
-     * @return string
-     */
-    public static function getDigest($sources)
-    {
-        foreach ($sources as $source) {
-            $info[] = array(
-                $source->_id, $source->minifier, $source->minifyOptions
-            );
-        }
-        return md5(serialize($info));
-    }
-    
-    /**
-     * Get content type from a group of sources
-     * 
-     * This is called if the user doesn't pass in a 'contentType' options  
-     * 
-     * @param array $sources Minify_Source instances
-     * 
-     * @return string content type. e.g. 'text/css'
-     */
-    public static function getContentType($sources)
-    {
-        foreach ($sources as $source) {
-            if ($source->contentType !== null) {
-                return $source->contentType;
-            }
-        }
-        return 'text/plain';
-    }
-    
-    protected $_content = null;
-    protected $_getContentFunc = null;
-    protected $_id = null;
-}
-
diff --git a/inc/lib/minify/Minify/YUI/CssCompressor.java b/inc/lib/minify/Minify/YUI/CssCompressor.java
deleted file mode 100755
index 3fb497a9..00000000
--- a/inc/lib/minify/Minify/YUI/CssCompressor.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * YUI Compressor
- * http://developer.yahoo.com/yui/compressor/
- * Author: Julien Lecomte -  http://www.julienlecomte.net/
- * Author: Isaac Schlueter - http://foohack.com/
- * Author: Stoyan Stefanov - http://phpied.com/
- * Copyright (c) 2011 Yahoo! Inc.  All rights reserved.
- * The copyrights embodied in the content of this file are licensed
- * by Yahoo! Inc. under the BSD (revised) open source license.
- */
-package com.yahoo.platform.yui.compressor;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.ArrayList;
-
-public class CssCompressor {
-
-    private StringBuffer srcsb = new StringBuffer();
-
-    public CssCompressor(Reader in) throws IOException {
-        // Read the stream...
-        int c;
-        while ((c = in.read()) != -1) {
-            srcsb.append((char) c);
-        }
-    }
-
-    // Leave data urls alone to increase parse performance.
-    protected String extractDataUrls(String css, ArrayList preservedTokens) {
-
-    	int maxIndex = css.length() - 1;
-        int appendIndex = 0;
-
-    	StringBuffer sb = new StringBuffer();
-
-        Pattern p = Pattern.compile("url\\(\\s*([\"']?)data\\:");
-        Matcher m = p.matcher(css);
-        
-        /* 
-         * Since we need to account for non-base64 data urls, we need to handle 
-         * ' and ) being part of the data string. Hence switching to indexOf,
-         * to determine whether or not we have matching string terminators and
-         * handling sb appends directly, instead of using matcher.append* methods.
-         */
-
-        while (m.find()) {
-
-        	int startIndex = m.start() + 4;  	// "url(".length()
-    		String terminator = m.group(1);     // ', " or empty (not quoted)
-    		
-    		if (terminator.length() == 0) {
-    		 	terminator = ")";
-    		}
-
-    		boolean foundTerminator = false;
-
-    		int endIndex = m.end() - 1;
-    		while(foundTerminator == false && endIndex+1 <= maxIndex) {
-    			endIndex = css.indexOf(terminator, endIndex+1);
-
-    			if ((endIndex > 0) && (css.charAt(endIndex-1) != '\\')) {
-    				foundTerminator = true;
-    				if (!")".equals(terminator)) {
-    					endIndex = css.indexOf(")", endIndex); 
-    				}
-    			}
-    		}
-
-    		// Enough searching, start moving stuff over to the buffer
-			sb.append(css.substring(appendIndex, m.start()));
-
-    		if (foundTerminator) {
-    			String token = css.substring(startIndex, endIndex);
-    			token = token.replaceAll("\\s+", "");
-	    		preservedTokens.add(token);
-
-	    		String preserver = "url(___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___)";
-	    		sb.append(preserver);
-
-	    		appendIndex = endIndex + 1;
-    		} else {
-    			// No end terminator found, re-add the whole match. Should we throw/warn here?
-    			sb.append(css.substring(m.start(), m.end()));
-    			appendIndex = m.end();
-    		}
-        }
-
-        sb.append(css.substring(appendIndex));
-
-        return sb.toString();
-    }
-
-    public void compress(Writer out, int linebreakpos)
-            throws IOException {
-
-        Pattern p;
-        Matcher m;
-        String css = srcsb.toString();
-
-        int startIndex = 0;
-        int endIndex = 0;
-        int i = 0;
-        int max = 0;
-        ArrayList preservedTokens = new ArrayList(0);
-        ArrayList comments = new ArrayList(0);
-        String token;
-        int totallen = css.length();
-        String placeholder;
-
-        css = this.extractDataUrls(css, preservedTokens);
-
-        StringBuffer sb = new StringBuffer(css);
-
-        // collect all comment blocks...
-        while ((startIndex = sb.indexOf("/*", startIndex)) >= 0) {
-            endIndex = sb.indexOf("*/", startIndex + 2);
-            if (endIndex < 0) {
-                endIndex = totallen;
-            }
-
-            token = sb.substring(startIndex + 2, endIndex);
-            comments.add(token);
-            sb.replace(startIndex + 2, endIndex, "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + (comments.size() - 1) + "___");
-            startIndex += 2;
-        }
-        css = sb.toString();
-
-        // preserve strings so their content doesn't get accidentally minified
-        sb = new StringBuffer();
-        p = Pattern.compile("(\"([^\\\\\"]|\\\\.|\\\\)*\")|(\'([^\\\\\']|\\\\.|\\\\)*\')");
-        m = p.matcher(css);
-        while (m.find()) {
-            token = m.group();
-            char quote = token.charAt(0);
-            token = token.substring(1, token.length() - 1);
-
-            // maybe the string contains a comment-like substring?
-            // one, maybe more? put'em back then
-            if (token.indexOf("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_") >= 0) {
-                for (i = 0, max = comments.size(); i < max; i += 1) {
-                    token = token.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", comments.get(i).toString());
-                }
-            }
-
-            // minify alpha opacity in filter strings
-            token = token.replaceAll("(?i)progid:DXImageTransform.Microsoft.Alpha\\(Opacity=", "alpha(opacity=");
-
-            preservedTokens.add(token);
-            String preserver = quote + "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___" + quote;
-            m.appendReplacement(sb, preserver);
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-
-        // strings are safe, now wrestle the comments
-        for (i = 0, max = comments.size(); i < max; i += 1) {
-
-            token = comments.get(i).toString();
-            placeholder = "___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___";
-
-            // ! in the first position of the comment means preserve
-            // so push to the preserved tokens while stripping the !
-            if (token.startsWith("!")) {
-                preservedTokens.add(token);
-                css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                continue;
-            }
-
-            // \ in the last position looks like hack for Mac/IE5
-            // shorten that to /*\*/ and the next one to /**/
-            if (token.endsWith("\\")) {
-                preservedTokens.add("\\");
-                css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                i = i + 1; // attn: advancing the loop
-                preservedTokens.add("");
-                css = css.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___",  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                continue;
-            }
-
-            // keep empty comments after child selectors (IE7 hack)
-            // e.g. html >/**/ body
-            if (token.length() == 0) {
-                startIndex = css.indexOf(placeholder);
-                if (startIndex > 2) {
-                    if (css.charAt(startIndex - 3) == '>') {
-                        preservedTokens.add("");
-                        css = css.replace(placeholder,  "___YUICSSMIN_PRESERVED_TOKEN_" + (preservedTokens.size() - 1) + "___");
-                    }
-                }
-            }
-
-            // in all other cases kill the comment
-            css = css.replace("/*" + placeholder + "*/", "");
-        }
-
-
-        // Normalize all whitespace strings to single spaces. Easier to work with that way.
-        css = css.replaceAll("\\s+", " ");
-
-        // Remove the spaces before the things that should not have spaces before them.
-        // But, be careful not to turn "p :link {...}" into "p:link{...}"
-        // Swap out any pseudo-class colons with the token, and then swap back.
-        sb = new StringBuffer();
-        p = Pattern.compile("(^|\\})(([^\\{:])+:)+([^\\{]*\\{)");
-        m = p.matcher(css);
-        while (m.find()) {
-            String s = m.group();
-            s = s.replaceAll(":", "___YUICSSMIN_PSEUDOCLASSCOLON___");
-            s = s.replaceAll( "\\\\", "\\\\\\\\" ).replaceAll( "\\$", "\\\\\\$" );
-            m.appendReplacement(sb, s);
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-        // Remove spaces before the things that should not have spaces before them.
-        css = css.replaceAll("\\s+([!{};:>+\\(\\)\\],])", "$1");
-        // bring back the colon
-        css = css.replaceAll("___YUICSSMIN_PSEUDOCLASSCOLON___", ":");
-
-        // retain space for special IE6 cases
-        css = css.replaceAll(":first\\-(line|letter)(\\{|,)", ":first-$1 $2");
-
-        // no space after the end of a preserved comment
-        css = css.replaceAll("\\*/ ", "*/");
-
-        // If there is a @charset, then only allow one, and push to the top of the file.
-        css = css.replaceAll("^(.*)(@charset \"[^\"]*\";)", "$2$1");
-        css = css.replaceAll("^(\\s*@charset [^;]+;\\s*)+", "$1");
-
-        // Put the space back in some cases, to support stuff like
-        // @media screen and (-webkit-min-device-pixel-ratio:0){
-        css = css.replaceAll("\\band\\(", "and (");
-
-        // Remove the spaces after the things that should not have spaces after them.
-        css = css.replaceAll("([!{}:;>+\\(\\[,])\\s+", "$1");
-
-        // remove unnecessary semicolons
-        css = css.replaceAll(";+}", "}");
-
-        // Replace 0(px,em,%) with 0.
-        css = css.replaceAll("([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)", "$1$2");
-
-        // Replace 0 0 0 0; with 0.
-        css = css.replaceAll(":0 0 0 0(;|})", ":0$1");
-        css = css.replaceAll(":0 0 0(;|})", ":0$1");
-        css = css.replaceAll(":0 0(;|})", ":0$1");
-
-
-        // Replace background-position:0; with background-position:0 0;
-        // same for transform-origin
-        sb = new StringBuffer();
-        p = Pattern.compile("(?i)(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|})");
-        m = p.matcher(css);
-        while (m.find()) {
-            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0 0" + m.group(2));
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // Replace 0.6 to .6, but only when preceded by : or a white-space
-        css = css.replaceAll("(:|\\s)0+\\.(\\d+)", "$1.$2");
-
-        // Shorten colors from rgb(51,102,153) to #336699
-        // This makes it more likely that it'll get further compressed in the next step.
-        p = Pattern.compile("rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)");
-        m = p.matcher(css);
-        sb = new StringBuffer();
-        while (m.find()) {
-            String[] rgbcolors = m.group(1).split(",");
-            StringBuffer hexcolor = new StringBuffer("#");
-            for (i = 0; i < rgbcolors.length; i++) {
-                int val = Integer.parseInt(rgbcolors[i]);
-                if (val < 16) {
-                    hexcolor.append("0");
-                }
-                hexcolor.append(Integer.toHexString(val));
-            }
-            m.appendReplacement(sb, hexcolor.toString());
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
-        // the color is not preceded by either ", " or =. Indeed, the property
-        //     filter: chroma(color="#FFFFFF");
-        // would become
-        //     filter: chroma(color="#FFF");
-        // which makes the filter break in IE.
-        // We also want to make sure we're only compressing #AABBCC patterns inside { }, not id selectors ( #FAABAC {} )
-        // We also want to avoid compressing invalid values (e.g. #AABBCCD to #ABCD)
-        p = Pattern.compile("(\\=\\s*?[\"']?)?" + "#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])" + "(:?\\}|[^0-9a-fA-F{][^{]*?\\})");
-
-        m = p.matcher(css);
-        sb = new StringBuffer();
-        int index = 0;
-
-        while (m.find(index)) {
-
-        	sb.append(css.substring(index, m.start()));
-
-        	boolean isFilter = (m.group(1) != null && !"".equals(m.group(1))); 
-
-        	if (isFilter) {
-        		// Restore, as is. Compression will break filters
-        		sb.append(m.group(1) + "#" + m.group(2) + m.group(3) + m.group(4) + m.group(5) + m.group(6) + m.group(7));
-        	} else {
-        		if( m.group(2).equalsIgnoreCase(m.group(3)) &&
-                    m.group(4).equalsIgnoreCase(m.group(5)) &&
-                    m.group(6).equalsIgnoreCase(m.group(7))) {
-
-	        		// #AABBCC pattern
-	                sb.append("#" + (m.group(3) + m.group(5) + m.group(7)).toLowerCase());
-
-        		} else {
-
-        			// Non-compressible color, restore, but lower case.
-        			sb.append("#" + (m.group(2) + m.group(3) + m.group(4) + m.group(5) + m.group(6) + m.group(7)).toLowerCase());
-        		}
-            }
-
-        	index = m.end(7);
-        }
-
-        sb.append(css.substring(index));
-        css = sb.toString();
-
-        // border: none -> border:0
-        sb = new StringBuffer();
-        p = Pattern.compile("(?i)(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|})");
-        m = p.matcher(css);
-        while (m.find()) {
-            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0" + m.group(2));
-        }
-        m.appendTail(sb);
-        css = sb.toString();
-
-        // shorter opacity IE filter
-        css = css.replaceAll("(?i)progid:DXImageTransform.Microsoft.Alpha\\(Opacity=", "alpha(opacity=");
-
-        // Remove empty rules.
-        css = css.replaceAll("[^\\}\\{/;]+\\{\\}", "");
-
-        // TODO: Should this be after we re-insert tokens. These could alter the break points. However then
-        // we'd need to make sure we don't break in the middle of a string etc.
-        if (linebreakpos >= 0) {
-            // Some source control tools don't like it when files containing lines longer
-            // than, say 8000 characters, are checked in. The linebreak option is used in
-            // that case to split long lines after a specific column.
-            i = 0;
-            int linestartpos = 0;
-            sb = new StringBuffer(css);
-            while (i < sb.length()) {
-                char c = sb.charAt(i++);
-                if (c == '}' && i - linestartpos > linebreakpos) {
-                    sb.insert(i, '\n');
-                    linestartpos = i;
-                }
-            }
-
-            css = sb.toString();
-        }
-
-        // Replace multiple semi-colons in a row by a single one
-        // See SF bug #1980989
-        css = css.replaceAll(";;+", ";");
-
-        // restore preserved comments and strings
-        for(i = 0, max = preservedTokens.size(); i < max; i++) {
-            css = css.replace("___YUICSSMIN_PRESERVED_TOKEN_" + i + "___", preservedTokens.get(i).toString());
-        }
-
-        // Trim the final string (for any leading or trailing white spaces)
-        css = css.trim();
-
-        // Write the output...
-        out.write(css);
-    }
-}
diff --git a/inc/lib/minify/Minify/YUI/CssCompressor.php b/inc/lib/minify/Minify/YUI/CssCompressor.php
deleted file mode 100755
index ae3443d4..00000000
--- a/inc/lib/minify/Minify/YUI/CssCompressor.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-/**
- * Class Minify_YUI_CssCompressor 
- * @package Minify
- *
- * YUI Compressor
- * Author: Julien Lecomte -  http://www.julienlecomte.net/
- * Author: Isaac Schlueter - http://foohack.com/
- * Author: Stoyan Stefanov - http://phpied.com/
- * Author: Steve Clay      - http://www.mrclay.org/ (PHP port)
- * Copyright (c) 2009 Yahoo! Inc.  All rights reserved.
- * The copyrights embodied in the content of this file are licensed
- * by Yahoo! Inc. under the BSD (revised) open source license.
- */
-
-/**
- * Compress CSS (incomplete DO NOT USE)
- * 
- * @see https://github.com/yui/yuicompressor/blob/master/src/com/yahoo/platform/yui/compressor/CssCompressor.java
- *
- * @package Minify
- */
-class Minify_YUI_CssCompressor {
-
-    /**
-     * Minify a CSS string
-     *
-     * @param string $css
-     *
-     * @return string
-     */
-    public function compress($css, $linebreakpos = 0)
-    {
-        $css = str_replace("\r\n", "\n", $css);
-
-        /**
-         * @todo comment removal
-         * @todo re-port from newer Java version
-         */
-
-        // Normalize all whitespace strings to single spaces. Easier to work with that way.
-        $css = preg_replace('@\s+@', ' ', $css);
-
-        // Make a pseudo class for the Box Model Hack
-        $css = preg_replace("@\"\\\\\"}\\\\\"\"@", "___PSEUDOCLASSBMH___", $css);
-
-        // Remove the spaces before the things that should not have spaces before them.
-        // But, be careful not to turn "p :link {...}" into "p:link{...}"
-        // Swap out any pseudo-class colons with the token, and then swap back.
-        $css = preg_replace_callback("@(^|\\})(([^\\{:])+:)+([^\\{]*\\{)@", array($this, '_removeSpacesCB'), $css);
-
-        $css = preg_replace("@\\s+([!{};:>+\\(\\)\\],])@", "$1", $css);
-        $css = str_replace("___PSEUDOCLASSCOLON___", ":", $css);
-
-        // Remove the spaces after the things that should not have spaces after them.
-        $css = preg_replace("@([!{}:;>+\\(\\[,])\\s+@", "$1", $css);
-
-        // Add the semicolon where it's missing.
-        $css = preg_replace("@([^;\\}])}@", "$1;}", $css);
-
-        // Replace 0(px,em,%) with 0.
-        $css = preg_replace("@([\\s:])(0)(px|em|%|in|cm|mm|pc|pt|ex)@", "$1$2", $css);
-
-        // Replace 0 0 0 0; with 0.
-        $css = str_replace(":0 0 0 0;", ":0;", $css);
-        $css = str_replace(":0 0 0;", ":0;", $css);
-        $css = str_replace(":0 0;", ":0;", $css);
-
-        // Replace background-position:0; with background-position:0 0;
-        $css = str_replace("background-position:0;", "background-position:0 0;", $css);
-
-        // Replace 0.6 to .6, but only when preceded by : or a white-space
-        $css = preg_replace("@(:|\\s)0+\\.(\\d+)@", "$1.$2", $css);
-
-        // Shorten colors from rgb(51,102,153) to #336699
-        // This makes it more likely that it'll get further compressed in the next step.
-        $css = preg_replace_callback("@rgb\\s*\\(\\s*([0-9,\\s]+)\\s*\\)@", array($this, '_shortenRgbCB'), $css);
-
-        // Shorten colors from #AABBCC to #ABC. Note that we want to make sure
-        // the color is not preceded by either ", " or =. Indeed, the property
-        //     filter: chroma(color="#FFFFFF");
-        // would become
-        //     filter: chroma(color="#FFF");
-        // which makes the filter break in IE.
-        $css = preg_replace_callback("@([^\"'=\\s])(\\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])@", array($this, '_shortenHexCB'), $css);
-
-        // Remove empty rules.
-        $css = preg_replace("@[^\\}]+\\{;\\}@", "", $css);
-
-        $linebreakpos = isset($this->_options['linebreakpos'])
-            ? $this->_options['linebreakpos']
-            : 0;
-
-        if ($linebreakpos > 0) {
-            // Some source control tools don't like it when files containing lines longer
-            // than, say 8000 characters, are checked in. The linebreak option is used in
-            // that case to split long lines after a specific column.
-            $i = 0;
-            $linestartpos = 0;
-            $sb = $css;
-
-            // make sure strlen returns byte count
-            $mbIntEnc = null;
-            if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
-                $mbIntEnc = mb_internal_encoding();
-                mb_internal_encoding('8bit');
-            }
-            $sbLength = strlen($css);
-            while ($i < $sbLength) {
-                $c = $sb[$i++];
-                if ($c === '}' && $i - $linestartpos > $linebreakpos) {
-                    $sb = substr_replace($sb, "\n", $i, 0);
-                    $sbLength++;
-                    $linestartpos = $i;
-                }
-            }
-            $css = $sb;
-
-            // undo potential mb_encoding change
-            if ($mbIntEnc !== null) {
-                mb_internal_encoding($mbIntEnc);
-            }
-        }
-
-        // Replace the pseudo class for the Box Model Hack
-        $css = str_replace("___PSEUDOCLASSBMH___", "\"\\\\\"}\\\\\"\"", $css);
-
-        // Replace multiple semi-colons in a row by a single one
-        // See SF bug #1980989
-        $css = preg_replace("@;;+@", ";", $css);
-
-        // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/
-        $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css);
-
-        // Trim the final string (for any leading or trailing white spaces)
-        $css = trim($css);
-
-        return $css;
-    }
-
-    protected function _removeSpacesCB($m)
-    {
-        return str_replace(':', '___PSEUDOCLASSCOLON___', $m[0]);
-    }
-
-    protected function _shortenRgbCB($m)
-    {
-        $rgbcolors = explode(',', $m[1]);
-        $hexcolor = '#';
-        for ($i = 0; $i < count($rgbcolors); $i++) {
-            $val = round($rgbcolors[$i]);
-            if ($val < 16) {
-                $hexcolor .= '0';
-            }
-            $hexcolor .= dechex($val);
-        }
-        return $hexcolor;
-    }
-
-    protected function _shortenHexCB($m)
-    {
-        // Test for AABBCC pattern
-        if ((strtolower($m[3])===strtolower($m[4])) &&
-                (strtolower($m[5])===strtolower($m[6])) &&
-                (strtolower($m[7])===strtolower($m[8]))) {
-            return $m[1] . $m[2] . "#" . $m[3] . $m[5] . $m[7];
-        } else {
-            return $m[0];
-        }
-    }
-}
\ No newline at end of file
diff --git a/inc/lib/minify/Minify/YUICompressor.php b/inc/lib/minify/Minify/YUICompressor.php
deleted file mode 100755
index 5762e890..00000000
--- a/inc/lib/minify/Minify/YUICompressor.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Class Minify_YUICompressor 
- * @package Minify
- */
-
-/**
- * Compress Javascript/CSS using the YUI Compressor
- * 
- * You must set $jarFile and $tempDir before calling the minify functions.
- * Also, depending on your shell's environment, you may need to specify
- * the full path to java in $javaExecutable or use putenv() to setup the
- * Java environment.
- * 
- * <code>
- * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.4.6.jar';
- * Minify_YUICompressor::$tempDir = '/tmp';
- * $code = Minify_YUICompressor::minifyJs(
- *   $code
- *   ,array('nomunge' => true, 'line-break' => 1000)
- * );
- * </code>
- *
- * Note: In case you run out stack (default is 512k), you may increase stack size in $options:
- *   array('stack-size' => '2048k')
- *
- * @todo unit tests, $options docs
- * 
- * @package Minify
- * @author Stephen Clay <steve@mrclay.org>
- */
-class Minify_YUICompressor {
-
-    /**
-     * Filepath of the YUI Compressor jar file. This must be set before
-     * calling minifyJs() or minifyCss().
-     *
-     * @var string
-     */
-    public static $jarFile = null;
-    
-    /**
-     * Writable temp directory. This must be set before calling minifyJs()
-     * or minifyCss().
-     *
-     * @var string
-     */
-    public static $tempDir = null;
-    
-    /**
-     * Filepath of "java" executable (may be needed if not in shell's PATH)
-     *
-     * @var string
-     */
-    public static $javaExecutable = 'java';
-    
-    /**
-     * Minify a Javascript string
-     * 
-     * @param string $js
-     * 
-     * @param array $options (verbose is ignored)
-     * 
-     * @see http://www.julienlecomte.net/yuicompressor/README
-     * 
-     * @return string 
-     */
-    public static function minifyJs($js, $options = array())
-    {
-        return self::_minify('js', $js, $options);
-    }
-    
-    /**
-     * Minify a CSS string
-     * 
-     * @param string $css
-     * 
-     * @param array $options (verbose is ignored)
-     * 
-     * @see http://www.julienlecomte.net/yuicompressor/README
-     * 
-     * @return string 
-     */
-    public static function minifyCss($css, $options = array())
-    {
-        return self::_minify('css', $css, $options);
-    }
-    
-    private static function _minify($type, $content, $options)
-    {
-        self::_prepare();
-        if (! ($tmpFile = tempnam(self::$tempDir, 'yuic_'))) {
-            throw new Exception('Minify_YUICompressor : could not create temp file in "'.self::$tempDir.'".');
-        }
-        file_put_contents($tmpFile, $content);
-        exec(self::_getCmd($options, $type, $tmpFile), $output, $result_code);
-        unlink($tmpFile);
-        if ($result_code != 0) {
-            throw new Exception('Minify_YUICompressor : YUI compressor execution failed.');
-        }
-        return implode("\n", $output);
-    }
-    
-    private static function _getCmd($userOptions, $type, $tmpFile)
-    {
-        $o = array_merge(
-            array(
-                'charset' => ''
-                ,'line-break' => 5000
-                ,'type' => $type
-                ,'nomunge' => false
-                ,'preserve-semi' => false
-                ,'disable-optimizations' => false
-	            ,'stack-size' => ''
-            )
-            ,$userOptions
-        );
-        $cmd = self::$javaExecutable
-	         . (!empty($o['stack-size'])
-	            ? ' -Xss' . $o['stack-size']
-	            : '')
-	         . ' -jar ' . escapeshellarg(self::$jarFile)
-             . " --type {$type}"
-             . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
-                ? " --charset {$o['charset']}" 
-                : '')
-             . (is_numeric($o['line-break']) && $o['line-break'] >= 0
-                ? ' --line-break ' . (int)$o['line-break']
-                : '');
-        if ($type === 'js') {
-            foreach (array('nomunge', 'preserve-semi', 'disable-optimizations') as $opt) {
-                $cmd .= $o[$opt] 
-                    ? " --{$opt}"
-                    : '';
-            }
-        }
-        return $cmd . ' ' . escapeshellarg($tmpFile);
-    }
-    
-    private static function _prepare()
-    {
-        if (! is_file(self::$jarFile)) {
-            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not a valid file.');
-        }
-        if (! is_readable(self::$jarFile)) {
-            throw new Exception('Minify_YUICompressor : $jarFile('.self::$jarFile.') is not readable.');
-        }
-        if (! is_dir(self::$tempDir)) {
-            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not a valid direcotry.');
-        }
-        if (! is_writable(self::$tempDir)) {
-            throw new Exception('Minify_YUICompressor : $tempDir('.self::$tempDir.') is not writable.');
-        }
-    }
-}
-
diff --git a/inc/lib/minify/MrClay/Cli.php b/inc/lib/minify/MrClay/Cli.php
deleted file mode 100755
index 9aa8e06f..00000000
--- a/inc/lib/minify/MrClay/Cli.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php 
-
-namespace MrClay;
-
-use MrClay\Cli\Arg;
-use InvalidArgumentException;
-
-/**
- * Forms a front controller for a console app, handling and validating arguments (options)
- *
- * Instantiate, add arguments, then call validate(). Afterwards, the user's valid arguments
- * and their values will be available in $cli->values.
- *
- * You may also specify that some arguments be used to provide input/output. By communicating
- * solely through the file pointers provided by openInput()/openOutput(), you can make your
- * app more flexible to end users.
- *
- * @author Steve Clay <steve@mrclay.org>
- * @license http://www.opensource.org/licenses/mit-license.php  MIT License
- */
-class Cli {
-    
-    /**
-     * @var array validation errors
-     */
-    public $errors = array();
-    
-    /**
-     * @var array option values available after validation.
-     * 
-     * E.g. array(
-     *      'a' => false              // option was missing
-     *     ,'b' => true               // option was present
-     *     ,'c' => "Hello"            // option had value
-     *     ,'f' => "/home/user/file"  // file path from root
-     *     ,'f.raw' => "~/file"       // file path as given to option
-     * )
-     */
-    public $values = array();
-
-    /**
-     * @var array
-     */
-    public $moreArgs = array();
-
-    /**
-     * @var array
-     */
-    public $debug = array();
-
-    /**
-     * @var bool The user wants help info
-     */
-    public $isHelpRequest = false;
-
-    /**
-     * @var Arg[]
-     */
-    protected $_args = array();
-
-    /**
-     * @var resource
-     */
-    protected $_stdin = null;
-
-    /**
-     * @var resource
-     */
-    protected $_stdout = null;
-    
-    /**
-     * @param bool $exitIfNoStdin (default true) Exit() if STDIN is not defined
-     */
-    public function __construct($exitIfNoStdin = true)
-    {
-        if ($exitIfNoStdin && ! defined('STDIN')) {
-            exit('This script is for command-line use only.');
-        }
-        if (isset($GLOBALS['argv'][1])
-             && ($GLOBALS['argv'][1] === '-?' || $GLOBALS['argv'][1] === '--help')) {
-            $this->isHelpRequest = true;
-        }
-    }
-
-    /**
-     * @param Arg|string $letter
-     * @return Arg
-     */
-    public function addOptionalArg($letter)
-    {
-        return $this->addArgument($letter, false);
-    }
-
-    /**
-     * @param Arg|string $letter
-     * @return Arg
-     */
-    public function addRequiredArg($letter)
-    {
-        return $this->addArgument($letter, true);
-    }
-
-    /**
-     * @param string $letter
-     * @param bool $required
-     * @param Arg|null $arg
-     * @return Arg
-     * @throws InvalidArgumentException
-     */
-    public function addArgument($letter, $required, Arg $arg = null)
-    {
-        if (! preg_match('/^[a-zA-Z]$/', $letter)) {
-            throw new InvalidArgumentException('$letter must be in [a-zA-Z]');
-        }
-        if (! $arg) {
-            $arg = new Arg($required);
-        }
-        $this->_args[$letter] = $arg;
-        return $arg;
-    }
-
-    /**
-     * @param string $letter
-     * @return Arg|null
-     */
-    public function getArgument($letter)
-    {
-        return isset($this->_args[$letter]) ? $this->_args[$letter] : null;
-    }
-
-    /*
-     * Read and validate options
-     * 
-     * @return bool true if all options are valid
-     */
-    public function validate()
-    {
-        $options = '';
-        $this->errors = array();
-        $this->values = array();
-        $this->_stdin = null;
-        
-        if ($this->isHelpRequest) {
-            return false;
-        }
-        
-        $lettersUsed = '';
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Arg $arg  */
-            $options .= $letter;
-            $lettersUsed .= $letter;
-            
-            if ($arg->mayHaveValue || $arg->mustHaveValue) {
-                $options .= ($arg->mustHaveValue ? ':' : '::');
-            }
-        }
-
-        $this->debug['argv'] = $GLOBALS['argv'];
-        $argvCopy = array_slice($GLOBALS['argv'], 1);
-        $o = getopt($options);
-        $this->debug['getopt_options'] = $options;
-        $this->debug['getopt_return'] = $o;
-
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Arg $arg  */
-            $this->values[$letter] = false;
-            if (isset($o[$letter])) {
-                if (is_bool($o[$letter])) {
-
-                    // remove from argv copy
-                    $k = array_search("-$letter", $argvCopy);
-                    if ($k !== false) {
-                        array_splice($argvCopy, $k, 1);
-                    }
-
-                    if ($arg->mustHaveValue) {
-                        $this->addError($letter, "Missing value");
-                    } else {
-                        $this->values[$letter] = true;
-                    }
-                } else {
-                    // string
-                    $this->values[$letter] = $o[$letter];
-                    $v =& $this->values[$letter];
-
-                    // remove from argv copy
-                    // first look for -ovalue or -o=value
-                    $pattern = "/^-{$letter}=?" . preg_quote($v, '/') . "$/";
-                    $foundInArgv = false;
-                    foreach ($argvCopy as $k => $argV) {
-                        if (preg_match($pattern, $argV)) {
-                            array_splice($argvCopy, $k, 1);
-                            $foundInArgv = true;
-                            break;
-                        }
-                    }
-                    if (! $foundInArgv) {
-                        // space separated
-                        $k = array_search("-$letter", $argvCopy);
-                        if ($k !== false) {
-                            array_splice($argvCopy, $k, 2);
-                        }
-                    }
-                    
-                    // check that value isn't really another option
-                    if (strlen($lettersUsed) > 1) {
-                        $pattern = "/^-[" . str_replace($letter, '', $lettersUsed) . "]/i";
-                        if (preg_match($pattern, $v)) {
-                            $this->addError($letter, "Value was read as another option: %s", $v);
-                            return false;
-                        }    
-                    }
-                    if ($arg->assertFile || $arg->assertDir) {
-                        if ($v[0] !== '/' && $v[0] !== '~') {
-                            $this->values["$letter.raw"] = $v;
-                            $v = getcwd() . "/$v";
-                        }
-                    }
-                    if ($arg->assertFile) {
-                        if ($arg->useAsInfile) {
-                            $this->_stdin = $v;
-                        } elseif ($arg->useAsOutfile) {
-                            $this->_stdout = $v;
-                        }
-                        if ($arg->assertReadable && ! is_readable($v)) {
-                            $this->addError($letter, "File not readable: %s", $v);
-                            continue;
-                        }
-                        if ($arg->assertWritable) {
-                            if (is_file($v)) {
-                                if (! is_writable($v)) {
-                                    $this->addError($letter, "File not writable: %s", $v);
-                                }
-                            } else {
-                                if (! is_writable(dirname($v))) {
-                                    $this->addError($letter, "Directory not writable: %s", dirname($v));
-                                }
-                            }
-                        }
-                    } elseif ($arg->assertDir && $arg->assertWritable && ! is_writable($v)) {
-                        $this->addError($letter, "Directory not readable: %s", $v);
-                    }
-                }
-            } else {
-                if ($arg->isRequired()) {
-                    $this->addError($letter, "Missing");
-                }
-            }
-        }
-        $this->moreArgs = $argvCopy;
-        reset($this->moreArgs);
-        return empty($this->errors);
-    }
-
-    /**
-     * Get the full paths of file(s) passed in as unspecified arguments
-     *
-     * @return array
-     */
-    public function getPathArgs()
-    {
-        $r = $this->moreArgs;
-        foreach ($r as $k => $v) {
-            if ($v[0] !== '/' && $v[0] !== '~') {
-                $v = getcwd() . "/$v";
-                $v = str_replace('/./', '/', $v);
-                do {
-                    $v = preg_replace('@/[^/]+/\\.\\./@', '/', $v, 1, $changed);
-                } while ($changed);
-                $r[$k] = $v;
-            }
-        }
-        return $r;
-    }
-    
-    /**
-     * Get a short list of errors with options
-     * 
-     * @return string
-     */
-    public function getErrorReport()
-    {
-        if (empty($this->errors)) {
-            return '';
-        }
-        $r = "Some arguments did not pass validation:\n";
-        foreach ($this->errors as $letter => $arr) {
-            $r .= "  $letter : " . implode(', ', $arr) . "\n";
-        }
-        $r .= "\n";
-        return $r;
-    }
-
-    /**
-     * @return string
-     */
-    public function getArgumentsListing()
-    {
-        $r = "\n";
-        foreach ($this->_args as $letter => $arg) {
-            /* @var Arg $arg  */
-            $desc = $arg->getDescription();
-            $flag = " -$letter ";
-            if ($arg->mayHaveValue) {
-                $flag .= "[VAL]";
-            } elseif ($arg->mustHaveValue) {
-                $flag .= "VAL";
-            }
-            if ($arg->assertFile) {
-                $flag = str_replace('VAL', 'FILE', $flag);
-            } elseif ($arg->assertDir) {
-                $flag = str_replace('VAL', 'DIR', $flag);
-            }
-            if ($arg->isRequired()) {
-                $desc = "(required) $desc";
-            }
-            $flag = str_pad($flag, 12, " ", STR_PAD_RIGHT);
-            $desc = wordwrap($desc, 70);
-            $r .= $flag . str_replace("\n", "\n            ", $desc) . "\n\n";
-        }
-        return $r;
-    }
-    
-    /**
-     * Get resource of open input stream. May be STDIN or a file pointer
-     * to the file specified by an option with 'STDIN'.
-     *
-     * @return resource
-     */
-    public function openInput()
-    {
-        if (null === $this->_stdin) {
-            return STDIN;
-        } else {
-            $this->_stdin = fopen($this->_stdin, 'rb');
-            return $this->_stdin;
-        }
-    }
-    
-    public function closeInput()
-    {
-        if (null !== $this->_stdin) {
-            fclose($this->_stdin);
-        }
-    }
-    
-    /**
-     * Get resource of open output stream. May be STDOUT or a file pointer
-     * to the file specified by an option with 'STDOUT'. The file will be
-     * truncated to 0 bytes on opening.
-     *
-     * @return resource
-     */
-    public function openOutput()
-    {
-        if (null === $this->_stdout) {
-            return STDOUT;
-        } else {
-            $this->_stdout = fopen($this->_stdout, 'wb');
-            return $this->_stdout;
-        }
-    }
-    
-    public function closeOutput()
-    {
-        if (null !== $this->_stdout) {
-            fclose($this->_stdout);
-        }
-    }
-
-    /**
-     * @param string $letter
-     * @param string $msg
-     * @param string $value
-     */
-    protected function addError($letter, $msg, $value = null)
-    {
-        if ($value !== null) {
-            $value = var_export($value, 1);
-        }
-        $this->errors[$letter][] = sprintf($msg, $value);
-    }
-}
-
diff --git a/inc/lib/minify/MrClay/Cli/Arg.php b/inc/lib/minify/MrClay/Cli/Arg.php
deleted file mode 100755
index 5fa59327..00000000
--- a/inc/lib/minify/MrClay/Cli/Arg.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-namespace MrClay\Cli;
-
-use BadMethodCallException;
-
-/**
- * An argument for a CLI app. This specifies the argument, what values it expects and
- * how it's treated during validation.
- *
- * By default, the argument will be assumed to be an optional letter flag with no value following.
- *
- * If the argument may receive a value, call mayHaveValue(). If there's whitespace after the
- * flag, the value will be returned as true instead of the string.
- *
- * If the argument MUST be accompanied by a value, call mustHaveValue(). In this case, whitespace
- * is permitted between the flag and its value.
- *
- * Use assertFile() or assertDir() to indicate that the argument must return a string value
- * specifying a file or directory. During validation, the value will be resolved to a
- * full file/dir path (not necessarily existing!) and the original value will be accessible
- * via a "*.raw" key. E.g. $cli->values['f.raw']
- *
- * Use assertReadable()/assertWritable() to cause the validator to test the file/dir for
- * read/write permissions respectively.
- *
- * @method \MrClay\Cli\Arg mayHaveValue() Assert that the argument, if present, may receive a string value
- * @method \MrClay\Cli\Arg mustHaveValue() Assert that the argument, if present, must receive a string value
- * @method \MrClay\Cli\Arg assertFile() Assert that the argument's value must specify a file
- * @method \MrClay\Cli\Arg assertDir() Assert that the argument's value must specify a directory
- * @method \MrClay\Cli\Arg assertReadable() Assert that the specified file/dir must be readable
- * @method \MrClay\Cli\Arg assertWritable() Assert that the specified file/dir must be writable
- *
- * @property-read bool mayHaveValue
- * @property-read bool mustHaveValue
- * @property-read bool assertFile
- * @property-read bool assertDir
- * @property-read bool assertReadable
- * @property-read bool assertWritable
- * @property-read bool useAsInfile
- * @property-read bool useAsOutfile
- *
- * @author Steve Clay <steve@mrclay.org>
- * @license http://www.opensource.org/licenses/mit-license.php  MIT License
- */
-class Arg {
-    /**
-     * @return array
-     */
-    public function getDefaultSpec()
-    {
-        return array(
-            'mayHaveValue' => false,
-            'mustHaveValue' => false,
-            'assertFile' => false,
-            'assertDir' => false,
-            'assertReadable' => false,
-            'assertWritable' => false,
-            'useAsInfile' => false,
-            'useAsOutfile' => false,
-        );
-    }
-
-    /**
-     * @var array
-     */
-    protected $spec = array();
-
-    /**
-     * @var bool
-     */
-    protected $required = false;
-
-    /**
-     * @var string
-     */
-    protected $description = '';
-
-    /**
-     * @param bool $isRequired
-     */
-    public function __construct($isRequired = false)
-    {
-        $this->spec = $this->getDefaultSpec();
-        $this->required = (bool) $isRequired;
-        if ($isRequired) {
-            $this->spec['mustHaveValue'] = true;
-        }
-    }
-
-    /**
-     * Assert that the argument's value points to a writable file. When
-     * Cli::openOutput() is called, a write pointer to this file will
-     * be provided.
-     * @return Arg
-     */
-    public function useAsOutfile()
-    {
-        $this->spec['useAsOutfile'] = true;
-        return $this->assertFile()->assertWritable();
-    }
-
-    /**
-     * Assert that the argument's value points to a readable file. When
-     * Cli::openInput() is called, a read pointer to this file will
-     * be provided.
-     * @return Arg
-     */
-    public function useAsInfile()
-    {
-        $this->spec['useAsInfile'] = true;
-        return $this->assertFile()->assertReadable();
-    }
-
-    /**
-     * @return array
-     */
-    public function getSpec()
-    {
-        return $this->spec;
-    }
-
-    /**
-     * @param string $desc
-     * @return Arg
-     */
-    public function setDescription($desc)
-    {
-        $this->description = $desc;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isRequired()
-    {
-        return $this->required;
-    }
-
-    /**
-     * Note: magic methods declared in class PHPDOC
-     *
-     * @param string $name
-     * @param array $args
-     * @return Arg
-     * @throws BadMethodCallException
-     */
-    public function __call($name, array $args = array())
-    {
-        if (array_key_exists($name, $this->spec)) {
-            $this->spec[$name] = true;
-            if ($name === 'assertFile' || $name === 'assertDir') {
-                $this->spec['mustHaveValue'] = true;
-            }
-        } else {
-            throw new BadMethodCallException('Method does not exist');
-        }
-        return $this;
-    }
-
-    /**
-     * Note: magic properties declared in class PHPDOC
-     *
-     * @param string $name
-     * @return bool|null
-     */
-    public function __get($name)
-    {
-        if (array_key_exists($name, $this->spec)) {
-            return $this->spec[$name];
-        }
-        return null;
-    }
-}
diff --git a/inc/lib/twig/extensions/Extension/I18n.php b/inc/lib/twig/extensions/Extension/I18n.php
new file mode 100644
index 00000000..bc6a05bd
--- /dev/null
+++ b/inc/lib/twig/extensions/Extension/I18n.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extensions_Extension_I18n extends Twig_Extension
+{
+    /**
+     * Returns the token parser instances to add to the existing list.
+     *
+     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
+     */
+    public function getTokenParsers()
+    {
+        return array(new Twig_Extensions_TokenParser_Trans());
+    }
+
+    /**
+     * Returns a list of filters to add to the existing list.
+     *
+     * @return array An array of filters
+     */
+    public function getFilters()
+    {
+        return array(
+           new Twig_SimpleFilter('trans', 'gettext'),
+        );
+    }
+
+    /**
+     * Returns the name of the extension.
+     *
+     * @return string The extension name
+     */
+    public function getName()
+    {
+        return 'i18n';
+    }
+}
+
diff --git a/inc/lib/twig/extensions/Extension/Tinyboard.php b/inc/lib/twig/extensions/Extension/Tinyboard.php
new file mode 100644
index 00000000..da75ee75
--- /dev/null
+++ b/inc/lib/twig/extensions/Extension/Tinyboard.php
@@ -0,0 +1,298 @@
+<?php
+
+class Twig_Extensions_Extension_Tinyboard extends Twig_Extension
+{
+	/**
+	* Returns a list of filters to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFilters()
+	{
+		return array(
+			new Twig_SimpleFilter('filesize', 'format_bytes'),
+			new Twig_SimpleFilter('truncate', 'twig_truncate_filter'),
+			new Twig_SimpleFilter('truncate_body', 'truncate'),
+			new Twig_SimpleFilter('truncate_filename', 'twig_filename_truncate_filter'),
+			new Twig_SimpleFilter('extension', 'twig_extension_filter'),
+			new Twig_SimpleFilter('sprintf', 'sprintf'),
+			new Twig_SimpleFilter('capcode', 'capcode'),
+			new Twig_SimpleFilter('remove_modifiers', 'remove_modifiers'),
+			new Twig_SimpleFilter('hasPermission', 'twig_hasPermission_filter'),
+			new Twig_SimpleFilter('date', 'twig_date_filter'),
+			new Twig_SimpleFilter('poster_id', 'poster_id'),
+			new Twig_SimpleFilter('remove_whitespace', 'twig_remove_whitespace_filter'),
+			new Twig_SimpleFilter('count', 'count'),
+			new Twig_SimpleFilter('ago', 'ago'),
+			new Twig_SimpleFilter('until', 'until'),
+			new Twig_SimpleFilter('push', 'twig_push_filter'),
+			new Twig_SimpleFilter('bidi_cleanup', 'bidi_cleanup'),
+			new Twig_SimpleFilter('addslashes', 'addslashes'),
+		);
+	}
+	
+	/**
+	* Returns a list of functions to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFunctions()
+	{
+		return array(
+			new Twig_SimpleFunction('time', 'time'),
+			new Twig_SimpleFunction('floor', 'floor'),
+			new Twig_SimpleFunction('timezone', 'twig_timezone_function'),
+			new Twig_SimpleFunction('hiddenInputs', 'hiddenInputs'),
+			new Twig_SimpleFunction('hiddenInputsHash', 'hiddenInputsHash'),
+			new Twig_SimpleFunction('ratio', 'twig_ratio_function'),
+			new Twig_SimpleFunction('secure_link_confirm', 'twig_secure_link_confirm'),
+			new Twig_SimpleFunction('secure_link', 'twig_secure_link'),
+			new Twig_SimpleFunction('link_for', 'link_for')
+		);
+	}
+	
+	/**
+	* Returns the name of the extension.
+	*
+	* @return string The extension name
+	*/
+	public function getName()
+	{
+		return 'tinyboard';
+	}
+}
+
+function twig_timezone_function() {
+	return 'Z';
+}
+
+function twig_push_filter($array, $value) {
+	array_push($array, $value);
+	return $array;
+}
+
+function twig_remove_whitespace_filter($data) {
+	return preg_replace('/[\t\r\n]/', '', $data);
+}
+
+function custom_strftime(string $format, $timestamp = null, ?string $locale = null): string
+{
+	if (null === $timestamp) {
+		$timestamp = new \DateTime;
+	}
+	elseif (is_numeric($timestamp)) {
+		$timestamp = date_create('@' . $timestamp);
+
+		if ($timestamp) {
+			$timestamp->setTimezone(new \DateTimezone(date_default_timezone_get()));
+		}
+	}
+	elseif (is_string($timestamp)) {
+		$timestamp = date_create($timestamp);
+	}
+
+	if (!($timestamp instanceof \DateTimeInterface)) {
+		throw new \InvalidArgumentException('$timestamp argument is neither a valid UNIX timestamp, a valid date-time string or a DateTime object.');
+	}
+
+	$locale = substr((string) $locale, 0, 5);
+
+	$intl_formats = [
+		'%a' => 'EEE',	// An abbreviated textual representation of the day	Sun through Sat
+		'%A' => 'EEEE',	// A full textual representation of the day	Sunday through Saturday
+		'%b' => 'MMM',	// Abbreviated month name, based on the locale	Jan through Dec
+		'%B' => 'MMMM',	// Full month name, based on the locale	January through December
+		'%h' => 'MMM',	// Abbreviated month name, based on the locale (an alias of %b)	Jan through Dec
+	];
+
+	$intl_formatter = function (\DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
+		$tz = $timestamp->getTimezone();
+		$date_type = \IntlDateFormatter::FULL;
+		$time_type = \IntlDateFormatter::FULL;
+		$pattern = '';
+
+		// %c = Preferred date and time stamp based on locale
+		// Example: Tue Feb 5 00:45:10 2009 for February 5, 2009 at 12:45:10 AM
+		if ($format == '%c') {
+			$date_type = \IntlDateFormatter::LONG;
+			$time_type = \IntlDateFormatter::SHORT;
+		}
+		// %x = Preferred date representation based on locale, without the time
+		// Example: 02/05/09 for February 5, 2009
+		elseif ($format == '%x') {
+			$date_type = \IntlDateFormatter::SHORT;
+			$time_type = \IntlDateFormatter::NONE;
+		}
+		// Localized time format
+		elseif ($format == '%X') {
+			$date_type = \IntlDateFormatter::NONE;
+			$time_type = \IntlDateFormatter::MEDIUM;
+		}
+		else {
+			$pattern = $intl_formats[$format];
+		}
+
+		return (new \IntlDateFormatter($locale, $date_type, $time_type, $tz, null, $pattern))->format($timestamp);
+	};
+
+	// Same order as https://www.php.net/manual/en/function.strftime.php
+	$translation_table = [
+		// Day
+		'%a' => $intl_formatter,
+		'%A' => $intl_formatter,
+		'%d' => 'd',
+		'%e' => function ($timestamp) {
+			return sprintf('% 2u', $timestamp->format('j'));
+		},
+		'%j' => function ($timestamp) {
+			// Day number in year, 001 to 366
+			return sprintf('%03d', $timestamp->format('z')+1);
+		},
+		'%u' => 'N',
+		'%w' => 'w',
+
+		// Week
+		'%U' => function ($timestamp) {
+			// Number of weeks between date and first Sunday of year
+			$day = new \DateTime(sprintf('%d-01 Sunday', $timestamp->format('Y')));
+			return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+		},
+		'%V' => 'W',
+		'%W' => function ($timestamp) {
+			// Number of weeks between date and first Monday of year
+			$day = new \DateTime(sprintf('%d-01 Monday', $timestamp->format('Y')));
+			return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+		},
+
+		// Month
+		'%b' => $intl_formatter,
+		'%B' => $intl_formatter,
+		'%h' => $intl_formatter,
+		'%m' => 'm',
+
+		// Year
+		'%C' => function ($timestamp) {
+			// Century (-1): 19 for 20th century
+			return floor($timestamp->format('Y') / 100);
+		},
+		'%g' => function ($timestamp) {
+			return substr($timestamp->format('o'), -2);
+		},
+		'%G' => 'o',
+		'%y' => 'y',
+		'%Y' => 'Y',
+
+		// Time
+		'%H' => 'H',
+		'%k' => function ($timestamp) {
+			return sprintf('% 2u', $timestamp->format('G'));
+		},
+		'%I' => 'h',
+		'%l' => function ($timestamp) {
+			return sprintf('% 2u', $timestamp->format('g'));
+		},
+		'%M' => 'i',
+		'%p' => 'A', // AM PM (this is reversed on purpose!)
+		'%P' => 'a', // am pm
+		'%r' => 'h:i:s A', // %I:%M:%S %p
+		'%R' => 'H:i', // %H:%M
+		'%S' => 's',
+		'%T' => 'H:i:s', // %H:%M:%S
+		'%X' => $intl_formatter, // Preferred time representation based on locale, without the date
+
+		// Timezone
+		'%z' => 'O',
+		'%Z' => 'T',
+
+		// Time and Date Stamps
+		'%c' => $intl_formatter,
+		'%D' => 'm/d/Y',
+		'%F' => 'Y-m-d',
+		'%s' => 'U',
+		'%x' => $intl_formatter,
+	];
+
+	$out = preg_replace_callback('/(?<!%)(%[a-zA-Z])/', function ($match) use ($translation_table, $timestamp) {
+		if ($match[1] == '%n') {
+			return "\n";
+		}
+		elseif ($match[1] == '%t') {
+			return "\t";
+		}
+
+		if (!isset($translation_table[$match[1]])) {
+			throw new \InvalidArgumentException(sprintf('Format "%s" is unknown in time format', $match[1]));
+		}
+
+		$replace = $translation_table[$match[1]];
+
+		if (is_string($replace)) {
+			return $timestamp->format($replace);
+		}
+		else {
+			return $replace($timestamp, $match[1]);
+		}
+	}, $format);
+
+	$out = str_replace('%%', '%', $out);
+	return $out;
+}
+
+function twig_date_filter($date, $format) {
+	return custom_strftime($format, $date);
+}
+
+function twig_hasPermission_filter($mod, $permission, $board = null) {
+	return hasPermission($permission, $board, $mod);
+}
+
+function twig_extension_filter($value, $case_insensitive = true) {
+	$ext = mb_substr($value, mb_strrpos($value, '.') + 1);
+	if($case_insensitive)
+		$ext = mb_strtolower($ext);		
+	return $ext;
+}
+
+function twig_sprintf_filter( $value, $var) {
+	return sprintf($value, $var);
+}
+
+function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '…') {
+	if (mb_strlen($value) > $length) {
+		if ($preserve) {
+			if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
+				$length = $breakpoint;
+			}
+		}
+		return mb_substr($value, 0, $length) . $separator;
+	}
+	return $value;
+}
+
+function twig_filename_truncate_filter($value, $length = 30, $separator = '…') {
+	if (mb_strlen($value) > $length) {
+		$value = strrev($value);
+		$array = array_reverse(explode(".", $value, 2));
+		$array = array_map("strrev", $array);
+		
+		$filename = &$array[0];
+		$extension = isset($array[1]) ? $array[1] : false;
+
+		$filename = mb_substr($filename, 0, $length - ($extension ? mb_strlen($extension) + 1 : 0)) . $separator;
+
+		return implode(".", $array);
+	}
+	return $value;
+}
+
+function twig_ratio_function($w, $h) {
+	return fraction($w, $h, ':');
+}
+function twig_secure_link_confirm($text, $title, $confirm_message, $href) {
+	global $config;
+
+	return '<a onclick="if (event.which==2) return true;if (confirm(\'' . htmlentities(addslashes($confirm_message)) . '\')) document.location=\'?/' . htmlspecialchars(addslashes($href . '/' . make_secure_link_token($href))) . '\';return false;" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
+}
+function twig_secure_link($href) {
+	return $href . '/' . make_secure_link_token($href);
+}
diff --git a/inc/lib/twig/extensions/Node/Trans.php b/inc/lib/twig/extensions/Node/Trans.php
new file mode 100644
index 00000000..e7dc1ca8
--- /dev/null
+++ b/inc/lib/twig/extensions/Node/Trans.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Represents a trans node.
+ *
+ * @package    twig
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ */
+class Twig_Extensions_Node_Trans extends Twig_Node
+{
+    public function __construct(Twig_NodeInterface $body, Twig_NodeInterface $plural = null, Twig_Node_Expression $count = null, $lineno, $tag = null)
+    {
+        parent::__construct(array('count' => $count, 'body' => $body, 'plural' => $plural), array(), $lineno, $tag);
+    }
+
+    /**
+     * Compiles the node to PHP.
+     *
+     * @param Twig_Compiler A Twig_Compiler instance
+     */
+    public function compile(Twig_Compiler $compiler)
+    {
+        $compiler->addDebugInfo($this);
+
+        list($msg, $vars) = $this->compileString($this->getNode('body'));
+
+        if (null !== $this->getNode('plural')) {
+            list($msg1, $vars1) = $this->compileString($this->getNode('plural'));
+
+            $vars = array_merge($vars, $vars1);
+        }
+
+        $function = null === $this->getNode('plural') ? 'gettext' : 'ngettext';
+
+        if ($vars) {
+            $compiler
+                ->write('echo strtr('.$function.'(')
+                ->subcompile($msg)
+            ;
+
+            if (null !== $this->getNode('plural')) {
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($msg1)
+                    ->raw(', abs(')
+                    ->subcompile($this->getNode('count'))
+                    ->raw(')')
+                ;
+            }
+
+            $compiler->raw('), array(');
+
+            foreach ($vars as $var) {
+                if ('count' === $var->getAttribute('name')) {
+                    $compiler
+                        ->string('%count%')
+                        ->raw(' => abs(')
+                        ->subcompile($this->getNode('count'))
+                        ->raw('), ')
+                    ;
+                } else {
+                    $compiler
+                        ->string('%'.$var->getAttribute('name').'%')
+                        ->raw(' => ')
+                        ->subcompile($var)
+                        ->raw(', ')
+                    ;
+                }
+            }
+
+            $compiler->raw("));\n");
+        } else {
+            $compiler
+                ->write('echo '.$function.'(')
+                ->subcompile($msg)
+            ;
+
+            if (null !== $this->getNode('plural')) {
+                $compiler
+                    ->raw(', ')
+                    ->subcompile($msg1)
+                    ->raw(', abs(')
+                    ->subcompile($this->getNode('count'))
+                    ->raw(')')
+                ;
+            }
+
+            $compiler->raw(");\n");
+        }
+    }
+
+    protected function compileString(Twig_NodeInterface $body)
+    {
+        if ($body instanceof Twig_Node_Expression_Name || $body instanceof Twig_Node_Expression_Constant || $body instanceof Twig_Node_Expression_TempName) {
+            return array($body, array());
+        }
+
+        $vars = array();
+        if (count($body)) {
+            $msg = '';
+
+            foreach ($body as $node) {
+                if (get_class($node) === 'Twig_Node' && $node->getNode(0) instanceof Twig_Node_SetTemp) {
+                    $node = $node->getNode(1);
+                }
+
+                if ($node instanceof Twig_Node_Print) {
+                    $n = $node->getNode('expr');
+                    while ($n instanceof Twig_Node_Expression_Filter) {
+                        $n = $n->getNode('node');
+                    }
+                    $msg .= sprintf('%%%s%%', $n->getAttribute('name'));
+                    $vars[] = new Twig_Node_Expression_Name($n->getAttribute('name'), $n->getLine());
+                } else {
+                    $msg .= $node->getAttribute('data');
+                }
+            }
+        } else {
+            $msg = $body->getAttribute('data');
+        }
+
+        return array(new Twig_Node(array(new Twig_Node_Expression_Constant(trim($msg), $body->getLine()))), $vars);
+    }
+}
\ No newline at end of file
diff --git a/inc/lib/twig/extensions/TokenParser/Trans.php b/inc/lib/twig/extensions/TokenParser/Trans.php
new file mode 100644
index 00000000..4a0fad41
--- /dev/null
+++ b/inc/lib/twig/extensions/TokenParser/Trans.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) 2010 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+class Twig_Extensions_TokenParser_Trans extends Twig_TokenParser
+{
+    /**
+     * Parses a token and returns a node.
+     *
+     * @param Twig_Token $token A Twig_Token instance
+     *
+     * @return Twig_NodeInterface A Twig_NodeInterface instance
+     */
+    public function parse(Twig_Token $token)
+    {
+        $lineno = $token->getLine();
+        $stream = $this->parser->getStream();
+        $count = null;
+        $plural = null;
+
+        if (!$stream->test(Twig_Token::BLOCK_END_TYPE)) {
+            $body = $this->parser->getExpressionParser()->parseExpression();
+        } else {
+            $stream->expect(Twig_Token::BLOCK_END_TYPE);
+            $body = $this->parser->subparse(array($this, 'decideForFork'));
+            if ('plural' === $stream->next()->getValue()) {
+                $count = $this->parser->getExpressionParser()->parseExpression();
+                $stream->expect(Twig_Token::BLOCK_END_TYPE);
+                $plural = $this->parser->subparse(array($this, 'decideForEnd'), true);
+            }
+        }
+
+        $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+        $this->checkTransString($body, $lineno);
+
+        return new Twig_Extensions_Node_Trans($body, $plural, $count, $lineno, $this->getTag());
+    }
+
+    public function decideForFork(Twig_Token $token)
+    {
+        return $token->test(array('plural', 'endtrans'));
+    }
+
+    public function decideForEnd(Twig_Token $token)
+    {
+        return $token->test('endtrans');
+    }
+
+    /**
+     * Gets the tag name associated with this token parser.
+     *
+     * @param string The tag name
+     */
+    public function getTag()
+    {
+        return 'trans';
+    }
+
+    protected function checkTransString(Twig_NodeInterface $body, $lineno)
+    {
+        foreach ($body as $i => $node) {
+            if (
+                $node instanceof Twig_Node_Text
+                ||
+                ($node instanceof Twig_Node_Print && $node->getNode('expr') instanceof Twig_Node_Expression_Name)
+            ) {
+                continue;
+            }
+
+            throw new Twig_Error_Syntax(sprintf('The text to be translated with "trans" can only contain references to simple variables'), $lineno);
+        }
+    }
+}
\ No newline at end of file
diff --git a/inc/mod/auth.php b/inc/mod/auth.php
index 5705c8a2..91a0dfe9 100644
--- a/inc/mod/auth.php
+++ b/inc/mod/auth.php
@@ -123,13 +123,13 @@ function setCookies() {
 			$mod['hash'][0] . // password
 			':' .
 			$mod['hash'][1], // salt
-		time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', $config['cookies']['httponly']);
+		time() + $config['cookies']['expire'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', $config["domain"], !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', $config['cookies']['httponly']);
 }
 
 function destroyCookies() {
 	global $config;
 	// Delete the cookies
-	setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true);
+	setcookie($config['cookies']['mod'], 'deleted', time() - $config['cookies']['expire'], $config['cookies']['jail']?$config['cookies']['path'] : '/', $config["domain"], !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true);
 }
 
 function modLog($action, $_board=null) {
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index fbce7ff7..36a2c979 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -154,7 +154,7 @@ function mod_dashboard() {
 				$latest = false;
 			}
 	
-			setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', null, !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true);
+			setcookie('update', serialize($latest), time() + $config['check_updates_time'], $config['cookies']['jail'] ? $config['cookies']['path'] : '/', $config["domain"], !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off', true);
 		}
 		
 		if ($latest)
@@ -2647,6 +2647,29 @@ function mod_new_pm($username) {
 	));
 }
 
+function deleteDirectory($dir) {
+    if (!file_exists($dir)) {
+        return true;
+    }
+
+    if (!is_dir($dir)) {
+        return unlink($dir);
+    }
+
+    foreach (scandir($dir) as $item) {
+        if ($item == '.' || $item == '..') {
+            continue;
+        }
+
+        if (!deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) {
+            return false;
+        }
+
+    }
+
+    return rmdir($dir);
+}
+
 function mod_rebuild() {
 	global $config, $twig;
 	
@@ -2668,7 +2691,7 @@ function mod_rebuild() {
 			
 			$log[] = 'Clearing template cache';
 			load_twig();
-			$twig->clearCacheFiles();
+			deleteDirectory($twig->getCache());
 		}
 		
 		if (isset($_POST['rebuild_themes'])) {
@@ -2681,7 +2704,6 @@ function mod_rebuild() {
 			buildJavascript();
 			$rebuilt_scripts[] = $config['file_script'];
 		}
-		
 		foreach ($boards as $board) {
 			if (!(isset($_POST['boards_all']) || isset($_POST['board_' . $board['uri']])))
 				continue;
diff --git a/inc/template.php b/inc/template.php
index 48b2b1bb..a74cc0ec 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -4,6 +4,7 @@
  *  Copyright (c) 2010-2013 Tinyboard Development Group
  */
 
+require_once 'inc/bootstrap.php';
 defined('TINYBOARD') or exit;
 
 $twig = false;
@@ -11,26 +12,19 @@ $twig = false;
 function load_twig() {
 	global $twig, $config;
 	
-	require 'lib/Twig/Autoloader.php';
-	Twig_Autoloader::register();
-
-	Twig_Autoloader::autoload('Twig_Extensions_Node_Trans');
-	Twig_Autoloader::autoload('Twig_Extensions_TokenParser_Trans');
-	Twig_Autoloader::autoload('Twig_Extensions_Extension_I18n');
-	Twig_Autoloader::autoload('Twig_Extensions_Extension_Tinyboard');
-	
 	$loader = new Twig_Loader_Filesystem($config['dir']['template']);
 	$loader->setPaths($config['dir']['template']);
 	$twig = new Twig_Environment($loader, array(
 		'autoescape' => false,
 		'cache' => is_writable('templates') || (is_dir('templates/cache') && is_writable('templates/cache')) ?
 			"{$config['dir']['template']}/cache" : false,
-		'debug' => $config['debug']
+			'debug' => $config['debug'],
 	));
 	$twig->addExtension(new Twig_Extensions_Extension_Tinyboard());
 	$twig->addExtension(new Twig_Extensions_Extension_I18n());
 }
 
+
 function Element($templateFile, array $options) {
 	global $config, $debug, $twig, $build_pages;
 	
@@ -61,18 +55,310 @@ function Element($templateFile, array $options) {
 				str_replace("\n", '<br/>', utf8tohtml(print_r($_debug, true))) .
 			'</pre>';
 	}
-	
 	// Read the template file
 	if (@file_get_contents("{$config['dir']['template']}/${templateFile}")) {
 		$body = $twig->render($templateFile, $options);
-		
 		if ($config['minify_html'] && preg_match('/\.html$/', $templateFile)) {
 			$body = trim(preg_replace("/[\t\r\n]/", '', $body));
 		}
-		
 		return $body;
 	} else {
 		throw new Exception("Template file '${templateFile}' does not exist or is empty in '{$config['dir']['template']}'!");
 	}
 }
 
+class Twig_Extensions_Extension_Tinyboard extends Twig\Extension\AbstractExtension
+{
+	/**
+	* Returns a list of filters to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFilters()
+	{
+		return [
+			new Twig\TwigFilter('filesize', 'format_bytes'),
+			new Twig\TwigFilter('truncate', 'twig_truncate_filter'),
+			new Twig\TwigFilter('truncate_body', 'truncate'),
+			new Twig\TwigFilter('truncate_filename', 'twig_filename_truncate_filter'),
+			new Twig\TwigFilter('extension', 'twig_extension_filter'),
+			new Twig\TwigFilter('sprintf', 'sprintf'),
+			new Twig\TwigFilter('capcode', 'capcode'),
+			new Twig\TwigFilter('remove_modifiers', 'remove_modifiers'),
+			new Twig\TwigFilter('hasPermission', 'twig_hasPermission_filter'),
+			new Twig\TwigFilter('date', 'twig_date_filter'),
+			new Twig\TwigFilter('poster_id', 'poster_id'),
+			new Twig\TwigFilter('remove_whitespace', 'twig_remove_whitespace_filter'),
+			new Twig\TwigFilter('ago', 'ago'),
+			new Twig\TwigFilter('until', 'until'),
+			new Twig\TwigFilter('push', 'twig_push_filter'),
+			new Twig\TwigFilter('bidi_cleanup', 'bidi_cleanup'),
+			new Twig\TwigFilter('addslashes', 'addslashes'),
+		];
+	}
+
+	/**
+	* Returns a list of functions to add to the existing list.
+	*
+	* @return array An array of filters
+	*/
+	public function getFunctions()
+	{
+		return [
+			new Twig\TwigFunction('time', 'time'),
+			new Twig\TwigFunction('floor', 'floor'),
+			new Twig\TwigFunction('timezone', 'twig_timezone_function'),
+			new Twig\TwigFunction('hiddenInputs', 'hiddenInputs'),
+			new Twig\TwigFunction('hiddenInputsHash', 'hiddenInputsHash'),
+			new Twig\TwigFunction('ratio', 'twig_ratio_function'),
+			new Twig\TwigFunction('secure_link_confirm', 'twig_secure_link_confirm'),
+			new Twig\TwigFunction('secure_link', 'twig_secure_link'),
+			new Twig\TwigFunction('link_for', 'link_for')
+		];
+	}
+
+	/**
+	* Returns the name of the extension.
+	*
+	* @return string The extension name
+	*/
+	public function getName()
+	{
+		return 'tinyboard';
+	}
+}
+
+function twig_timezone_function() {
+	return 'Z';
+}
+
+function twig_push_filter($array, $value) {
+	array_push($array, $value);
+	return $array;
+}
+
+function twig_remove_whitespace_filter($data) {
+	return preg_replace('/[\t\r\n]/', '', $data);
+}
+
+function custom_strftime(string $format, $timestamp = null, ?string $locale = null): string
+{
+        if (null === $timestamp) {
+                $timestamp = new \DateTime;
+        }
+        elseif (is_numeric($timestamp)) {
+                $timestamp = date_create('@' . $timestamp);
+
+                if ($timestamp) {
+                        $timestamp->setTimezone(new \DateTimezone(date_default_timezone_get()));
+                }
+        }
+        elseif (is_string($timestamp)) {
+                $timestamp = date_create($timestamp);
+        }
+
+        if (!($timestamp instanceof \DateTimeInterface)) {
+                throw new \InvalidArgumentException('$timestamp argument is neither a valid UNIX timestamp, a valid date-time string or a DateTime object.');
+        }
+
+        $locale = substr((string) $locale, 0, 5);
+
+        $intl_formats = [
+                '%a' => 'EEE',  // An abbreviated textual representation of the day     Sun through Sat
+                '%A' => 'EEEE', // A full textual representation of the day     Sunday through Saturday
+                '%b' => 'MMM',  // Abbreviated month name, based on the locale  Jan through Dec
+                '%B' => 'MMMM', // Full month name, based on the locale January through December
+                '%h' => 'MMM',  // Abbreviated month name, based on the locale (an alias of %b) Jan through Dec
+        ];
+
+        $intl_formatter = function (\DateTimeInterface $timestamp, string $format) use ($intl_formats, $locale) {
+                $tz = $timestamp->getTimezone();
+                $date_type = \IntlDateFormatter::FULL;
+                $time_type = \IntlDateFormatter::FULL;
+                $pattern = '';
+
+                // %c = Preferred date and time stamp based on locale
+                // Example: Tue Feb 5 00:45:10 2009 for February 5, 2009 at 12:45:10 AM
+                if ($format == '%c') {
+                        $date_type = \IntlDateFormatter::LONG;
+                        $time_type = \IntlDateFormatter::SHORT;
+                }
+                // %x = Preferred date representation based on locale, without the time
+                // Example: 02/05/09 for February 5, 2009
+                elseif ($format == '%x') {
+                        $date_type = \IntlDateFormatter::SHORT;
+                        $time_type = \IntlDateFormatter::NONE;
+                }
+                // Localized time format
+                elseif ($format == '%X') {
+                        $date_type = \IntlDateFormatter::NONE;
+                        $time_type = \IntlDateFormatter::MEDIUM;
+                }
+                else {
+                        $pattern = $intl_formats[$format];
+                }
+
+                return (new \IntlDateFormatter($locale, $date_type, $time_type, $tz, null, $pattern))->format($timestamp);
+        };
+
+        // Same order as https://www.php.net/manual/en/function.strftime.php
+        $translation_table = [
+                // Day
+                '%a' => $intl_formatter,
+                '%A' => $intl_formatter,
+                '%d' => 'd',
+                '%e' => function ($timestamp) {
+                        return sprintf('% 2u', $timestamp->format('j'));
+                },
+                '%j' => function ($timestamp) {
+                        // Day number in year, 001 to 366
+                        return sprintf('%03d', $timestamp->format('z')+1);
+                },
+                '%u' => 'N',
+                '%w' => 'w',
+
+                // Week
+                '%U' => function ($timestamp) {
+                        // Number of weeks between date and first Sunday of year
+                        $day = new \DateTime(sprintf('%d-01 Sunday', $timestamp->format('Y')));
+                        return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+                },
+                '%V' => 'W',
+                '%W' => function ($timestamp) {
+                        // Number of weeks between date and first Monday of year
+                        $day = new \DateTime(sprintf('%d-01 Monday', $timestamp->format('Y')));
+                        return sprintf('%02u', 1 + ($timestamp->format('z') - $day->format('z')) / 7);
+                },
+
+                // Month
+                '%b' => $intl_formatter,
+                '%B' => $intl_formatter,
+                '%h' => $intl_formatter,
+                '%m' => 'm',
+
+                // Year
+                '%C' => function ($timestamp) {
+                        // Century (-1): 19 for 20th century
+                        return floor($timestamp->format('Y') / 100);
+                },
+                '%g' => function ($timestamp) {
+                        return substr($timestamp->format('o'), -2);
+                },
+                '%G' => 'o',
+                '%y' => 'y',
+                '%Y' => 'Y',
+
+                // Time
+                '%H' => 'H',
+                '%k' => function ($timestamp) {
+                        return sprintf('% 2u', $timestamp->format('G'));
+                },
+                '%I' => 'h',
+                '%l' => function ($timestamp) {
+                        return sprintf('% 2u', $timestamp->format('g'));
+                },
+                '%M' => 'i',
+                '%p' => 'A', // AM PM (this is reversed on purpose!)
+                '%P' => 'a', // am pm
+                '%r' => 'h:i:s A', // %I:%M:%S %p
+                '%R' => 'H:i', // %H:%M
+                '%S' => 's',
+                '%T' => 'H:i:s', // %H:%M:%S
+                '%X' => $intl_formatter, // Preferred time representation based on locale, without the date
+
+                // Timezone
+                '%z' => 'O',
+                '%Z' => 'T',
+
+                // Time and Date Stamps
+                '%c' => $intl_formatter,
+                '%D' => 'm/d/Y',
+                '%F' => 'Y-m-d',
+                '%s' => 'U',
+                '%x' => $intl_formatter,
+        ];
+
+        $out = preg_replace_callback('/(?<!%)(%[a-zA-Z])/', function ($match) use ($translation_table, $timestamp) {
+                if ($match[1] == '%n') {
+                        return "\n";
+                }
+                elseif ($match[1] == '%t') {
+                        return "\t";
+                }
+
+                if (!isset($translation_table[$match[1]])) {
+                        throw new \InvalidArgumentException(sprintf('Format "%s" is unknown in time format', $match[1]));
+                }
+
+                $replace = $translation_table[$match[1]];
+
+                if (is_string($replace)) {
+                        return $timestamp->format($replace);
+                }
+                else {
+                        return $replace($timestamp, $match[1]);
+                }
+        }, $format);
+
+        $out = str_replace('%%', '%', $out);
+        return $out;
+}
+
+function twig_date_filter($date, $format) {
+        return custom_strftime($format, $date);
+}
+
+function twig_hasPermission_filter($mod, $permission, $board = null) {
+	return hasPermission($permission, $board, $mod);
+}
+
+function twig_extension_filter($value, $case_insensitive = true) {
+	$ext = mb_substr($value, mb_strrpos($value, '.') + 1);
+	if($case_insensitive)
+		$ext = mb_strtolower($ext);
+	return $ext;
+}
+
+function twig_sprintf_filter( $value, $var) {
+	return sprintf($value, $var);
+}
+
+function twig_truncate_filter($value, $length = 30, $preserve = false, $separator = '…') {
+	if (mb_strlen($value) > $length) {
+		if ($preserve) {
+			if (false !== ($breakpoint = mb_strpos($value, ' ', $length))) {
+				$length = $breakpoint;
+			}
+		}
+		return mb_substr($value, 0, $length) . $separator;
+	}
+	return $value;
+}
+
+function twig_filename_truncate_filter($value, $length = 30, $separator = '…') {
+	if (mb_strlen($value) > $length) {
+		$value = strrev($value);
+		$array = array_reverse(explode(".", $value, 2));
+		$array = array_map("strrev", $array);
+
+		$filename = &$array[0];
+		$extension = isset($array[1]) ? $array[1] : false;
+
+		$filename = mb_substr($filename, 0, $length - ($extension ? mb_strlen($extension) + 1 : 0)) . $separator;
+
+		return implode(".", $array);
+	}
+	return $value;
+}
+
+function twig_ratio_function($w, $h) {
+	return fraction($w, $h, ':');
+}
+function twig_secure_link_confirm($text, $title, $confirm_message, $href) {
+	global $config;
+
+	return '<a onclick="if (event.which==2) return true;if (confirm(\'' . htmlentities(addslashes($confirm_message)) . '\')) document.location=\'?/' . htmlspecialchars(addslashes($href . '/' . make_secure_link_token($href))) . '\';return false;" title="' . htmlentities($title) . '" href="?/' . $href . '">' . $text . '</a>';
+}
+function twig_secure_link($href) {
+	return $href . '/' . make_secure_link_token($href);
+}