*/
class Twig_ExpressionParser
{
@@ -87,11 +86,18 @@ class Twig_ExpressionParser
protected function parseConditionalExpression($expr)
{
- while ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '?')) {
- $this->parser->getStream()->next();
- $expr2 = $this->parseExpression();
- $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'The ternary operator must have a default value');
- $expr3 = $this->parseExpression();
+ 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());
}
@@ -152,13 +158,21 @@ class Twig_ExpressionParser
$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;
+ }
+
default:
if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
$node = $this->parseArrayExpression();
} elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
$node = $this->parseHashExpression();
} else {
- throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType(), $token->getLine()), $token->getValue()), $token->getLine());
+ throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $this->parser->getFilename());
}
}
@@ -173,12 +187,10 @@ class Twig_ExpressionParser
// a string cannot be followed by another string in a single expression
$nextCanBeString = true;
while (true) {
- if ($stream->test(Twig_Token::STRING_TYPE) && $nextCanBeString) {
- $token = $stream->next();
+ if ($nextCanBeString && $token = $stream->nextIf(Twig_Token::STRING_TYPE)) {
$nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
$nextCanBeString = false;
- } elseif ($stream->test(Twig_Token::INTERPOLATION_START_TYPE)) {
- $stream->next();
+ } elseif ($stream->nextIf(Twig_Token::INTERPOLATION_START_TYPE)) {
$nodes[] = $this->parseExpression();
$stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
$nextCanBeString = true;
@@ -244,15 +256,14 @@ class Twig_ExpressionParser
// * a string -- 'a'
// * a name, which is equivalent to a string -- a
// * an expression, which must be enclosed in parentheses -- (1 + 2)
- if ($stream->test(Twig_Token::STRING_TYPE) || $stream->test(Twig_Token::NAME_TYPE) || $stream->test(Twig_Token::NUMBER_TYPE)) {
- $token = $stream->next();
+ 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->getLine()), $current->getValue()), $current->getLine());
+ 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(), $this->parser->getFilename());
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -287,30 +298,31 @@ class Twig_ExpressionParser
public function getFunctionNode($name, $line)
{
- $args = $this->parseArguments();
switch ($name) {
case 'parent':
+ $args = $this->parseArguments();
if (!count($this->parser->getBlockStack())) {
- throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line);
+ throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line, $this->parser->getFilename());
}
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);
+ throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden', $line, $this->parser->getFilename());
}
return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
case 'block':
- return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $line);
+ return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $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);
+ throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line, $this->parser->getFilename());
}
- return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_TemplateInterface::ANY_CALL, $line);
+ return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_Template::ANY_CALL, $line);
default:
- if (null !== $alias = $this->parser->getImportedFunction($name)) {
+ if (null !== $alias = $this->parser->getImportedSymbol('function', $name)) {
$arguments = new Twig_Node_Expression_Array(array(), $line);
- foreach ($args as $n) {
+ foreach ($this->parseArguments() as $n) {
$arguments->addElement($n);
}
@@ -320,7 +332,8 @@ class Twig_ExpressionParser
return $node;
}
- $class = $this->getFunctionNodeClass($name);
+ $args = $this->parseArguments(true);
+ $class = $this->getFunctionNodeClass($name, $line);
return new $class($name, $args, $line);
}
@@ -332,7 +345,7 @@ class Twig_ExpressionParser
$token = $stream->next();
$lineno = $token->getLine();
$arguments = new Twig_Node_Expression_Array(array(), $lineno);
- $type = Twig_TemplateInterface::ANY_CALL;
+ $type = Twig_Template::ANY_CALL;
if ($token->getValue() == '.') {
$token = $stream->next();
if (
@@ -351,24 +364,43 @@ class Twig_ExpressionParser
}
}
} else {
- throw new Twig_Error_Syntax('Expected name or number', $lineno);
+ throw new Twig_Error_Syntax('Expected name or number', $lineno, $this->parser->getFilename());
}
- } else {
- $type = Twig_TemplateInterface::ARRAY_CALL;
- $arg = $this->parseExpression();
+ 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(), $this->parser->getFilename());
+ }
+
+ $node = new Twig_Node_Expression_MethodCall($node, 'get'.$arg->getAttribute('value'), $arguments, $lineno);
+ $node->setAttribute('safe', true);
+
+ return $node;
+ }
+ } else {
+ $type = Twig_Template::ARRAY_CALL;
// slice?
+ $slice = false;
if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
- $stream->next();
+ $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');
+ $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());
@@ -399,10 +431,10 @@ class Twig_ExpressionParser
if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
$arguments = new Twig_Node();
} else {
- $arguments = $this->parseArguments();
+ $arguments = $this->parseArguments(true);
}
- $class = $this->getFilterNodeClass($name->getAttribute('value'));
+ $class = $this->getFilterNodeClass($name->getAttribute('value'), $token->getLine());
$node = new $class($node, $name, $arguments, $token->getLine(), $tag);
@@ -416,17 +448,61 @@ class Twig_ExpressionParser
return $node;
}
- public function parseArguments()
+ /**
+ * Parses arguments.
+ *
+ * @param bool $namedArguments Whether to allow named arguments or not
+ * @param bool $definition Whether we are parsing arguments for a function definition
+ */
+ public function parseArguments($namedArguments = false, $definition = false)
{
$args = array();
$stream = $this->parser->getStream();
- $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must be opened by a parenthesis');
+ $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');
}
- $args[] = $this->parseExpression();
+
+ 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(), $this->parser->getFilename());
+ }
+ $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(), $this->parser->getFilename());
+ }
+ } 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');
@@ -439,14 +515,13 @@ class Twig_ExpressionParser
while (true) {
$token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
if (in_array($token->getValue(), array('true', 'false', 'none'))) {
- throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine());
+ throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine(), $this->parser->getFilename());
}
$targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
- if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+ if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
break;
}
- $this->parser->getStream()->next();
}
return new Twig_Node($targets);
@@ -457,32 +532,67 @@ class Twig_ExpressionParser
$targets = array();
while (true) {
$targets[] = $this->parseExpression();
- if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+ if (!$this->parser->getStream()->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
break;
}
- $this->parser->getStream()->next();
}
return new Twig_Node($targets);
}
- protected function getFunctionNodeClass($name)
+ protected function getFunctionNodeClass($name, $line)
+ {
+ $env = $this->parser->getEnvironment();
+
+ if (false === $function = $env->getFunction($name)) {
+ $message = sprintf('The function "%s" does not exist', $name);
+ if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFunctions()))) {
+ $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+ }
+
+ throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
+ }
+
+ 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)
{
- $functionMap = $this->parser->getEnvironment()->getFunctions();
- if (isset($functionMap[$name]) && $functionMap[$name] instanceof Twig_Function_Node) {
- return $functionMap[$name]->getClass();
+ $env = $this->parser->getEnvironment();
+
+ if (false === $filter = $env->getFilter($name)) {
+ $message = sprintf('The filter "%s" does not exist', $name);
+ if ($alternatives = $env->computeAlternatives($name, array_keys($env->getFilters()))) {
+ $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+ }
+
+ throw new Twig_Error_Syntax($message, $line, $this->parser->getFilename());
+ }
+
+ if ($filter instanceof Twig_SimpleFilter) {
+ return $filter->getNodeClass();
}
- return 'Twig_Node_Expression_Function';
+ return $filter instanceof Twig_Filter_Node ? $filter->getClass() : 'Twig_Node_Expression_Filter';
}
- protected function getFilterNodeClass($name)
+ // checks that the node only contains "constant" elements
+ protected function checkConstantExpression(Twig_NodeInterface $node)
{
- $filterMap = $this->parser->getEnvironment()->getFilters();
- if (isset($filterMap[$name]) && $filterMap[$name] instanceof Twig_Filter_Node) {
- return $filterMap[$name]->getClass();
+ if (!($node instanceof Twig_Node_Expression_Constant || $node instanceof Twig_Node_Expression_Array)) {
+ return false;
+ }
+
+ foreach ($node as $n) {
+ if (!$this->checkConstantExpression($n)) {
+ return false;
+ }
}
- return 'Twig_Node_Expression_Filter';
+ return true;
}
}
diff --git a/main/inc/lib/symfony/Twig/Extension.php b/vendor/twig/twig/lib/Twig/Extension.php
old mode 100755
new mode 100644
similarity index 95%
rename from main/inc/lib/symfony/Twig/Extension.php
rename to vendor/twig/twig/lib/Twig/Extension.php
index 931fc0338c..5c8ad5c96c
--- a/main/inc/lib/symfony/Twig/Extension.php
+++ b/vendor/twig/twig/lib/Twig/Extension.php
@@ -34,7 +34,7 @@ abstract class Twig_Extension implements Twig_ExtensionInterface
/**
* Returns the node visitor instances to add to the existing list.
*
- * @return array An array of Twig_NodeVisitorInterface instances
+ * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
*/
public function getNodeVisitors()
{
diff --git a/vendor/twig/twig/lib/Twig/Extension/Core.php b/vendor/twig/twig/lib/Twig/Extension/Core.php
new file mode 100644
index 0000000000..750ef0ff83
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -0,0 +1,1462 @@
+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;
+ }
+
+ /**
+ * Returns the token parser instance to add to the existing list.
+ *
+ * @return Twig_TokenParser[] An array of Twig_TokenParser instances
+ */
+ 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(),
+ );
+ }
+
+ /**
+ * Returns a list of filters to add to the existing list.
+ *
+ * @return array An array of filters
+ */
+ 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', 'strtr'),
+ 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', 'trim'),
+ 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'),
+ 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;
+ }
+
+ /**
+ * Returns a list of global functions to add to the existing list.
+ *
+ * @return array An array of global functions
+ */
+ 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'))),
+ );
+ }
+
+ /**
+ * Returns a list of tests to add to the existing list.
+ *
+ * @return array An array of tests
+ */
+ 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')),
+ 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')),
+ 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'),
+ );
+ }
+
+ /**
+ * Returns a list of operators to add to the existing list.
+ *
+ * @return array An array of operators
+ */
+ 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, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
+ ),
+ );
+ }
+
+ public function parseNotTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
+ {
+ return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
+ }
+
+ public function parseTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
+ {
+ $stream = $parser->getStream();
+ $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
+ $class = $this->getTestNodeClass($parser, $name, $node->getLine());
+ $arguments = null;
+ if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+ $arguments = $parser->getExpressionParser()->parseArguments(true);
+ }
+
+ return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
+ }
+
+ protected function getTestNodeClass(Twig_Parser $parser, $name, $line)
+ {
+ $env = $parser->getEnvironment();
+ $testMap = $env->getTests();
+ $testName = null;
+ if (isset($testMap[$name])) {
+ $testName = $name;
+ } elseif ($parser->getStream()->test(Twig_Token::NAME_TYPE)) {
+ // try 2-words tests
+ $name = $name.' '.$parser->getCurrentToken()->getValue();
+
+ if (isset($testMap[$name])) {
+ $parser->getStream()->next();
+
+ $testName = $name;
+ }
+ }
+
+ if (null === $testName) {
+ $message = sprintf('The test "%s" does not exist', $name);
+ if ($alternatives = $env->computeAlternatives($name, array_keys($env->getTests()))) {
+ $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+ }
+
+ throw new Twig_Error_Syntax($message, $line, $parser->getFilename());
+ }
+
+ if ($testMap[$name] instanceof Twig_SimpleTest) {
+ return $testMap[$name]->getNodeClass();
+ }
+
+ return $testMap[$name] instanceof Twig_Test_Node ? $testMap[$name]->getClass() : 'Twig_Node_Expression_Test';
+ }
+
+ /**
+ * Returns the name of the extension.
+ *
+ * @return string The extension name
+ */
+ public function getName()
+ {
+ return 'core';
+ }
+}
+
+/**
+ * Cycles over a value.
+ *
+ * @param ArrayAccess|array $values An array or an ArrayAccess instance
+ * @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 A Twig_Environment instance
+ * @param Traversable|array|int|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('/(? $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.
+ *
+ *
+ * {{ post.published_at|date("m/d/Y") }}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param DateTime|DateInterval|string $date A date
+ * @param string $format A format
+ * @param DateTimeZone|string $timezone A timezone
+ *
+ * @return string The formatted date
+ */
+function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
+{
+ if (null === $format) {
+ $formats = $env->getExtension('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
+ *
+ *
+ * {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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);
+ $date->modify($modifier);
+
+ return $date;
+}
+
+/**
+ * Converts an input to a DateTime instance.
+ *
+ *
+ * {% if date(user.created_at) < date('+2days') %}
+ * {# do something #}
+ * {% endif %}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param DateTime|string $date A date
+ * @param DateTimeZone|string $timezone A timezone
+ *
+ * @return DateTime A DateTime instance
+ */
+function twig_date_converter(Twig_Environment $env, $date = null, $timezone = null)
+{
+ // determine the timezone
+ if (!$timezone) {
+ $defaultTimezone = $env->getExtension('core')->getTimezone();
+ } elseif (!$timezone instanceof DateTimeZone) {
+ $defaultTimezone = new DateTimeZone($timezone);
+ } else {
+ $defaultTimezone = $timezone;
+ }
+
+ // immutable dates
+ if ($date instanceof DateTimeImmutable) {
+ return false !== $timezone ? $date->setTimezone($defaultTimezone) : $date;
+ }
+
+ if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
+ $date = clone $date;
+ if (false !== $timezone) {
+ $date->setTimezone($defaultTimezone);
+ }
+
+ return $date;
+ }
+
+ $asString = (string) $date;
+ if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
+ $date = '@'.$date;
+ }
+
+ $date = new DateTime($date, $defaultTimezone);
+ if (false !== $timezone) {
+ $date->setTimezone($defaultTimezone);
+ }
+
+ return $date;
+}
+
+/**
+ * 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 A Twig_Environment instance
+ * @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('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 (version_compare(PHP_VERSION, '5.3.0', '<')) {
+ /**
+ * 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.
+ *
+ *
+ * {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
+ *
+ * {% set items = items|merge({ 'peugeot': 'car' }) %}
+ *
+ * {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
+ *
+ *
+ * @param array $arr1 An array
+ * @param array $arr2 An array
+ *
+ * @return array The merged array
+ */
+function twig_array_merge($arr1, $arr2)
+{
+ if (!is_array($arr1) || !is_array($arr2)) {
+ throw new Twig_Error_Runtime('The merge filter only works with arrays or hashes.');
+ }
+
+ return array_merge($arr1, $arr2);
+}
+
+/**
+ * Slices a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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) {
+ $item = iterator_to_array($item, false);
+ }
+
+ 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 mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
+ }
+
+ return null === $length ? substr($item, $start) : substr($item, $start, $length);
+}
+
+/**
+ * Returns the first element of the item.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @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.
+ *
+ *
+ * {{ [1, 2, 3]|join('|') }}
+ * {# returns 1|2|3 #}
+ *
+ * {{ [1, 2, 3]|join }}
+ * {# returns 123 #}
+ *
+ *
+ * @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.
+ *
+ *
+ * {{ "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] #}
+ *
+ *
+ * @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($value, $delimiter, $limit = null)
+{
+ if (empty($delimiter)) {
+ return str_split($value, null === $limit ? 1 : $limit);
+ }
+
+ return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
+}
+
+// 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.
+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:
+ *
+ *
+ * {% for key in array|keys %}
+ * {# ... #}
+ * {% endfor %}
+ *
+ *
+ * @param array $array An array
+ *
+ * @return array The keys
+ */
+function twig_get_array_keys_filter($array)
+{
+ if (is_object($array) && $array instanceof Traversable) {
+ return array_keys(iterator_to_array($array));
+ }
+
+ if (!is_array($array)) {
+ return array();
+ }
+
+ return array_keys($array);
+}
+
+/**
+ * Reverses a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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 (is_object($item) && $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 $array An array
+ */
+function twig_sort_filter($array)
+{
+ asort($array);
+
+ return $array;
+}
+
+/* used internally */
+function twig_in_filter($value, $compare)
+{
+ if (is_array($compare)) {
+ return in_array($value, $compare, is_object($value));
+ } elseif (is_string($compare)) {
+ if (!strlen($value)) {
+ return empty($compare);
+ }
+
+ return false !== strpos($compare, (string) $value);
+ } elseif ($compare instanceof Traversable) {
+ return in_array($value, iterator_to_array($compare, false), is_object($value));
+ }
+
+ return false;
+}
+
+/**
+ * Escapes a string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $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)
+ */
+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;
+ } else {
+ return $string;
+ }
+ }
+
+ if (null === $charset) {
+ $charset = $env->getCharset();
+ }
+
+ switch ($strategy) {
+ case 'html':
+ // see http://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;
+
+ if (null === $htmlspecialcharsCharsets) {
+ if ('hiphop' === substr(PHP_VERSION, -6)) {
+ $htmlspecialcharsCharsets = array('utf-8' => true, 'UTF-8' => true);
+ } else {
+ $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 \xHH 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) ? false : true)) {
+ 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) ? false : true)) {
+ 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) ? false : true)) {
+ 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':
+ // hackish test to avoid version_compare that is much slower, this works unless PHP releases a 5.10.*
+ // at that point however PHP 5.2.* support can be removed
+ if (PHP_VERSION < '5.3.0') {
+ return str_replace('%7E', '~', rawurlencode($string));
+ }
+
+ return rawurlencode($string);
+
+ default:
+ static $escapers;
+
+ if (null === $escapers) {
+ $escapers = $env->getExtension('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));
+ }
+}
+
+/* used internally */
+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];
+
+ // \xHH
+ if (!isset($char[1])) {
+ return '\\x'.strtoupper(substr('00'.bin2hex($char), -2));
+ }
+
+ // \uHHHH
+ $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+
+ return '\\u'.strtoupper(substr('0000'.bin2hex($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. (http://www.zend.com)
+ * @license http://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 && $chr != "\t" && $chr != "\n" && $chr != "\r") || ($ord >= 0x7f && $ord <= 0x9f)) {
+ return '�';
+ }
+
+ /**
+ * 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 (strlen($chr) == 1) {
+ $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 A Twig_Environment instance
+ * @param mixed $thing A variable
+ *
+ * @return int The length of the value
+ */
+ function twig_length_filter(Twig_Environment $env, $thing)
+ {
+ return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
+ }
+
+ /**
+ * Converts a string to uppercase.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @param mixed $thing A variable
+ *
+ * @return int The length of the value
+ */
+ function twig_length_filter(Twig_Environment $env, $thing)
+ {
+ return is_scalar($thing) ? strlen($thing) : count($thing);
+ }
+
+ /**
+ * Returns a titlecased string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @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 A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The capitalized string
+ */
+ function twig_capitalize_string_filter(Twig_Environment $env, $string)
+ {
+ return ucfirst(strtolower($string));
+ }
+}
+
+/* used internally */
+function twig_ensure_traversable($seq)
+{
+ if ($seq instanceof Traversable || is_array($seq)) {
+ return $seq;
+ }
+
+ return array();
+}
+
+/**
+ * Checks if a variable is empty.
+ *
+ *
+ * {# evaluates to true if the foo variable is null, false, or the empty string #}
+ * {% if foo is empty %}
+ * {# ... #}
+ * {% endif %}
+ *
+ *
+ * @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);
+ }
+
+ return '' === $value || false === $value || null === $value || array() === $value;
+}
+
+/**
+ * Checks if a variable is traversable.
+ *
+ *
+ * {# evaluates to true if the foo variable is an array or a traversable object #}
+ * {% if foo is traversable %}
+ * {# ... #}
+ * {% endif %}
+ *
+ *
+ * @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 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 $with_context Whether to pass the current context variables or not
+ * @param bool $ignore_missing 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('sandbox')) {
+ $sandbox = $env->getExtension('sandbox');
+ if (!$alreadySandboxed = $sandbox->isSandboxed()) {
+ $sandbox->enableSandbox();
+ }
+ }
+
+ try {
+ return $env->resolveTemplate($template)->render($variables);
+ } catch (Twig_Error_Loader $e) {
+ if (!$ignoreMissing) {
+ throw $e;
+ }
+ }
+
+ if ($isSandboxed && !$alreadySandboxed) {
+ $sandbox->disableSandbox();
+ }
+}
+
+/**
+ * Returns a template content without rendering it.
+ *
+ * @param string $name The template name
+ *
+ * @return string The template source
+ */
+function twig_source(Twig_Environment $env, $name)
+{
+ return $env->getLoader()->getSource($name);
+}
+
+/**
+ * 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);
+}
+
+/**
+ * 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) {
+ $last = count($result) - 1;
+ if ($fillCount = $size - count($result[$last])) {
+ $result[$last] = array_merge(
+ $result[$last],
+ array_fill(0, $fillCount, $fill)
+ );
+ }
+ }
+
+ return $result;
+}
diff --git a/main/inc/lib/symfony/Twig/Extension/Debug.php b/vendor/twig/twig/lib/Twig/Extension/Debug.php
old mode 100755
new mode 100644
similarity index 59%
rename from main/inc/lib/symfony/Twig/Extension/Debug.php
rename to vendor/twig/twig/lib/Twig/Extension/Debug.php
index aab7093423..e3a85bfe8e
--- a/main/inc/lib/symfony/Twig/Extension/Debug.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Debug.php
@@ -17,11 +17,18 @@ class Twig_Extension_Debug extends Twig_Extension
*/
public function getFunctions()
{
- // dump is safe if var_dump is overriden by xdebug
- $isDumpOutputHtmlSafe = extension_loaded('xdebug') && (false === get_cfg_var('xdebug.overload_var_dump') || get_cfg_var('xdebug.overload_var_dump')) && get_cfg_var('html_errors');
+ // 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_name()
+ ;
return array(
- 'dump' => new Twig_Function_Function('twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
+ new Twig_SimpleFunction('dump', 'twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
);
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
new file mode 100644
index 0000000000..d3e5ad0ec5
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
@@ -0,0 +1,107 @@
+setDefaultStrategy($defaultStrategy);
+ }
+
+ /**
+ * 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_TokenParser_AutoEscape());
+ }
+
+ /**
+ * Returns the node visitor instances to add to the existing list.
+ *
+ * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
+ */
+ public function getNodeVisitors()
+ {
+ return array(new Twig_NodeVisitor_Escaper());
+ }
+
+ /**
+ * 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('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
+ * "filename" as an argument and returns the strategy to use.
+ *
+ * @param mixed $defaultStrategy An escaping strategy
+ */
+ public function setDefaultStrategy($defaultStrategy)
+ {
+ // for BC
+ if (true === $defaultStrategy) {
+ $defaultStrategy = 'html';
+ }
+
+ $this->defaultStrategy = $defaultStrategy;
+ }
+
+ /**
+ * Gets the default strategy to use when not defined by the user.
+ *
+ * @param string $filename The template "filename"
+ *
+ * @return string The default strategy to use for the template
+ */
+ public function getDefaultStrategy($filename)
+ {
+ // disable string callables to avoid calling a function named html or js,
+ // or any other upcoming escaping strategy
+ if (!is_string($this->defaultStrategy) && is_callable($this->defaultStrategy)) {
+ return call_user_func($this->defaultStrategy, $filename);
+ }
+
+ return $this->defaultStrategy;
+ }
+
+ /**
+ * Returns the name of the extension.
+ *
+ * @return string The extension name
+ */
+ public function getName()
+ {
+ return 'escaper';
+ }
+}
+
+/**
+ * Marks a variable as being safe.
+ *
+ * @param string $string A PHP variable
+ */
+function twig_raw_filter($string)
+{
+ return $string;
+}
diff --git a/main/inc/lib/symfony/Twig/Extension/Optimizer.php b/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Extension/Optimizer.php
rename to vendor/twig/twig/lib/Twig/Extension/Optimizer.php
diff --git a/main/inc/lib/symfony/Twig/Extension/Sandbox.php b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
old mode 100755
new mode 100644
similarity index 94%
rename from main/inc/lib/symfony/Twig/Extension/Sandbox.php
rename to vendor/twig/twig/lib/Twig/Extension/Sandbox.php
index bf76c11a98..c58259c6ab
--- a/main/inc/lib/symfony/Twig/Extension/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
@@ -33,7 +33,7 @@ class Twig_Extension_Sandbox extends Twig_Extension
/**
* Returns the node visitor instances to add to the existing list.
*
- * @return array An array of Twig_NodeVisitorInterface instances
+ * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
*/
public function getNodeVisitors()
{
@@ -93,7 +93,7 @@ class Twig_Extension_Sandbox extends Twig_Extension
public function ensureToStringAllowed($obj)
{
- if (is_object($obj)) {
+ if ($this->isSandboxed() && is_object($obj)) {
$this->policy->checkMethodAllowed($obj, '__toString');
}
diff --git a/vendor/twig/twig/lib/Twig/Extension/Staging.php b/vendor/twig/twig/lib/Twig/Extension/Staging.php
new file mode 100644
index 0000000000..8ab0f45960
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -0,0 +1,113 @@
+
+ */
+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)
+ {
+ $this->functions[$name] = $function;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFunctions()
+ {
+ return $this->functions;
+ }
+
+ public function addFilter($name, $filter)
+ {
+ $this->filters[$name] = $filter;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFilters()
+ {
+ return $this->filters;
+ }
+
+ public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
+ {
+ $this->visitors[] = $visitor;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getNodeVisitors()
+ {
+ return $this->visitors;
+ }
+
+ public function addTokenParser(Twig_TokenParserInterface $parser)
+ {
+ $this->tokenParsers[] = $parser;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTokenParsers()
+ {
+ return $this->tokenParsers;
+ }
+
+ public function addGlobal($name, $value)
+ {
+ $this->globals[$name] = $value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getGlobals()
+ {
+ return $this->globals;
+ }
+
+ public function addTest($name, $test)
+ {
+ $this->tests[$name] = $test;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTests()
+ {
+ return $this->tests;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'staging';
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
new file mode 100644
index 0000000000..5e1a60d0a3
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
@@ -0,0 +1,64 @@
+ true)),
+ );
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'string_loader';
+ }
+}
+
+/**
+ * Loads a template from a string.
+ *
+ *
+ * {{ include(template_from_string("Hello {{ name }}")) }}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $template A template as a string
+ *
+ * @return Twig_Template A Twig_Template instance
+ */
+function twig_template_from_string(Twig_Environment $env, $template)
+{
+ $name = sprintf('__string_template__%s', hash('sha256', uniqid(mt_rand(), true), false));
+
+ $loader = new Twig_Loader_Chain(array(
+ new Twig_Loader_Array(array($name => $template)),
+ $current = $env->getLoader(),
+ ));
+
+ $env->setLoader($loader);
+ try {
+ $template = $env->loadTemplate($name);
+ } catch (Exception $e) {
+ $env->setLoader($current);
+
+ throw $e;
+ }
+ $env->setLoader($current);
+
+ return $template;
+}
diff --git a/main/inc/lib/symfony/Twig/ExtensionInterface.php b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
old mode 100755
new mode 100644
similarity index 76%
rename from main/inc/lib/symfony/Twig/ExtensionInterface.php
rename to vendor/twig/twig/lib/Twig/ExtensionInterface.php
index 0bfed88c7a..49541b02e3
--- a/main/inc/lib/symfony/Twig/ExtensionInterface.php
+++ b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
@@ -12,8 +12,7 @@
/**
* Interface implemented by extension classes.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_ExtensionInterface
{
@@ -24,61 +23,61 @@ interface Twig_ExtensionInterface
*
* @param Twig_Environment $environment The current Twig_Environment instance
*/
- function initRuntime(Twig_Environment $environment);
+ public function initRuntime(Twig_Environment $environment);
/**
* Returns the token parser instances to add to the existing list.
*
* @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
*/
- function getTokenParsers();
+ public function getTokenParsers();
/**
* Returns the node visitor instances to add to the existing list.
*
- * @return array An array of Twig_NodeVisitorInterface instances
+ * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
*/
- function getNodeVisitors();
+ public function getNodeVisitors();
/**
* Returns a list of filters to add to the existing list.
*
* @return array An array of filters
*/
- function getFilters();
+ public function getFilters();
/**
* Returns a list of tests to add to the existing list.
*
* @return array An array of tests
*/
- function getTests();
+ public function getTests();
/**
* Returns a list of functions to add to the existing list.
*
* @return array An array of functions
*/
- function getFunctions();
+ public function getFunctions();
/**
* Returns a list of operators to add to the existing list.
*
* @return array An array of operators
*/
- function getOperators();
+ public function getOperators();
/**
* Returns a list of global variables to add to the existing list.
*
* @return array An array of global variables
*/
- function getGlobals();
+ public function getGlobals();
/**
* Returns the name of the extension.
*
* @return string The extension name
*/
- function getName();
+ public function getName();
}
diff --git a/main/inc/lib/symfony/Twig/Filter.php b/vendor/twig/twig/lib/Twig/Filter.php
old mode 100755
new mode 100644
similarity index 73%
rename from main/inc/lib/symfony/Twig/Filter.php
rename to vendor/twig/twig/lib/Twig/Filter.php
index f27f08e115..5cfbb6625a
--- a/main/inc/lib/symfony/Twig/Filter.php
+++ b/vendor/twig/twig/lib/Twig/Filter.php
@@ -12,10 +12,12 @@
/**
* Represents a template filter.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-abstract class Twig_Filter implements Twig_FilterInterface
+abstract class Twig_Filter implements Twig_FilterInterface, Twig_FilterCallableInterface
{
protected $options;
protected $arguments = array();
@@ -26,6 +28,8 @@ abstract class Twig_Filter implements Twig_FilterInterface
'needs_environment' => false,
'needs_context' => false,
'pre_escape' => null,
+ 'preserves_safety' => null,
+ 'callable' => null,
), $options);
}
@@ -58,12 +62,20 @@ abstract class Twig_Filter implements Twig_FilterInterface
if (isset($this->options['is_safe_callback'])) {
return call_user_func($this->options['is_safe_callback'], $filterArgs);
}
+ }
- return array();
+ 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/main/inc/lib/symfony/Twig/Filter/Function.php b/vendor/twig/twig/lib/Twig/Filter/Function.php
old mode 100755
new mode 100644
similarity index 76%
rename from main/inc/lib/symfony/Twig/Filter/Function.php
rename to vendor/twig/twig/lib/Twig/Filter/Function.php
index 1de078b272..ad374a551f
--- a/main/inc/lib/symfony/Twig/Filter/Function.php
+++ b/vendor/twig/twig/lib/Twig/Filter/Function.php
@@ -12,8 +12,10 @@
/**
* Represents a function template filter.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_Filter_Function extends Twig_Filter
{
@@ -21,6 +23,8 @@ class Twig_Filter_Function extends Twig_Filter
public function __construct($function, array $options = array())
{
+ $options['callable'] = $function;
+
parent::__construct($options);
$this->function = $function;
diff --git a/main/inc/lib/symfony/Twig/Filter/Method.php b/vendor/twig/twig/lib/Twig/Filter/Method.php
old mode 100755
new mode 100644
similarity index 73%
rename from main/inc/lib/symfony/Twig/Filter/Method.php
rename to vendor/twig/twig/lib/Twig/Filter/Method.php
index d831e0f22f..63c8c3be4a
--- a/main/inc/lib/symfony/Twig/Filter/Method.php
+++ b/vendor/twig/twig/lib/Twig/Filter/Method.php
@@ -12,15 +12,20 @@
/**
* Represents a method template filter.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_Filter_Method extends Twig_Filter
{
- protected $extension, $method;
+ 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;
diff --git a/main/inc/lib/symfony/Twig/Filter/Node.php b/vendor/twig/twig/lib/Twig/Filter/Node.php
old mode 100755
new mode 100644
similarity index 81%
rename from main/inc/lib/symfony/Twig/Filter/Node.php
rename to vendor/twig/twig/lib/Twig/Filter/Node.php
index 7481c05caa..8744c5e00d
--- a/main/inc/lib/symfony/Twig/Filter/Node.php
+++ b/vendor/twig/twig/lib/Twig/Filter/Node.php
@@ -12,8 +12,10 @@
/**
* Represents a template filter as a node.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFilter instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_Filter_Node extends Twig_Filter
{
diff --git a/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
new file mode 100644
index 0000000000..145534dfdd
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
@@ -0,0 +1,23 @@
+
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_FilterCallableInterface
+{
+ public function getCallable();
+}
diff --git a/vendor/twig/twig/lib/Twig/FilterInterface.php b/vendor/twig/twig/lib/Twig/FilterInterface.php
new file mode 100644
index 0000000000..5319ecc9fc
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/FilterInterface.php
@@ -0,0 +1,42 @@
+
+ * @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/main/inc/lib/symfony/Twig/Function.php b/vendor/twig/twig/lib/Twig/Function.php
old mode 100755
new mode 100644
similarity index 77%
rename from main/inc/lib/symfony/Twig/Function.php
rename to vendor/twig/twig/lib/Twig/Function.php
index cd7643f021..b5ffb2b047
--- a/main/inc/lib/symfony/Twig/Function.php
+++ b/vendor/twig/twig/lib/Twig/Function.php
@@ -12,10 +12,12 @@
/**
* Represents a template function.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-abstract class Twig_Function implements Twig_FunctionInterface
+abstract class Twig_Function implements Twig_FunctionInterface, Twig_FunctionCallableInterface
{
protected $options;
protected $arguments = array();
@@ -25,6 +27,7 @@ abstract class Twig_Function implements Twig_FunctionInterface
$this->options = array_merge(array(
'needs_environment' => false,
'needs_context' => false,
+ 'callable' => null,
), $options);
}
@@ -60,4 +63,9 @@ abstract class Twig_Function implements Twig_FunctionInterface
return array();
}
+
+ public function getCallable()
+ {
+ return $this->options['callable'];
+ }
}
diff --git a/main/inc/lib/symfony/Twig/Function/Function.php b/vendor/twig/twig/lib/Twig/Function/Function.php
old mode 100755
new mode 100644
similarity index 77%
rename from main/inc/lib/symfony/Twig/Function/Function.php
rename to vendor/twig/twig/lib/Twig/Function/Function.php
index 3237d8c5da..d1e1b96a20
--- a/main/inc/lib/symfony/Twig/Function/Function.php
+++ b/vendor/twig/twig/lib/Twig/Function/Function.php
@@ -13,8 +13,10 @@
/**
* Represents a function template function.
*
- * @package twig
- * @author Arnaud Le Blanc
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_Function_Function extends Twig_Function
{
@@ -22,6 +24,8 @@ class Twig_Function_Function extends Twig_Function
public function __construct($function, array $options = array())
{
+ $options['callable'] = $function;
+
parent::__construct($options);
$this->function = $function;
diff --git a/main/inc/lib/symfony/Twig/Function/Method.php b/vendor/twig/twig/lib/Twig/Function/Method.php
old mode 100755
new mode 100644
similarity index 74%
rename from main/inc/lib/symfony/Twig/Function/Method.php
rename to vendor/twig/twig/lib/Twig/Function/Method.php
index 7328566edc..67039a956a
--- a/main/inc/lib/symfony/Twig/Function/Method.php
+++ b/vendor/twig/twig/lib/Twig/Function/Method.php
@@ -13,15 +13,20 @@
/**
* Represents a method template function.
*
- * @package twig
- * @author Arnaud Le Blanc
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_Function_Method extends Twig_Function
{
- protected $extension, $method;
+ 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;
diff --git a/main/inc/lib/symfony/Twig/Function/Node.php b/vendor/twig/twig/lib/Twig/Function/Node.php
old mode 100755
new mode 100644
similarity index 75%
rename from main/inc/lib/symfony/Twig/Function/Node.php
rename to vendor/twig/twig/lib/Twig/Function/Node.php
index a687a8498a..06a0d0dbeb
--- a/main/inc/lib/symfony/Twig/Function/Node.php
+++ b/vendor/twig/twig/lib/Twig/Function/Node.php
@@ -12,10 +12,12 @@
/**
* Represents a template function as a node.
*
- * @package twig
- * @author Fabien Potencier
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-class Twig_Function_Node extends Twig_Filter
+class Twig_Function_Node extends Twig_Function
{
protected $class;
diff --git a/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
new file mode 100644
index 0000000000..0aab4f5ecf
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
@@ -0,0 +1,23 @@
+
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_FunctionCallableInterface
+{
+ public function getCallable();
+}
diff --git a/main/inc/lib/symfony/Twig/FunctionInterface.php b/vendor/twig/twig/lib/Twig/FunctionInterface.php
old mode 100755
new mode 100644
similarity index 52%
rename from main/inc/lib/symfony/Twig/FunctionInterface.php
rename to vendor/twig/twig/lib/Twig/FunctionInterface.php
index d402d17da2..67f4f89c06
--- a/main/inc/lib/symfony/Twig/FunctionInterface.php
+++ b/vendor/twig/twig/lib/Twig/FunctionInterface.php
@@ -13,8 +13,10 @@
/**
* Represents a template function.
*
- * @package twig
- * @author Arnaud Le Blanc
+ * Use Twig_SimpleFunction instead.
+ *
+ * @author Arnaud Le Blanc
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
interface Twig_FunctionInterface
{
@@ -23,15 +25,15 @@ interface Twig_FunctionInterface
*
* @return string The PHP code for the function
*/
- function compile();
+ public function compile();
- function needsEnvironment();
+ public function needsEnvironment();
- function needsContext();
+ public function needsContext();
- function getSafe(Twig_Node $filterArgs);
+ public function getSafe(Twig_Node $filterArgs);
- function setArguments($arguments);
+ public function setArguments($arguments);
- function getArguments();
+ public function getArguments();
}
diff --git a/main/inc/lib/symfony/Twig/Lexer.php b/vendor/twig/twig/lib/Twig/Lexer.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Lexer.php
rename to vendor/twig/twig/lib/Twig/Lexer.php
index 4958cb636b..ad3ec7d483
--- a/main/inc/lib/symfony/Twig/Lexer.php
+++ b/vendor/twig/twig/lib/Twig/Lexer.php
@@ -13,8 +13,7 @@
/**
* Lexes a template string.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Lexer implements Twig_LexerInterface
{
@@ -30,6 +29,9 @@ class Twig_Lexer implements Twig_LexerInterface
protected $filename;
protected $options;
protected $regexes;
+ protected $position;
+ protected $positions;
+ protected $currentVarBlockLine;
const STATE_DATA = 0;
const STATE_BLOCK = 1;
@@ -59,10 +61,10 @@ class Twig_Lexer implements Twig_LexerInterface
$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*endraw\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
+ '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\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
+ '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',
@@ -71,18 +73,15 @@ class Twig_Lexer implements Twig_LexerInterface
}
/**
- * Tokenizes a source code.
- *
- * @param string $code The source code
- * @param string $filename A unique identifier for the source code
- *
- * @return Twig_TokenStream A token stream instance
+ * {@inheritdoc}
*/
public function tokenize($code, $filename = null)
{
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", $code);
@@ -133,7 +132,7 @@ class Twig_Lexer implements Twig_LexerInterface
throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
}
- if (isset($mbEncoding)) {
+ if ($mbEncoding) {
mb_internal_encoding($mbEncoding);
}
@@ -176,7 +175,7 @@ class Twig_Lexer implements Twig_LexerInterface
// raw data?
if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
- $this->lexRawData();
+ $this->lexRawData($match[1]);
// {% line \d+ %}
} elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
@@ -184,12 +183,14 @@ class Twig_Lexer implements Twig_LexerInterface
} 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;
}
}
@@ -223,13 +224,13 @@ class Twig_Lexer implements Twig_LexerInterface
$this->moveCursor($match[0]);
if ($this->cursor >= $this->end) {
- throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'));
+ throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->currentVarBlockLine, $this->filename);
}
}
// operators
if (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
- $this->pushToken(Twig_Token::OPERATOR_TYPE, $match[0]);
+ $this->pushToken(Twig_Token::OPERATOR_TYPE, preg_replace('/\s+/', ' ', $match[0]));
$this->moveCursor($match[0]);
}
// names
@@ -284,10 +285,10 @@ class Twig_Lexer implements Twig_LexerInterface
}
}
- protected function lexRawData()
+ protected function lexRawData($tag)
{
- if (!preg_match($this->regexes['lex_raw_data'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
- throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'));
+ 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->filename);
}
$text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
@@ -322,7 +323,6 @@ class Twig_Lexer implements Twig_LexerInterface
$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->filename);
@@ -330,8 +330,6 @@ class Twig_Lexer implements Twig_LexerInterface
$this->popState();
++$this->cursor;
-
- return;
}
}
@@ -380,10 +378,15 @@ class Twig_Lexer implements Twig_LexerInterface
// an operator that ends with a character must be followed by
// a whitespace or a parenthesis
if (ctype_alpha($operator[$length - 1])) {
- $regex[] = preg_quote($operator, '/').'(?=[\s()])';
+ $r = preg_quote($operator, '/').'(?=[\s()])';
} else {
- $regex[] = preg_quote($operator, '/');
+ $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';
diff --git a/main/inc/lib/symfony/Twig/LexerInterface.php b/vendor/twig/twig/lib/Twig/LexerInterface.php
old mode 100755
new mode 100644
similarity index 54%
rename from main/inc/lib/symfony/Twig/LexerInterface.php
rename to vendor/twig/twig/lib/Twig/LexerInterface.php
index 0223384960..24a9478700
--- a/main/inc/lib/symfony/Twig/LexerInterface.php
+++ b/vendor/twig/twig/lib/Twig/LexerInterface.php
@@ -12,18 +12,21 @@
/**
* Interface implemented by lexer classes.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ *
+ * @deprecated since 1.12 (to be removed in 3.0)
*/
interface Twig_LexerInterface
{
/**
* Tokenizes a source code.
*
- * @param string $code The source code
- * @param string $filename A unique identifier for the source code
+ * @param string $code The source code
+ * @param string $filename A unique identifier for the source code
*
* @return Twig_TokenStream A token stream instance
+ *
+ * @throws Twig_Error_Syntax When the code is syntactically wrong
*/
- function tokenize($code, $filename = null);
+ public function tokenize($code, $filename = null);
}
diff --git a/main/inc/lib/symfony/Twig/Loader/Array.php b/vendor/twig/twig/lib/Twig/Loader/Array.php
old mode 100755
new mode 100644
similarity index 69%
rename from main/inc/lib/symfony/Twig/Loader/Array.php
rename to vendor/twig/twig/lib/Twig/Loader/Array.php
index 32bb7e4133..ac56104857
--- a/main/inc/lib/symfony/Twig/Loader/Array.php
+++ b/vendor/twig/twig/lib/Twig/Loader/Array.php
@@ -17,12 +17,11 @@
* 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.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
-class Twig_Loader_Array implements Twig_LoaderInterface
+class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
{
- protected $templates;
+ protected $templates = array();
/**
* Constructor.
@@ -33,10 +32,7 @@ class Twig_Loader_Array implements Twig_LoaderInterface
*/
public function __construct(array $templates)
{
- $this->templates = array();
- foreach ($templates as $name => $template) {
- $this->templates[$name] = $template;
- }
+ $this->templates = $templates;
}
/**
@@ -51,11 +47,7 @@ class Twig_Loader_Array implements 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
+ * {@inheritdoc}
*/
public function getSource($name)
{
@@ -68,11 +60,15 @@ class Twig_Loader_Array implements Twig_LoaderInterface
}
/**
- * 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
+ * {@inheritdoc}
+ */
+ public function exists($name)
+ {
+ return isset($this->templates[(string) $name]);
+ }
+
+ /**
+ * {@inheritdoc}
*/
public function getCacheKey($name)
{
@@ -85,10 +81,7 @@ class Twig_Loader_Array implements Twig_LoaderInterface
}
/**
- * Returns true if the template is still fresh.
- *
- * @param string $name The template name
- * @param timestamp $time The last modification time of the cached template
+ * {@inheritdoc}
*/
public function isFresh($name, $time)
{
diff --git a/vendor/twig/twig/lib/Twig/Loader/Chain.php b/vendor/twig/twig/lib/Twig/Loader/Chain.php
new file mode 100644
index 0000000000..7919eda627
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Loader/Chain.php
@@ -0,0 +1,138 @@
+
+ */
+class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+{
+ private $hasSourceCache = array();
+ protected $loaders = array();
+
+ /**
+ * Constructor.
+ *
+ * @param Twig_LoaderInterface[] $loaders An array of loader instances
+ */
+ public function __construct(array $loaders = array())
+ {
+ foreach ($loaders as $loader) {
+ $this->addLoader($loader);
+ }
+ }
+
+ /**
+ * Adds a loader instance.
+ *
+ * @param Twig_LoaderInterface $loader A Loader instance
+ */
+ public function addLoader(Twig_LoaderInterface $loader)
+ {
+ $this->loaders[] = $loader;
+ $this->hasSourceCache = array();
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSource($name)
+ {
+ $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, implode(', ', $exceptions)));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ 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 {
+ $loader->getSource($name);
+
+ return $this->hasSourceCache[$name] = true;
+ } catch (Twig_Error_Loader $e) {
+ }
+ }
+
+ return $this->hasSourceCache[$name] = false;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ 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, implode(' ', $exceptions)));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ 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, implode(' ', $exceptions)));
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
new file mode 100644
index 0000000000..d0ae1cc1d7
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
@@ -0,0 +1,236 @@
+
+ */
+class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+{
+ /** Identifier of the main namespace. */
+ const MAIN_NAMESPACE = '__main__';
+
+ protected $paths = array();
+ protected $cache = array();
+
+ /**
+ * Constructor.
+ *
+ * @param string|array $paths A path or an array of paths where to look for templates
+ */
+ public function __construct($paths = array())
+ {
+ 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 name
+ *
+ * @throws Twig_Error_Loader
+ */
+ public function addPath($path, $namespace = self::MAIN_NAMESPACE)
+ {
+ // invalidate the cache
+ $this->cache = array();
+
+ if (!is_dir($path)) {
+ throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
+ }
+
+ $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 name
+ *
+ * @throws Twig_Error_Loader
+ */
+ public function prependPath($path, $namespace = self::MAIN_NAMESPACE)
+ {
+ // invalidate the cache
+ $this->cache = array();
+
+ if (!is_dir($path)) {
+ throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
+ }
+
+ $path = rtrim($path, '/\\');
+
+ if (!isset($this->paths[$namespace])) {
+ $this->paths[$namespace][] = $path;
+ } else {
+ array_unshift($this->paths[$namespace], $path);
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getSource($name)
+ {
+ return file_get_contents($this->findTemplate($name));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCacheKey($name)
+ {
+ return $this->findTemplate($name);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function exists($name)
+ {
+ $name = $this->normalizeName($name);
+
+ if (isset($this->cache[$name])) {
+ return true;
+ }
+
+ try {
+ $this->findTemplate($name);
+
+ return true;
+ } catch (Twig_Error_Loader $exception) {
+ return false;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isFresh($name, $time)
+ {
+ return filemtime($this->findTemplate($name)) <= $time;
+ }
+
+ protected function findTemplate($name)
+ {
+ $name = $this->normalizeName($name);
+
+ if (isset($this->cache[$name])) {
+ return $this->cache[$name];
+ }
+
+ $this->validateName($name);
+
+ list($namespace, $shortname) = $this->parseName($name);
+
+ if (!isset($this->paths[$namespace])) {
+ throw new Twig_Error_Loader(sprintf('There are no registered paths for namespace "%s".', $namespace));
+ }
+
+ foreach ($this->paths[$namespace] as $path) {
+ if (is_file($path.'/'.$shortname)) {
+ return $this->cache[$name] = $path.'/'.$shortname;
+ }
+ }
+
+ throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths[$namespace])));
+ }
+
+ 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,}#', '/', strtr((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));
+ }
+ }
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Loader/String.php b/vendor/twig/twig/lib/Twig/Loader/String.php
old mode 100755
new mode 100644
similarity index 55%
rename from main/inc/lib/symfony/Twig/Loader/String.php
rename to vendor/twig/twig/lib/Twig/Loader/String.php
index 26eb0096df..8ad9856cc0
--- a/main/inc/lib/symfony/Twig/Loader/String.php
+++ b/vendor/twig/twig/lib/Twig/Loader/String.php
@@ -12,22 +12,21 @@
/**
* Loads a template from a string.
*
+ * This loader should only be used for unit testing as it has many limitations
+ * (for instance, the include or extends tag does not make any sense for a string
+ * loader).
+ *
* 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.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
-class Twig_Loader_String implements Twig_LoaderInterface
+class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
{
/**
- * 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
+ * {@inheritdoc}
*/
public function getSource($name)
{
@@ -35,11 +34,15 @@ class Twig_Loader_String implements Twig_LoaderInterface
}
/**
- * 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
+ * {@inheritdoc}
+ */
+ public function exists($name)
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
*/
public function getCacheKey($name)
{
@@ -47,10 +50,7 @@ class Twig_Loader_String implements Twig_LoaderInterface
}
/**
- * Returns true if the template is still fresh.
- *
- * @param string $name The template name
- * @param timestamp $time The last modification time of the cached template
+ * {@inheritdoc}
*/
public function isFresh($name, $time)
{
diff --git a/main/inc/lib/symfony/Twig/LoaderInterface.php b/vendor/twig/twig/lib/Twig/LoaderInterface.php
old mode 100755
new mode 100644
similarity index 73%
rename from main/inc/lib/symfony/Twig/LoaderInterface.php
rename to vendor/twig/twig/lib/Twig/LoaderInterface.php
index d8ae4446c9..4405291fff
--- a/main/inc/lib/symfony/Twig/LoaderInterface.php
+++ b/vendor/twig/twig/lib/Twig/LoaderInterface.php
@@ -12,32 +12,31 @@
/**
* Interface all loaders must implement.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_LoaderInterface
{
/**
* Gets the source code of a template, given its name.
*
- * @param string $name The name of the template to load
+ * @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
*/
- function getSource($name);
+ 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
+ * @param string $name The name of the template to load
*
* @return string The cache key
*
* @throws Twig_Error_Loader When $name is not found
*/
- function getCacheKey($name);
+ public function getCacheKey($name);
/**
* Returns true if the template is still fresh.
@@ -45,9 +44,9 @@ interface Twig_LoaderInterface
* @param string $name The template name
* @param timestamp $time The last modification time of the cached template
*
- * @return Boolean true if the template is fresh, false otherwise
+ * @return bool true if the template is fresh, false otherwise
*
* @throws Twig_Error_Loader When $name is not found
*/
- function isFresh($name, $time);
+ public function isFresh($name, $time);
}
diff --git a/main/inc/lib/symfony/Twig/Markup.php b/vendor/twig/twig/lib/Twig/Markup.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Markup.php
rename to vendor/twig/twig/lib/Twig/Markup.php
index 7099b2987e..69871fcbd0
--- a/main/inc/lib/symfony/Twig/Markup.php
+++ b/vendor/twig/twig/lib/Twig/Markup.php
@@ -12,8 +12,7 @@
/**
* Marks a content as safe.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Markup implements Countable
{
diff --git a/main/inc/lib/symfony/Twig/Node.php b/vendor/twig/twig/lib/Twig/Node.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Node.php
rename to vendor/twig/twig/lib/Twig/Node.php
index 651ffc4d17..978e766288
--- a/main/inc/lib/symfony/Twig/Node.php
+++ b/vendor/twig/twig/lib/Twig/Node.php
@@ -13,8 +13,7 @@
/**
* Represents a node in the AST.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node implements Twig_NodeInterface
{
@@ -31,7 +30,7 @@ class Twig_Node implements Twig_NodeInterface
*
* @param array $nodes An array of named nodes
* @param array $attributes An array of attributes (should not be nodes)
- * @param integer $lineno The line number
+ * @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)
@@ -122,7 +121,7 @@ class Twig_Node implements Twig_NodeInterface
*
* @param string The attribute name
*
- * @return Boolean true if the attribute is defined, false otherwise
+ * @return bool true if the attribute is defined, false otherwise
*/
public function hasAttribute($name)
{
@@ -134,12 +133,12 @@ class Twig_Node implements Twig_NodeInterface
*
* @param string The attribute name
*
- * @return mixed The attribute value
+ * @return mixed The attribute value
*/
public function getAttribute($name)
{
if (!array_key_exists($name, $this->attributes)) {
- throw new Twig_Error_Runtime(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
+ throw new LogicException(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
}
return $this->attributes[$name];
@@ -171,7 +170,7 @@ class Twig_Node implements Twig_NodeInterface
*
* @param string The node name
*
- * @return Boolean true if the node with the given name exists, false otherwise
+ * @return bool true if the node with the given name exists, false otherwise
*/
public function hasNode($name)
{
@@ -188,7 +187,7 @@ class Twig_Node implements Twig_NodeInterface
public function getNode($name)
{
if (!array_key_exists($name, $this->nodes)) {
- throw new Twig_Error_Runtime(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
+ throw new LogicException(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
}
return $this->nodes[$name];
diff --git a/main/inc/lib/symfony/Twig/Node/AutoEscape.php b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
old mode 100755
new mode 100644
similarity index 92%
rename from main/inc/lib/symfony/Twig/Node/AutoEscape.php
rename to vendor/twig/twig/lib/Twig/Node/AutoEscape.php
index a0c2ee6d80..8f190e0bd8
--- a/main/inc/lib/symfony/Twig/Node/AutoEscape.php
+++ b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
@@ -18,8 +18,7 @@
*
* If autoescaping is disabled, then the value is false.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_AutoEscape extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/Block.php b/vendor/twig/twig/lib/Twig/Node/Block.php
old mode 100755
new mode 100644
similarity index 93%
rename from main/inc/lib/symfony/Twig/Node/Block.php
rename to vendor/twig/twig/lib/Twig/Node/Block.php
index 5548ad063e..50eb67ed8c
--- a/main/inc/lib/symfony/Twig/Node/Block.php
+++ b/vendor/twig/twig/lib/Twig/Node/Block.php
@@ -13,8 +13,7 @@
/**
* Represents a block node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Block extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
old mode 100755
new mode 100644
similarity index 92%
rename from main/inc/lib/symfony/Twig/Node/BlockReference.php
rename to vendor/twig/twig/lib/Twig/Node/BlockReference.php
index 53f6287cc1..013e369ebe
--- a/main/inc/lib/symfony/Twig/Node/BlockReference.php
+++ b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
@@ -13,8 +13,7 @@
/**
* Represents a block call node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
{
diff --git a/main/inc/lib/symfony/Twig/Node/Body.php b/vendor/twig/twig/lib/Twig/Node/Body.php
old mode 100755
new mode 100644
similarity index 79%
rename from main/inc/lib/symfony/Twig/Node/Body.php
rename to vendor/twig/twig/lib/Twig/Node/Body.php
index f72bf506bd..3ffb1342b7
--- a/main/inc/lib/symfony/Twig/Node/Body.php
+++ b/vendor/twig/twig/lib/Twig/Node/Body.php
@@ -12,8 +12,7 @@
/**
* Represents a body node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Body extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/Do.php b/vendor/twig/twig/lib/Twig/Node/Do.php
old mode 100755
new mode 100644
similarity index 91%
rename from main/inc/lib/symfony/Twig/Node/Do.php
rename to vendor/twig/twig/lib/Twig/Node/Do.php
index aa419d92e8..c528066b29
--- a/main/inc/lib/symfony/Twig/Node/Do.php
+++ b/vendor/twig/twig/lib/Twig/Node/Do.php
@@ -12,8 +12,7 @@
/**
* Represents a do node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Do extends Twig_Node
{
diff --git a/vendor/twig/twig/lib/Twig/Node/Embed.php b/vendor/twig/twig/lib/Twig/Node/Embed.php
new file mode 100644
index 0000000000..4c9456dc05
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Embed.php
@@ -0,0 +1,38 @@
+
+ */
+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($filename, $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('filename', $filename);
+ $this->setAttribute('index', $index);
+ }
+
+ protected function addGetTemplate(Twig_Compiler $compiler)
+ {
+ $compiler
+ ->write("\$this->env->loadTemplate(")
+ ->string($this->getAttribute('filename'))
+ ->raw(', ')
+ ->string($this->getAttribute('index'))
+ ->raw(")")
+ ;
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression.php b/vendor/twig/twig/lib/Twig/Node/Expression.php
old mode 100755
new mode 100644
similarity index 83%
rename from main/inc/lib/symfony/Twig/Node/Expression.php
rename to vendor/twig/twig/lib/Twig/Node/Expression.php
index 13b170e50f..a7382e7d6e
--- a/main/inc/lib/symfony/Twig/Node/Expression.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression.php
@@ -13,8 +13,7 @@
/**
* Abstract class for all nodes that represents an expression.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
abstract class Twig_Node_Expression extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Array.php b/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Array.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Array.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/AssignName.php b/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/AssignName.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Add.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Add.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/And.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/And.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseAnd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseAnd.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseOr.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseOr.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseXor.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/BitwiseXor.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Concat.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Concat.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Div.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Div.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
new file mode 100644
index 0000000000..5de6c72d21
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
@@ -0,0 +1,30 @@
+raw('(0 === substr_compare(')
+ ->subcompile($this->getNode('left'))
+ ->raw(', ')
+ ->subcompile($this->getNode('right'))
+ ->raw(', -strlen(')
+ ->subcompile($this->getNode('right'))
+ ->raw(')))')
+ ;
+ }
+
+ public function operator(Twig_Compiler $compiler)
+ {
+ return $compiler->raw('');
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Equal.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Equal.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/FloorDiv.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/FloorDiv.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Greater.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Greater.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/GreaterEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/GreaterEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/In.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/In.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Less.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Less.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/LessEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/LessEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
new file mode 100644
index 0000000000..93bb292051
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
@@ -0,0 +1,28 @@
+raw('preg_match(')
+ ->subcompile($this->getNode('right'))
+ ->raw(', ')
+ ->subcompile($this->getNode('left'))
+ ->raw(')')
+ ;
+ }
+
+ public function operator(Twig_Compiler $compiler)
+ {
+ return $compiler->raw('');
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Mod.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Mod.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Mul.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Mul.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/NotEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/NotEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/NotIn.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/NotIn.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Or.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Or.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Power.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Power.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Range.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Range.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
new file mode 100644
index 0000000000..eb8c107cb1
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
@@ -0,0 +1,28 @@
+raw('(0 === strpos(')
+ ->subcompile($this->getNode('left'))
+ ->raw(', ')
+ ->subcompile($this->getNode('right'))
+ ->raw('))')
+ ;
+ }
+
+ public function operator(Twig_Compiler $compiler)
+ {
+ return $compiler->raw('');
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Binary/Sub.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Binary/Sub.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
old mode 100755
new mode 100644
similarity index 94%
rename from main/inc/lib/symfony/Twig/Node/Expression/BlockReference.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
index 174d9097f5..647196eb5b
--- a/main/inc/lib/symfony/Twig/Node/Expression/BlockReference.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
@@ -13,8 +13,7 @@
/**
* Represents a block call node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
{
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
new file mode 100644
index 0000000000..912b837a9f
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
@@ -0,0 +1,176 @@
+hasAttribute('callable') && $callable = $this->getAttribute('callable')) {
+ if (is_string($callable)) {
+ $compiler->raw($callable);
+ } elseif (is_array($callable) && $callable[0] instanceof Twig_ExtensionInterface) {
+ $compiler->raw(sprintf('$this->env->getExtension(\'%s\')->%s', $callable[0]->getName(), $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') && null !== $this->getNode('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)
+ {
+ $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".', $this->getAttribute('type'), $this->getAttribute('name')));
+ }
+
+ $parameters[$name] = $node;
+ }
+
+ if (!$named) {
+ return $parameters;
+ }
+
+ if (!$callable) {
+ throw new LogicException(sprintf('Named arguments are not supported for %s "%s".', $this->getAttribute('type'), $this->getAttribute('name')));
+ }
+
+ // manage named arguments
+ if (is_array($callable)) {
+ $r = new ReflectionMethod($callable[0], $callable[1]);
+ } elseif (is_object($callable) && !$callable instanceof Closure) {
+ $r = new ReflectionObject($callable);
+ $r = $r->getMethod('__invoke');
+ } else {
+ $r = new ReflectionFunction($callable);
+ }
+
+ $definition = $r->getParameters();
+ if ($this->hasNode('node')) {
+ array_shift($definition);
+ }
+ if ($this->hasAttribute('needs_environment') && $this->getAttribute('needs_environment')) {
+ array_shift($definition);
+ }
+ if ($this->hasAttribute('needs_context') && $this->getAttribute('needs_context')) {
+ array_shift($definition);
+ }
+ if ($this->hasAttribute('arguments') && null !== $this->getAttribute('arguments')) {
+ foreach ($this->getAttribute('arguments') as $argument) {
+ array_shift($definition);
+ }
+ }
+
+ $arguments = array();
+ $pos = 0;
+ foreach ($definition as $param) {
+ $name = $this->normalizeName($param->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, $this->getAttribute('type'), $this->getAttribute('name')));
+ }
+
+ $arguments[] = $parameters[$name];
+ unset($parameters[$name]);
+ } elseif (array_key_exists($pos, $parameters)) {
+ $arguments[] = $parameters[$pos];
+ unset($parameters[$pos]);
+ ++$pos;
+ } elseif ($param->isDefaultValueAvailable()) {
+ $arguments[] = new Twig_Node_Expression_Constant($param->getDefaultValue(), -1);
+ } elseif ($param->isOptional()) {
+ break;
+ } else {
+ throw new Twig_Error_Syntax(sprintf('Value for argument "%s" is required for %s "%s".', $name, $this->getAttribute('type'), $this->getAttribute('name')));
+ }
+ }
+
+ if (!empty($parameters)) {
+ throw new Twig_Error_Syntax(sprintf('Unknown argument%s "%s" for %s "%s".', count($parameters) > 1 ? 's' : '', implode('", "', array_keys($parameters)), $this->getAttribute('type'), $this->getAttribute('name')));
+ }
+
+ 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));
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Conditional.php b/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Conditional.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Constant.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/ExtensionReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
old mode 100755
new mode 100644
similarity index 91%
rename from main/inc/lib/symfony/Twig/Node/Expression/ExtensionReference.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
index cb4efad024..00ac6701f4
--- a/main/inc/lib/symfony/Twig/Node/Expression/ExtensionReference.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
@@ -12,8 +12,7 @@
/**
* Represents an extension call node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
{
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
new file mode 100644
index 0000000000..207b062a3a
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
@@ -0,0 +1,36 @@
+ $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());
+ }
+
+ $this->compileCallable($compiler);
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Filter/Default.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Node/Expression/Filter/Default.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
index 1cb3342812..1827c88864
--- a/main/inc/lib/symfony/Twig/Node/Expression/Filter/Default.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
@@ -16,14 +16,13 @@
* {{ var.foo|default('foo item on var is not defined') }}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
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->getLine()), $arguments, $node->getLine());
+ $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('default', $node->getLine()), $arguments, $node->getLine());
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->getLine());
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
new file mode 100644
index 0000000000..3e1f6b5590
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
@@ -0,0 +1,35 @@
+ $arguments), array('name' => $name), $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) {
+ $this->setAttribute('callable', $function->getCallable());
+ }
+
+ $this->compileCallable($compiler);
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/GetAttr.php b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
old mode 100755
new mode 100644
similarity index 74%
rename from main/inc/lib/symfony/Twig/Node/Expression/GetAttr.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
index 6498444638..55d9fcc320
--- a/main/inc/lib/symfony/Twig/Node/Expression/GetAttr.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
@@ -13,12 +13,12 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
{
public function __construct(Twig_Node_Expression $node, Twig_Node_Expression $attribute, Twig_Node_Expression_Array $arguments, $type, $lineno)
{
- parent::__construct(array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false), $lineno);
+ parent::__construct(array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false, 'disable_c_ext' => false), $lineno);
}
public function compile(Twig_Compiler $compiler)
{
- if (function_exists('twig_template_get_attributes')) {
+ if (function_exists('twig_template_get_attributes') && !$this->getAttribute('disable_c_ext')) {
$compiler->raw('twig_template_get_attributes($this, ');
} else {
$compiler->raw('$this->getAttribute(');
@@ -32,10 +32,10 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
$compiler->raw(', ')->subcompile($this->getNode('attribute'));
- if (count($this->getNode('arguments')) || Twig_TemplateInterface::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
+ if (count($this->getNode('arguments')) || Twig_Template::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
$compiler->raw(', ')->subcompile($this->getNode('arguments'));
- if (Twig_TemplateInterface::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
+ if (Twig_Template::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
$compiler->raw(', ')->repr($this->getAttribute('type'));
}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/MethodCall.php b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
old mode 100755
new mode 100644
similarity index 89%
rename from main/inc/lib/symfony/Twig/Node/Expression/MethodCall.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
index 50938084b5..620b02bf47
--- a/main/inc/lib/symfony/Twig/Node/Expression/MethodCall.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
@@ -13,6 +13,10 @@ 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)
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Name.php b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
old mode 100755
new mode 100644
similarity index 76%
rename from main/inc/lib/symfony/Twig/Node/Expression/Name.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Name.php
index 8f5a1ea808..3b8fae01dc
--- a/main/inc/lib/symfony/Twig/Node/Expression/Name.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
@@ -19,7 +19,7 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
public function __construct($name, $lineno)
{
- parent::__construct(array(), array('name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false), $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)
@@ -34,19 +34,31 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
}
} elseif ($this->isSpecial()) {
$compiler->raw($this->specialVars[$name]);
+ } elseif ($this->getAttribute('always_defined')) {
+ $compiler
+ ->raw('$context[')
+ ->string($name)
+ ->raw(']')
+ ;
} else {
// remove the non-PHP 5.4 version when PHP 5.3 support is dropped
// as the non-optimized version is just a workaround for slow ternary operator
// when the context has a lot of variables
- if (version_compare(phpversion(), '5.4.0RC1', '>=') && ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables())) {
+ if (version_compare(phpversion(), '5.4.0RC1', '>=')) {
// PHP 5.4 ternary operator performance was optimized
$compiler
->raw('(isset($context[')
->string($name)
->raw(']) ? $context[')
->string($name)
- ->raw('] : null)')
+ ->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, ')
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Parent.php b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
old mode 100755
new mode 100644
similarity index 94%
rename from main/inc/lib/symfony/Twig/Node/Expression/Parent.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
index ea9734946e..dcf618c04a
--- a/main/inc/lib/symfony/Twig/Node/Expression/Parent.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
@@ -13,8 +13,7 @@
/**
* Represents a parent node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Parent extends Twig_Node_Expression
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/TempName.php b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
old mode 100755
new mode 100644
similarity index 79%
rename from main/inc/lib/symfony/Twig/Node/Expression/TempName.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
index eea9d4727b..e6b058e85c
--- a/main/inc/lib/symfony/Twig/Node/Expression/TempName.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
@@ -17,6 +17,10 @@ class Twig_Node_Expression_TempName extends Twig_Node_Expression
public function compile(Twig_Compiler $compiler)
{
- $compiler->raw('$_')->raw($this->getAttribute('name'))->raw('_');
+ $compiler
+ ->raw('$_')
+ ->raw($this->getAttribute('name'))
+ ->raw('_')
+ ;
}
}
diff --git a/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
new file mode 100644
index 0000000000..639f501a18
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
@@ -0,0 +1,32 @@
+ $node, 'arguments' => $arguments), 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());
+ }
+
+ $this->compileCallable($compiler);
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
old mode 100755
new mode 100644
similarity index 71%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Constant.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
index 6e6b6fd7aa..de55f5f55d
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Constant.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
@@ -18,8 +18,7 @@
* {% endif %}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
{
@@ -29,6 +28,17 @@ class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
->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('))')
;
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Defined.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
old mode 100755
new mode 100644
similarity index 95%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Defined.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
index e7c6828074..247b2e23a5
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Defined.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
@@ -19,8 +19,7 @@
* {% endif %}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Divisibleby.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
old mode 100755
new mode 100644
similarity index 85%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Divisibleby.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
index 05563d5769..d5bed234a8
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Divisibleby.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
@@ -13,11 +13,10 @@
* Checks if a variable is divisible by a number.
*
*
- * {% if loop.index is divisibleby(3) %}
+ * {% if loop.index is divisible by(3) %}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Even.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
old mode 100755
new mode 100644
similarity index 89%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Even.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
index 08e6d829f4..d7853e89c6
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Even.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
@@ -16,8 +16,7 @@
* {{ var is even }}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Null.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
old mode 100755
new mode 100644
similarity index 89%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Null.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
index 55061db3f5..1c83825a00
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Null.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
@@ -16,8 +16,7 @@
* {{ var is none }}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Odd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
old mode 100755
new mode 100644
similarity index 89%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Odd.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
index 5fecebcb15..421c19e841
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Odd.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
@@ -16,8 +16,7 @@
* {{ var is odd }}
*
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Test/Sameas.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Node/Expression/Test/Sameas.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
index 8639b9650d..b48905ee41
--- a/main/inc/lib/symfony/Twig/Node/Expression/Test/Sameas.php
+++ b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
@@ -12,8 +12,7 @@
/**
* Checks if a variable is the same as another one (=== in PHP).
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test
{
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Unary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Unary.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Unary/Neg.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Unary/Neg.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Unary/Not.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Unary/Not.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
diff --git a/main/inc/lib/symfony/Twig/Node/Expression/Unary/Pos.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/Expression/Unary/Pos.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
diff --git a/main/inc/lib/symfony/Twig/Node/Flush.php b/vendor/twig/twig/lib/Twig/Node/Flush.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/Node/Flush.php
rename to vendor/twig/twig/lib/Twig/Node/Flush.php
index 8f2ab9dbf7..0467ddcefc
--- a/main/inc/lib/symfony/Twig/Node/Flush.php
+++ b/vendor/twig/twig/lib/Twig/Node/Flush.php
@@ -12,8 +12,7 @@
/**
* Represents a flush node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Flush extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/For.php b/vendor/twig/twig/lib/Twig/Node/For.php
old mode 100755
new mode 100644
similarity index 95%
rename from main/inc/lib/symfony/Twig/Node/For.php
rename to vendor/twig/twig/lib/Twig/Node/For.php
index d9d25b3f2c..d1ff371da1
--- a/main/inc/lib/symfony/Twig/Node/For.php
+++ b/vendor/twig/twig/lib/Twig/Node/For.php
@@ -13,8 +13,7 @@
/**
* Represents a for node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_For extends Twig_Node
{
@@ -108,6 +107,6 @@ class Twig_Node_For extends Twig_Node
$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_merge(\$_parent, array_intersect_key(\$context, \$_parent));\n");
+ $compiler->write("\$context = array_intersect_key(\$context, \$_parent) + \$_parent;\n");
}
}
diff --git a/main/inc/lib/symfony/Twig/Node/ForLoop.php b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
old mode 100755
new mode 100644
similarity index 95%
rename from main/inc/lib/symfony/Twig/Node/ForLoop.php
rename to vendor/twig/twig/lib/Twig/Node/ForLoop.php
index 38f2e852b8..b8841583d9
--- a/main/inc/lib/symfony/Twig/Node/ForLoop.php
+++ b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
@@ -12,8 +12,7 @@
/**
* Internal node used by the for node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_ForLoop extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/If.php b/vendor/twig/twig/lib/Twig/Node/If.php
old mode 100755
new mode 100644
similarity index 91%
rename from main/inc/lib/symfony/Twig/Node/If.php
rename to vendor/twig/twig/lib/Twig/Node/If.php
index aa12efbec1..b42d107555
--- a/main/inc/lib/symfony/Twig/Node/If.php
+++ b/vendor/twig/twig/lib/Twig/Node/If.php
@@ -13,8 +13,7 @@
/**
* Represents an if node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_If extends Twig_Node
{
@@ -31,7 +30,7 @@ class Twig_Node_If extends Twig_Node
public function compile(Twig_Compiler $compiler)
{
$compiler->addDebugInfo($this);
- for ($i = 0; $i < count($this->getNode('tests')); $i += 2) {
+ for ($i = 0, $count = count($this->getNode('tests')); $i < $count; $i += 2) {
if ($i > 0) {
$compiler
->outdent()
diff --git a/main/inc/lib/symfony/Twig/Node/Import.php b/vendor/twig/twig/lib/Twig/Node/Import.php
old mode 100755
new mode 100644
similarity index 94%
rename from main/inc/lib/symfony/Twig/Node/Import.php
rename to vendor/twig/twig/lib/Twig/Node/Import.php
index a327411d6c..99efc0911c
--- a/main/inc/lib/symfony/Twig/Node/Import.php
+++ b/vendor/twig/twig/lib/Twig/Node/Import.php
@@ -12,8 +12,7 @@
/**
* Represents an import node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Import extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/Include.php b/vendor/twig/twig/lib/Twig/Node/Include.php
old mode 100755
new mode 100644
similarity index 82%
rename from main/inc/lib/symfony/Twig/Node/Include.php
rename to vendor/twig/twig/lib/Twig/Node/Include.php
index 467749b5df..860aedfe2a
--- a/main/inc/lib/symfony/Twig/Node/Include.php
+++ b/vendor/twig/twig/lib/Twig/Node/Include.php
@@ -13,14 +13,13 @@
/**
* Represents an include node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
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)
{
- parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (Boolean) $only, 'ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag);
+ parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (bool) $only, 'ignore_missing' => (bool) $ignoreMissing), $lineno, $tag);
}
/**
@@ -39,21 +38,46 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
;
}
+ $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)
+ {
if ($this->getNode('expr') instanceof Twig_Node_Expression_Constant) {
$compiler
->write("\$this->env->loadTemplate(")
->subcompile($this->getNode('expr'))
- ->raw(")->display(")
+ ->raw(")")
;
} else {
$compiler
->write("\$template = \$this->env->resolveTemplate(")
->subcompile($this->getNode('expr'))
->raw(");\n")
- ->write('$template->display(')
+ ->write('$template')
;
}
+ }
+ protected function addTemplateArguments(Twig_Compiler $compiler)
+ {
if (false === $this->getAttribute('only')) {
if (null === $this->getNode('variables')) {
$compiler->raw('$context');
@@ -71,18 +95,5 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
$compiler->subcompile($this->getNode('variables'));
}
}
-
- $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")
- ;
- }
}
}
diff --git a/main/inc/lib/symfony/Twig/Node/Macro.php b/vendor/twig/twig/lib/Twig/Node/Macro.php
old mode 100755
new mode 100644
similarity index 64%
rename from main/inc/lib/symfony/Twig/Node/Macro.php
rename to vendor/twig/twig/lib/Twig/Node/Macro.php
index 5db1bf10e4..89910618b8
--- a/main/inc/lib/symfony/Twig/Node/Macro.php
+++ b/vendor/twig/twig/lib/Twig/Node/Macro.php
@@ -12,8 +12,7 @@
/**
* Represents a macro node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Macro extends Twig_Node
{
@@ -29,14 +28,27 @@ class Twig_Node_Macro extends Twig_Node
*/
public function compile(Twig_Compiler $compiler)
{
- $arguments = array();
- foreach ($this->getNode('arguments') as $argument) {
- $arguments[] = '$'.$argument->getAttribute('name').' = null';
+ $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(', ');
+ }
}
$compiler
- ->addDebugInfo($this)
- ->write(sprintf("public function get%s(%s)\n", $this->getAttribute('name'), implode(', ', $arguments)), "{\n")
+ ->raw(")\n")
+ ->write("{\n")
->indent()
;
@@ -44,15 +56,15 @@ class Twig_Node_Macro extends Twig_Node
$compiler->write("\$context = \$this->env->getGlobals();\n\n");
} else {
$compiler
- ->write("\$context = array_merge(\$this->env->getGlobals(), array(\n")
+ ->write("\$context = \$this->env->mergeGlobals(array(\n")
->indent()
;
- foreach ($this->getNode('arguments') as $argument) {
+ foreach ($this->getNode('arguments') as $name => $default) {
$compiler
->write('')
- ->string($argument->getAttribute('name'))
- ->raw(' => $'.$argument->getAttribute('name'))
+ ->string($name)
+ ->raw(' => $_'.$name)
->raw(",\n")
;
}
@@ -70,13 +82,13 @@ class Twig_Node_Macro extends Twig_Node
->indent()
->subcompile($this->getNode('body'))
->outdent()
- ->write("} catch(Exception \$e) {\n")
+ ->write("} catch (Exception \$e) {\n")
->indent()
->write("ob_end_clean();\n\n")
->write("throw \$e;\n")
->outdent()
->write("}\n\n")
- ->write("return ob_get_clean();\n")
+ ->write("return ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset());\n")
->outdent()
->write("}\n\n")
;
diff --git a/main/inc/lib/symfony/Twig/Node/Module.php b/vendor/twig/twig/lib/Twig/Node/Module.php
old mode 100755
new mode 100644
similarity index 88%
rename from main/inc/lib/symfony/Twig/Node/Module.php
rename to vendor/twig/twig/lib/Twig/Node/Module.php
index c67bc9a0d7..3f80175722
--- a/main/inc/lib/symfony/Twig/Node/Module.php
+++ b/vendor/twig/twig/lib/Twig/Node/Module.php
@@ -13,14 +13,19 @@
/**
* Represents a module node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Module extends Twig_Node
{
- public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $filename)
+ public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $filename)
{
- parent::__construct(array('parent' => $parent, 'body' => $body, 'blocks' => $blocks, 'macros' => $macros, 'traits' => $traits), array('filename' => $filename), 1);
+ // embedded templates are set as attributes so that they are only visited once by the visitors
+ parent::__construct(array('parent' => $parent, 'body' => $body, 'blocks' => $blocks, 'macros' => $macros, 'traits' => $traits), array('filename' => $filename, 'index' => null, 'embedded_templates' => $embeddedTemplates), 1);
+ }
+
+ public function setIndex($index)
+ {
+ $this->setAttribute('index', $index);
}
/**
@@ -31,13 +36,21 @@ class Twig_Node_Module extends Twig_Node
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('compileClassHeader($compiler);
- if (count($this->getNode('blocks')) || count($this->getNode('traits'))) {
+ if (count($this->getNode('blocks')) || count($this->getNode('traits')) || null === $this->getNode('parent') || $this->getNode('parent') instanceof Twig_Node_Expression_Constant) {
$this->compileConstructor($compiler);
}
@@ -108,10 +121,10 @@ class Twig_Node_Module extends Twig_Node
protected function compileClassHeader(Twig_Compiler $compiler)
{
$compiler
- ->write("write("\n\n")
// if the filename contains */, add a blank to avoid a PHP parse error
->write("/* ".str_replace('*/', '* /', $this->getAttribute('filename'))." */\n")
- ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename')))
+ ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename'), $this->getAttribute('index')))
->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass()))
->write("{\n")
->indent()
@@ -157,6 +170,18 @@ class Twig_Node_Module extends Twig_Node
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))
diff --git a/main/inc/lib/symfony/Twig/Node/Print.php b/vendor/twig/twig/lib/Twig/Node/Print.php
old mode 100755
new mode 100644
similarity index 92%
rename from main/inc/lib/symfony/Twig/Node/Print.php
rename to vendor/twig/twig/lib/Twig/Node/Print.php
index 766725ff72..b0c41d1d92
--- a/main/inc/lib/symfony/Twig/Node/Print.php
+++ b/vendor/twig/twig/lib/Twig/Node/Print.php
@@ -13,8 +13,7 @@
/**
* Represents a node that outputs an expression.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
{
diff --git a/main/inc/lib/symfony/Twig/Node/Sandbox.php b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
old mode 100755
new mode 100644
similarity index 94%
rename from main/inc/lib/symfony/Twig/Node/Sandbox.php
rename to vendor/twig/twig/lib/Twig/Node/Sandbox.php
index cbfcb411b3..8cf3ed44f7
--- a/main/inc/lib/symfony/Twig/Node/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
@@ -12,8 +12,7 @@
/**
* Represents a sandbox node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Sandbox extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/SandboxedModule.php b/vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
old mode 100755
new mode 100644
similarity index 85%
rename from main/inc/lib/symfony/Twig/Node/SandboxedModule.php
rename to vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
index 655efa3a8e..0de4503ec5
--- a/main/inc/lib/symfony/Twig/Node/SandboxedModule.php
+++ b/vendor/twig/twig/lib/Twig/Node/SandboxedModule.php
@@ -13,8 +13,7 @@
/**
* Represents a module node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_SandboxedModule extends Twig_Node_Module
{
@@ -24,7 +23,9 @@ class Twig_Node_SandboxedModule extends Twig_Node_Module
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('filename'), $node->getLine(), $node->getNodeTag());
+ parent::__construct($node->getNode('body'), $node->getNode('parent'), $node->getNode('blocks'), $node->getNode('macros'), $node->getNode('traits'), $node->getAttribute('embedded_templates'), $node->getAttribute('filename'));
+
+ $this->setAttribute('index', $node->getAttribute('index'));
$this->usedFilters = $usedFilters;
$this->usedTags = $usedTags;
@@ -43,7 +44,7 @@ class Twig_Node_SandboxedModule extends Twig_Node_Module
parent::compileDisplayFooter($compiler);
$compiler
- ->write("protected function checkSecurity() {\n")
+ ->write("protected function checkSecurity()\n", "{\n")
->indent()
->write("\$this->env->getExtension('sandbox')->checkSecurity(\n")
->indent()
diff --git a/main/inc/lib/symfony/Twig/Node/SandboxedPrint.php b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
old mode 100755
new mode 100644
similarity index 95%
rename from main/inc/lib/symfony/Twig/Node/SandboxedPrint.php
rename to vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
index 77730d8c62..73dfaa9639
--- a/main/inc/lib/symfony/Twig/Node/SandboxedPrint.php
+++ b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
@@ -17,8 +17,7 @@
* and if the sandbox is enabled, we need to check that the __toString()
* method is allowed if 'article' is an object.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_SandboxedPrint extends Twig_Node_Print
{
diff --git a/main/inc/lib/symfony/Twig/Node/Set.php b/vendor/twig/twig/lib/Twig/Node/Set.php
old mode 100755
new mode 100644
similarity index 97%
rename from main/inc/lib/symfony/Twig/Node/Set.php
rename to vendor/twig/twig/lib/Twig/Node/Set.php
index 70bb5196dc..4c9c16ce2f
--- a/main/inc/lib/symfony/Twig/Node/Set.php
+++ b/vendor/twig/twig/lib/Twig/Node/Set.php
@@ -12,8 +12,7 @@
/**
* Represents a set node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Set extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/SetTemp.php b/vendor/twig/twig/lib/Twig/Node/SetTemp.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/Node/SetTemp.php
rename to vendor/twig/twig/lib/Twig/Node/SetTemp.php
diff --git a/main/inc/lib/symfony/Twig/Node/Spaceless.php b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
old mode 100755
new mode 100644
similarity index 92%
rename from main/inc/lib/symfony/Twig/Node/Spaceless.php
rename to vendor/twig/twig/lib/Twig/Node/Spaceless.php
index 4601346671..7555fa0f18
--- a/main/inc/lib/symfony/Twig/Node/Spaceless.php
+++ b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
@@ -14,8 +14,7 @@
*
* It removes spaces between HTML tags.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Spaceless extends Twig_Node
{
diff --git a/main/inc/lib/symfony/Twig/Node/Text.php b/vendor/twig/twig/lib/Twig/Node/Text.php
old mode 100755
new mode 100644
similarity index 91%
rename from main/inc/lib/symfony/Twig/Node/Text.php
rename to vendor/twig/twig/lib/Twig/Node/Text.php
index 0c1c0928f8..21bdcea148
--- a/main/inc/lib/symfony/Twig/Node/Text.php
+++ b/vendor/twig/twig/lib/Twig/Node/Text.php
@@ -13,8 +13,7 @@
/**
* Represents a text node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
{
diff --git a/main/inc/lib/symfony/Twig/NodeInterface.php b/vendor/twig/twig/lib/Twig/NodeInterface.php
old mode 100755
new mode 100644
similarity index 66%
rename from main/inc/lib/symfony/Twig/NodeInterface.php
rename to vendor/twig/twig/lib/Twig/NodeInterface.php
index 29a84b03f8..43afd0df04
--- a/main/inc/lib/symfony/Twig/NodeInterface.php
+++ b/vendor/twig/twig/lib/Twig/NodeInterface.php
@@ -12,8 +12,9 @@
/**
* Represents a node in the AST.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ *
+ * @deprecated since 1.12 (to be removed in 3.0)
*/
interface Twig_NodeInterface extends Countable, IteratorAggregate
{
@@ -22,9 +23,9 @@ interface Twig_NodeInterface extends Countable, IteratorAggregate
*
* @param Twig_Compiler A Twig_Compiler instance
*/
- function compile(Twig_Compiler $compiler);
+ public function compile(Twig_Compiler $compiler);
- function getLine();
+ public function getLine();
- function getNodeTag();
+ public function getNodeTag();
}
diff --git a/main/inc/lib/symfony/Twig/NodeOutputInterface.php b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
old mode 100755
new mode 100644
similarity index 80%
rename from main/inc/lib/symfony/Twig/NodeOutputInterface.php
rename to vendor/twig/twig/lib/Twig/NodeOutputInterface.php
index 71839569a5..22172c09db
--- a/main/inc/lib/symfony/Twig/NodeOutputInterface.php
+++ b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
@@ -12,8 +12,7 @@
/**
* Represents a displayable node in the AST.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_NodeOutputInterface
{
diff --git a/main/inc/lib/symfony/Twig/NodeTraverser.php b/vendor/twig/twig/lib/Twig/NodeTraverser.php
old mode 100755
new mode 100644
similarity index 85%
rename from main/inc/lib/symfony/Twig/NodeTraverser.php
rename to vendor/twig/twig/lib/Twig/NodeTraverser.php
index 1e82b032ad..8178a55c0d
--- a/main/inc/lib/symfony/Twig/NodeTraverser.php
+++ b/vendor/twig/twig/lib/Twig/NodeTraverser.php
@@ -12,10 +12,9 @@
/**
* Twig_NodeTraverser is a node traverser.
*
- * It visits all nodes and their children and call the given visitor for each.
+ * It visits all nodes and their children and calls the given visitor for each.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_NodeTraverser
{
@@ -25,8 +24,8 @@ class Twig_NodeTraverser
/**
* Constructor.
*
- * @param Twig_Environment $env A Twig_Environment instance
- * @param array $visitors An array of Twig_NodeVisitorInterface instances
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param Twig_NodeVisitorInterface[] $visitors An array of Twig_NodeVisitorInterface instances
*/
public function __construct(Twig_Environment $env, array $visitors = array())
{
@@ -71,7 +70,7 @@ class Twig_NodeTraverser
protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null)
{
if (null === $node) {
- return null;
+ return;
}
$node = $visitor->enterNode($node, $this->env);
diff --git a/main/inc/lib/symfony/Twig/NodeVisitor/Escaper.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
old mode 100755
new mode 100644
similarity index 76%
rename from main/inc/lib/symfony/Twig/NodeVisitor/Escaper.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
index f682bebe84..cc4b3d717a
--- a/main/inc/lib/symfony/Twig/NodeVisitor/Escaper.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
@@ -12,18 +12,18 @@
/**
* Twig_NodeVisitor_Escaper implements output escaping.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
{
protected $statusStack = array();
protected $blocks = array();
-
protected $safeAnalysis;
protected $traverser;
+ protected $defaultStrategy = false;
+ protected $safeVars = array();
- function __construct()
+ public function __construct()
{
$this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis();
}
@@ -38,10 +38,17 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
*/
public function enterNode(Twig_NodeInterface $node, Twig_Environment $env)
{
- if ($node instanceof Twig_Node_AutoEscape) {
+ if ($node instanceof Twig_Node_Module) {
+ if ($env->hasExtension('escaper') && $defaultStrategy = $env->getExtension('escaper')->getDefaultStrategy($node->getAttribute('filename'))) {
+ $this->defaultStrategy = $defaultStrategy;
+ }
+ $this->safeVars = 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;
@@ -57,7 +64,10 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
*/
public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env)
{
- if ($node instanceof Twig_Node_Expression_Filter) {
+ if ($node instanceof Twig_Node_Module) {
+ $this->defaultStrategy = false;
+ $this->safeVars = 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));
@@ -96,22 +106,18 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
{
$name = $filter->getNode('filter')->getAttribute('value');
- if (false !== $f = $env->getFilter($name)) {
- $type = $f->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));
+ $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;
}
@@ -123,6 +129,9 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
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);
}
@@ -136,11 +145,7 @@ class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface
return $this->statusStack[count($this->statusStack) - 1];
}
- if ($env->hasExtension('escaper') && $env->getExtension('escaper')->isGlobal()) {
- return 'html';
- }
-
- return false;
+ return $this->defaultStrategy ? $this->defaultStrategy : false;
}
protected function getEscaperFilter($type, Twig_NodeInterface $node)
diff --git a/main/inc/lib/symfony/Twig/NodeVisitor/Optimizer.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
old mode 100755
new mode 100644
similarity index 88%
rename from main/inc/lib/symfony/Twig/NodeVisitor/Optimizer.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
index cbc61fc3ee..06f69dbe3f
--- a/main/inc/lib/symfony/Twig/NodeVisitor/Optimizer.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
@@ -17,8 +17,7 @@
* You can configure which optimizations you want to activate via the
* optimizer mode.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
{
@@ -36,11 +35,11 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
/**
* Constructor.
*
- * @param integer $optimizers The optimizer mode
+ * @param int $optimizers The optimizer mode
*/
public function __construct($optimizers = -1)
{
- if (!is_int($optimizers) || $optimizers > 2) {
+ 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));
}
@@ -56,7 +55,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
$this->enterOptimizeFor($node, $env);
}
- if (!version_compare(phpversion(), '5.4.0RC1', '>=') && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
+ if (!version_compare(phpversion(), '5.4.0RC1', '>=') && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) {
if ($this->inABody) {
if (!$node instanceof Twig_Node_Expression) {
if (get_class($node) !== 'Twig_Node') {
@@ -109,7 +108,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
return $node;
}
- protected function optimizeVariables($node, $env)
+ 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');
@@ -130,7 +129,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
* @param Twig_NodeInterface $node A Node
* @param Twig_Environment $env The current Twig environment
*/
- protected function optimizePrintNode($node, $env)
+ protected function optimizePrintNode(Twig_NodeInterface $node, Twig_Environment $env)
{
if (!$node instanceof Twig_Node_Print) {
return $node;
@@ -154,7 +153,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
* @param Twig_NodeInterface $node A Node
* @param Twig_Environment $env The current Twig environment
*/
- protected function optimizeRawFilter($node, $env)
+ 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');
@@ -169,7 +168,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
* @param Twig_NodeInterface $node A Node
* @param Twig_Environment $env The current Twig environment
*/
- protected function enterOptimizeFor($node, $env)
+ protected function enterOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_For) {
// disable the loop variable by default
@@ -218,7 +217,7 @@ class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface
* @param Twig_NodeInterface $node A Node
* @param Twig_Environment $env The current Twig environment
*/
- protected function leaveOptimizeFor($node, $env)
+ protected function leaveOptimizeFor(Twig_NodeInterface $node, Twig_Environment $env)
{
if ($node instanceof Twig_Node_For) {
array_shift($this->loops);
diff --git a/main/inc/lib/symfony/Twig/NodeVisitor/SafeAnalysis.php b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
old mode 100755
new mode 100644
similarity index 72%
rename from main/inc/lib/symfony/Twig/NodeVisitor/SafeAnalysis.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
index 89d879406d..a5d06de2ca
--- a/main/inc/lib/symfony/Twig/NodeVisitor/SafeAnalysis.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -3,26 +3,38 @@
class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
{
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])) {
- foreach($this->data[$hash] as $bucket) {
- if ($bucket['key'] === $node) {
- return $bucket['value'];
- }
- }
+ if (!isset($this->data[$hash])) {
+ return;
}
- return null;
+ 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) {
+ foreach ($this->data[$hash] as &$bucket) {
if ($bucket['key'] === $node) {
$bucket['value'] = $safe;
@@ -61,7 +73,11 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
$name = $node->getNode('filter')->getAttribute('value');
$args = $node->getNode('arguments');
if (false !== $filter = $env->getFilter($name)) {
- $this->setSafe($node, $filter->getSafe($args));
+ $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());
}
@@ -81,6 +97,14 @@ class Twig_NodeVisitor_SafeAnalysis implements Twig_NodeVisitorInterface
} 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());
}
diff --git a/main/inc/lib/symfony/Twig/NodeVisitor/Sandbox.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
old mode 100755
new mode 100644
similarity index 97%
rename from main/inc/lib/symfony/Twig/NodeVisitor/Sandbox.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
index 1957f8a8d5..fb27045baa
--- a/main/inc/lib/symfony/Twig/NodeVisitor/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
@@ -12,8 +12,7 @@
/**
* Twig_NodeVisitor_Sandbox implements sandboxing.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface
{
diff --git a/main/inc/lib/symfony/Twig/NodeVisitorInterface.php b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
old mode 100755
new mode 100644
similarity index 71%
rename from main/inc/lib/symfony/Twig/NodeVisitorInterface.php
rename to vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
index e0123b5dc7..608adedb02
--- a/main/inc/lib/symfony/Twig/NodeVisitorInterface.php
+++ b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
@@ -12,8 +12,7 @@
/**
* Twig_NodeVisitorInterface is the interface the all node visitor classes must implement.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_NodeVisitorInterface
{
@@ -25,7 +24,7 @@ interface Twig_NodeVisitorInterface
*
* @return Twig_NodeInterface The modified node
*/
- function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
+ public function enterNode(Twig_NodeInterface $node, Twig_Environment $env);
/**
* Called after child nodes are visited.
@@ -33,16 +32,16 @@ interface Twig_NodeVisitorInterface
* @param Twig_NodeInterface $node The node to visit
* @param Twig_Environment $env The Twig environment instance
*
- * @return Twig_NodeInterface The modified node
+ * @return Twig_NodeInterface|false The modified node or false if the node must be removed
*/
- function leaveNode(Twig_NodeInterface $node, Twig_Environment $env);
+ 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 integer The priority level
+ * @return int The priority level
*/
- function getPriority();
+ public function getPriority();
}
diff --git a/main/inc/lib/symfony/Twig/Parser.php b/vendor/twig/twig/lib/Twig/Parser.php
old mode 100755
new mode 100644
similarity index 76%
rename from main/inc/lib/symfony/Twig/Parser.php
rename to vendor/twig/twig/lib/Twig/Parser.php
index 72d3637f5c..549ce2bdf4
--- a/main/inc/lib/symfony/Twig/Parser.php
+++ b/vendor/twig/twig/lib/Twig/Parser.php
@@ -13,8 +13,7 @@
/**
* Default parser implementation.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Parser implements Twig_ParserInterface
{
@@ -29,9 +28,9 @@ class Twig_Parser implements Twig_ParserInterface
protected $macros;
protected $env;
protected $reservedMacroNames;
- protected $importedFunctions;
- protected $tmpVarCount;
+ protected $importedSymbols;
protected $traits;
+ protected $embeddedTemplates = array();
/**
* Constructor.
@@ -50,25 +49,24 @@ class Twig_Parser implements Twig_ParserInterface
public function getVarName()
{
- return sprintf('__internal_%s_%d', substr($this->env->getTemplateClass($this->stream->getFilename()), strlen($this->env->getTemplateClassPrefix())), ++$this->tmpVarCount);
+ return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
+ }
+
+ public function getFilename()
+ {
+ return $this->stream->getFilename();
}
/**
- * Converts a token stream to a node tree.
- *
- * @param Twig_TokenStream $stream A token stream instance
- *
- * @return Twig_Node_Module A node tree
+ * {@inheritdoc}
*/
- public function parse(Twig_TokenStream $stream)
+ public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false)
{
// push all variables into the stack to keep the current state of the parser
$vars = get_object_vars($this);
unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser']);
$this->stack[] = $vars;
- $this->tmpVarCount = 0;
-
// tag handlers
if (null === $this->handlers) {
$this->handlers = $this->env->getTokenParsers();
@@ -90,10 +88,11 @@ class Twig_Parser implements Twig_ParserInterface
$this->macros = array();
$this->traits = array();
$this->blockStack = array();
- $this->importedFunctions = array(array());
+ $this->importedSymbols = array(array());
+ $this->embeddedTemplates = array();
try {
- $body = $this->subparse(null);
+ $body = $this->subparse($test, $dropNeedle);
if (null !== $this->parent) {
if (null === $body = $this->filterBodyNodes($body)) {
@@ -101,14 +100,18 @@ class Twig_Parser implements Twig_ParserInterface
}
}
} catch (Twig_Error_Syntax $e) {
- if (null === $e->getTemplateFile()) {
- $e->setTemplateFile($this->stream->getFilename());
+ if (!$e->getTemplateFile()) {
+ $e->setTemplateFile($this->getFilename());
+ }
+
+ 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->stream->getFilename());
+ $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, $this->getFilename());
$traverser = new Twig_NodeTraverser($this->env, $this->visitors);
@@ -145,7 +148,7 @@ class Twig_Parser implements Twig_ParserInterface
$token = $this->getCurrentToken();
if ($token->getType() !== Twig_Token::NAME_TYPE) {
- throw new Twig_Error_Syntax('A block must start with a tag name', $token->getLine(), $this->stream->getFilename());
+ throw new Twig_Error_Syntax('A block must start with a tag name', $token->getLine(), $this->getFilename());
}
if (null !== $test && call_user_func($test, $token)) {
@@ -163,7 +166,12 @@ class Twig_Parser implements Twig_ParserInterface
$subparser = $this->handlers->getTokenParser($token->getValue());
if (null === $subparser) {
if (null !== $test) {
- throw new Twig_Error_Syntax(sprintf('Unexpected tag name "%s" (expecting closing tag for the "%s" tag defined near line %s)', $token->getValue(), $test[0]->getTag(), $lineno), $token->getLine(), $this->stream->getFilename());
+ $error = sprintf('Unexpected tag name "%s"', $token->getValue());
+ if (is_array($test) && isset($test[0]) && $test[0] instanceof Twig_TokenParserInterface) {
+ $error .= sprintf(' (expecting closing tag for the "%s" tag defined near line %s)', $test[0]->getTag(), $lineno);
+ }
+
+ throw new Twig_Error_Syntax($error, $token->getLine(), $this->getFilename());
}
$message = sprintf('Unknown tag name "%s"', $token->getValue());
@@ -171,7 +179,7 @@ class Twig_Parser implements Twig_ParserInterface
$message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
}
- throw new Twig_Error_Syntax($message, $token->getLine(), $this->stream->getFilename());
+ throw new Twig_Error_Syntax($message, $token->getLine(), $this->getFilename());
}
$this->stream->next();
@@ -183,7 +191,7 @@ class Twig_Parser implements Twig_ParserInterface
break;
default:
- throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', -1, $this->stream->getFilename());
+ throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', 0, $this->getFilename());
}
}
@@ -229,9 +237,14 @@ class Twig_Parser implements Twig_ParserInterface
return isset($this->blocks[$name]);
}
- public function setBlock($name, $value)
+ public function getBlock($name)
{
- $this->blocks[$name] = new Twig_Node_Body(array($value));
+ return $this->blocks[$name];
+ }
+
+ public function setBlock($name, Twig_Node_Block $value)
+ {
+ $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getLine());
}
public function hasMacro($name)
@@ -250,7 +263,7 @@ class Twig_Parser implements Twig_ParserInterface
}
if (in_array($name, $this->reservedMacroNames)) {
- throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword', $name), $node->getLine());
+ throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword', $name), $node->getLine(), $this->getFilename());
}
$this->macros[$name] = $node;
@@ -266,33 +279,40 @@ class Twig_Parser implements Twig_ParserInterface
return count($this->traits) > 0;
}
- public function addImportedFunction($alias, $name, Twig_Node_Expression $node)
+ 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->importedFunctions[0][$alias] = array('name' => $name, 'node' => $node);
+ $this->importedSymbols[0][$type][$alias] = array('name' => $name, 'node' => $node);
}
- public function getImportedFunction($alias)
+ public function getImportedSymbol($type, $alias)
{
- foreach ($this->importedFunctions as $functions) {
- if (isset($functions[$alias])) {
- return $functions[$alias];
+ foreach ($this->importedSymbols as $functions) {
+ if (isset($functions[$type][$alias])) {
+ return $functions[$type][$alias];
}
}
}
public function isMainScope()
{
- return 1 === count($this->importedFunctions);
+ return 1 === count($this->importedSymbols);
}
public function pushLocalScope()
{
- array_unshift($this->importedFunctions, array());
+ array_unshift($this->importedSymbols, array());
}
public function popLocalScope()
{
- array_shift($this->importedFunctions);
+ array_shift($this->importedSymbols);
}
/**
@@ -344,10 +364,10 @@ class Twig_Parser implements Twig_ParserInterface
(!$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 have a body but a byte order mark (BOM) has been detected; it must be removed.', $node->getLine(), $this->stream->getFilename());
- } else {
- throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->stream->getFilename());
+ throw new Twig_Error_Syntax('A template that extends another one cannot have a body but a byte order mark (BOM) has been detected; it must be removed.', $node->getLine(), $this->getFilename());
}
+
+ throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->getFilename());
}
// bypass "set" nodes as they "capture" the output
@@ -360,7 +380,7 @@ class Twig_Parser implements Twig_ParserInterface
}
foreach ($node as $k => $n) {
- if (null !== $n && null === $n = $this->filterBodyNodes($n)) {
+ if (null !== $n && null === $this->filterBodyNodes($n)) {
$node->removeNode($k);
}
}
diff --git a/main/inc/lib/symfony/Twig/ParserInterface.php b/vendor/twig/twig/lib/Twig/ParserInterface.php
old mode 100755
new mode 100644
similarity index 56%
rename from main/inc/lib/symfony/Twig/ParserInterface.php
rename to vendor/twig/twig/lib/Twig/ParserInterface.php
index 4cb6d28a17..8e7cc0a85c
--- a/main/inc/lib/symfony/Twig/ParserInterface.php
+++ b/vendor/twig/twig/lib/Twig/ParserInterface.php
@@ -12,17 +12,20 @@
/**
* Interface implemented by parser classes.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ *
+ * @deprecated since 1.12 (to be removed in 3.0)
*/
interface Twig_ParserInterface
{
/**
* Converts a token stream to a node tree.
*
- * @param Twig_TokenStream $stream A token stream instance
+ * @param Twig_TokenStream $stream A token stream instance
*
* @return Twig_Node_Module A node tree
+ *
+ * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
*/
- function parse(Twig_TokenStream $stream);
+ public function parse(Twig_TokenStream $stream);
}
diff --git a/main/inc/lib/symfony/Twig/Sandbox/SecurityError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
old mode 100755
new mode 100644
similarity index 82%
rename from main/inc/lib/symfony/Twig/Sandbox/SecurityError.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
index debabb7964..015bfaea22
--- a/main/inc/lib/symfony/Twig/Sandbox/SecurityError.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
@@ -12,8 +12,7 @@
/**
* Exception thrown when a security error occurs at runtime.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Sandbox_SecurityError extends Twig_Error
{
diff --git a/main/inc/lib/symfony/Twig/Sandbox/SecurityPolicy.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
old mode 100755
new mode 100644
similarity index 98%
rename from main/inc/lib/symfony/Twig/Sandbox/SecurityPolicy.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
index ba912ef4af..66ee233200
--- a/main/inc/lib/symfony/Twig/Sandbox/SecurityPolicy.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
@@ -12,8 +12,7 @@
/**
* Represents a security policy which need to be enforced when sandbox mode is enabled.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface
{
diff --git a/main/inc/lib/symfony/Twig/Sandbox/SecurityPolicyInterface.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
old mode 100755
new mode 100644
similarity index 59%
rename from main/inc/lib/symfony/Twig/Sandbox/SecurityPolicyInterface.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
index d5015affdb..6ab48e3cc9
--- a/main/inc/lib/symfony/Twig/Sandbox/SecurityPolicyInterface.php
+++ b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
@@ -12,14 +12,13 @@
/**
* Interfaces that all security policy classes must implements.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_Sandbox_SecurityPolicyInterface
{
- function checkSecurity($tags, $filters, $functions);
+ public function checkSecurity($tags, $filters, $functions);
- function checkMethodAllowed($obj, $method);
+ public function checkMethodAllowed($obj, $method);
- function checkPropertyAllowed($obj, $method);
+ public function checkPropertyAllowed($obj, $method);
}
diff --git a/vendor/twig/twig/lib/Twig/SimpleFilter.php b/vendor/twig/twig/lib/Twig/SimpleFilter.php
new file mode 100644
index 0000000000..d35c563346
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/SimpleFilter.php
@@ -0,0 +1,94 @@
+
+ */
+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_safe' => null,
+ 'is_safe_callback' => null,
+ 'pre_escape' => null,
+ 'preserves_safety' => null,
+ 'node_class' => 'Twig_Node_Expression_Filter',
+ ), $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'];
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/SimpleFunction.php b/vendor/twig/twig/lib/Twig/SimpleFunction.php
new file mode 100644
index 0000000000..8ef6aca2ff
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/SimpleFunction.php
@@ -0,0 +1,84 @@
+
+ */
+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_safe' => null,
+ 'is_safe_callback' => null,
+ 'node_class' => 'Twig_Node_Expression_Function',
+ ), $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();
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/SimpleTest.php b/vendor/twig/twig/lib/Twig/SimpleTest.php
new file mode 100644
index 0000000000..225459c9f1
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/SimpleTest.php
@@ -0,0 +1,46 @@
+
+ */
+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(
+ 'node_class' => 'Twig_Node_Expression_Test',
+ ), $options);
+ }
+
+ public function getName()
+ {
+ return $this->name;
+ }
+
+ public function getCallable()
+ {
+ return $this->callable;
+ }
+
+ public function getNodeClass()
+ {
+ return $this->options['node_class'];
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
old mode 100755
new mode 100644
similarity index 67%
rename from main/inc/lib/symfony/Twig/Template.php
rename to vendor/twig/twig/lib/Twig/Template.php
index 1862064e82..1e23e8b4fb
--- a/main/inc/lib/symfony/Twig/Template.php
+++ b/vendor/twig/twig/lib/Twig/Template.php
@@ -13,12 +13,11 @@
/**
* Default base class for compiled templates.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
abstract class Twig_Template implements Twig_TemplateInterface
{
- static protected $cache = array();
+ protected static $cache = array();
protected $parent;
protected $parents;
@@ -106,9 +105,9 @@ abstract class Twig_Template implements Twig_TemplateInterface
$name = (string) $name;
if (isset($this->traits[$name])) {
- $this->traits[$name][0]->displayBlock($name, $context, $blocks);
+ $this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
} elseif (false !== $parent = $this->getParent($context)) {
- $parent->displayBlock($name, $context, $blocks);
+ $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->getTemplateName());
}
@@ -120,22 +119,36 @@ abstract class Twig_Template implements Twig_TemplateInterface
* 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 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
*/
- public function displayBlock($name, array $context, array $blocks = array())
+ public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
{
$name = (string) $name;
- if (isset($blocks[$name])) {
- $b = $blocks;
- unset($b[$name]);
- call_user_func($blocks[$name], $context, $b);
+ if ($useBlocks && isset($blocks[$name])) {
+ $template = $blocks[$name][0];
+ $block = $blocks[$name][1];
} elseif (isset($this->blocks[$name])) {
- call_user_func($this->blocks[$name], $context, $blocks);
+ $template = $this->blocks[$name][0];
+ $block = $this->blocks[$name][1];
+ } else {
+ $template = null;
+ $block = null;
+ }
+
+ if (null !== $template) {
+ try {
+ $template->$block($context, $blocks);
+ } catch (Twig_Error $e) {
+ 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->getTemplateName(), $e);
+ }
} elseif (false !== $parent = $this->getParent($context)) {
- $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks));
+ $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
}
}
@@ -165,16 +178,17 @@ abstract class Twig_Template implements Twig_TemplateInterface
* 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 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
*/
- public function renderBlock($name, array $context, array $blocks = array())
+ public function renderBlock($name, array $context, array $blocks = array(), $useBlocks = true)
{
ob_start();
- $this->displayBlock($name, $context, $blocks);
+ $this->displayBlock($name, $context, $blocks, $useBlocks);
return ob_get_clean();
}
@@ -194,7 +208,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
*
* @param string $name The block name
*
- * @return Boolean true if the block exists, false otherwise
+ * @return bool true if the block exists, false otherwise
*/
public function hasBlock($name)
{
@@ -236,7 +250,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
*/
public function display(array $context, array $blocks = array())
{
- $this->displayWithErrorHandling($this->mergeContextWithGlobals($context), $blocks);
+ $this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
}
/**
@@ -259,27 +273,25 @@ abstract class Twig_Template implements Twig_TemplateInterface
return ob_get_clean();
}
- protected function mergeContextWithGlobals(array $context)
- {
- // we don't use array_merge as the context being generally
- // bigger than globals, this code is faster.
- foreach ($this->env->getGlobals() as $key => $value) {
- if (!array_key_exists($key, $context)) {
- $context[$key] = $value;
- }
- }
-
- return $context;
- }
-
protected function displayWithErrorHandling(array $context, array $blocks = array())
{
try {
$this->doDisplay($context, $blocks);
} catch (Twig_Error $e) {
+ if (!$e->getTemplateFile()) {
+ $e->setTemplateFile($this->getTemplateName());
+ }
+
+ // 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, null, $e);
+ throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
}
}
@@ -297,14 +309,14 @@ abstract class Twig_Template implements Twig_TemplateInterface
* This method is for internal use only and should never be called
* directly.
*
- * This method should not be overriden in a sub-class as this is an
+ * 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 Boolean $ignoreStrictCheck Whether to ignore the strict variable check or not
+ * @param bool $ignoreStrictCheck Whether to ignore the strict variable check or not
*
* @return The content of the context variable
*
@@ -314,10 +326,10 @@ abstract class Twig_Template implements Twig_TemplateInterface
{
if (!array_key_exists($item, $context)) {
if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
+ return;
}
- throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item));
+ throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item), -1, $this->getTemplateName());
}
return $context[$item];
@@ -329,45 +341,52 @@ abstract class Twig_Template implements Twig_TemplateInterface
* @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_TemplateInterface)
- * @param Boolean $isDefinedTest Whether this is only a defined check
- * @param Boolean $ignoreStrictCheck Whether to ignore the strict attribute check or not
+ * @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
*/
- protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_TemplateInterface::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
+ protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_Template::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
{
- $item = (string) $item;
-
// array
- if (Twig_TemplateInterface::METHOD_CALL !== $type) {
- if ((is_array($object) && array_key_exists($item, $object))
- || ($object instanceof ArrayAccess && isset($object[$item]))
+ if (Twig_Template::METHOD_CALL !== $type) {
+ $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
+
+ if ((is_array($object) && array_key_exists($arrayItem, $object))
+ || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
) {
if ($isDefinedTest) {
return true;
}
- return $object[$item];
+ return $object[$arrayItem];
}
- if (Twig_TemplateInterface::ARRAY_CALL === $type) {
+ if (Twig_Template::ARRAY_CALL === $type || !is_object($object)) {
if ($isDefinedTest) {
return false;
}
if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
+ return;
}
- if (is_object($object)) {
- throw new Twig_Error_Runtime(sprintf('Key "%s" in object (with ArrayAccess) of type "%s" does not exist', $item, get_class($object)));
- // array
+ 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)) {
+ $message = sprintf('Key "%s" for array with keys "%s" does not exist', $arrayItem, implode(', ', array_keys($object)));
+ } elseif (Twig_Template::ARRAY_CALL === $type) {
+ $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
} else {
- throw new Twig_Error_Runtime(sprintf('Key "%s" for array with keys "%s" does not exist', $item, implode(', ', array_keys($object))));
+ $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->getTemplateName());
}
}
@@ -377,25 +396,15 @@ abstract class Twig_Template implements Twig_TemplateInterface
}
if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
+ return;
}
- throw new Twig_Error_Runtime(sprintf('Item "%s" for "%s" does not exist', $item, is_array($object) ? 'Array' : $object));
+ throw new Twig_Error_Runtime(sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s")', $item, gettype($object), $object), -1, $this->getTemplateName());
}
- $class = get_class($object);
-
// object property
- if (Twig_TemplateInterface::METHOD_CALL !== $type) {
- /* apparently, this is not needed as this is already covered by the array_key_exists() call below
- if (!isset(self::$cache[$class]['properties'])) {
- foreach (get_object_vars($object) as $k => $v) {
- self::$cache[$class]['properties'][$k] = true;
- }
- }
- */
-
- if (isset($object->$item) || array_key_exists($item, $object)) {
+ if (Twig_Template::METHOD_CALL !== $type) {
+ if (isset($object->$item) || array_key_exists((string) $item, $object)) {
if ($isDefinedTest) {
return true;
}
@@ -408,30 +417,34 @@ abstract class Twig_Template implements Twig_TemplateInterface
}
}
+ $class = get_class($object);
+
// object method
if (!isset(self::$cache[$class]['methods'])) {
self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object)));
}
+ $call = false;
$lcItem = strtolower($item);
if (isset(self::$cache[$class]['methods'][$lcItem])) {
- $method = $item;
+ $method = (string) $item;
} elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
$method = 'get'.$item;
} elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
$method = 'is'.$item;
} elseif (isset(self::$cache[$class]['methods']['__call'])) {
- $method = $item;
+ $method = (string) $item;
+ $call = true;
} else {
if ($isDefinedTest) {
return false;
}
if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
- return null;
+ return;
}
- throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)));
+ throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)), -1, $this->getTemplateName());
}
if ($isDefinedTest) {
@@ -442,9 +455,19 @@ abstract class Twig_Template implements Twig_TemplateInterface
$this->env->getExtension('sandbox')->checkMethodAllowed($object, $method);
}
- $ret = call_user_func_array(array($object, $method), $arguments);
+ // 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 {
+ $ret = call_user_func_array(array($object, $method), $arguments);
+ } catch (BadMethodCallException $e) {
+ if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
+ return;
+ }
+ throw $e;
+ }
- // hack to be removed when macro calls are refactored
+ // useful when calling a template method from a template
+ // this is not supported but unfortunately heavily used in the Symfony profiler
if ($object instanceof Twig_TemplateInterface) {
return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
}
@@ -455,7 +478,7 @@ abstract class Twig_Template implements Twig_TemplateInterface
/**
* This method is only useful when testing Twig. Do not use it.
*/
- static public function clearCache()
+ public static function clearCache()
{
self::$cache = array();
}
diff --git a/main/inc/lib/symfony/Twig/TemplateInterface.php b/vendor/twig/twig/lib/Twig/TemplateInterface.php
old mode 100755
new mode 100644
similarity index 79%
rename from main/inc/lib/symfony/Twig/TemplateInterface.php
rename to vendor/twig/twig/lib/Twig/TemplateInterface.php
index 08da116389..d178832eb7
--- a/main/inc/lib/symfony/Twig/TemplateInterface.php
+++ b/vendor/twig/twig/lib/Twig/TemplateInterface.php
@@ -12,8 +12,9 @@
/**
* Interface implemented by all compiled templates.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ *
+ * @deprecated since 1.12 (to be removed in 3.0)
*/
interface Twig_TemplateInterface
{
@@ -28,7 +29,7 @@ interface Twig_TemplateInterface
*
* @return string The rendered template
*/
- function render(array $context);
+ public function render(array $context);
/**
* Displays the template with the given context.
@@ -36,12 +37,12 @@ interface Twig_TemplateInterface
* @param array $context An array of parameters to pass to the template
* @param array $blocks An array of blocks to pass to the template
*/
- function display(array $context, array $blocks = array());
+ public function display(array $context, array $blocks = array());
/**
* Returns the bound environment for this template.
*
* @return Twig_Environment The current environment
*/
- function getEnvironment();
+ public function getEnvironment();
}
diff --git a/vendor/twig/twig/lib/Twig/Test.php b/vendor/twig/twig/lib/Twig/Test.php
new file mode 100644
index 0000000000..3baff88560
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Test.php
@@ -0,0 +1,34 @@
+
+ * @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/main/inc/lib/symfony/Twig/Test/Function.php b/vendor/twig/twig/lib/Twig/Test/Function.php
old mode 100755
new mode 100644
similarity index 58%
rename from main/inc/lib/symfony/Twig/Test/Function.php
rename to vendor/twig/twig/lib/Twig/Test/Function.php
index 1240a0f12d..4be6b9b924
--- a/main/inc/lib/symfony/Twig/Test/Function.php
+++ b/vendor/twig/twig/lib/Twig/Test/Function.php
@@ -12,15 +12,19 @@
/**
* Represents a function template test.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-class Twig_Test_Function implements Twig_TestInterface
+class Twig_Test_Function extends Twig_Test
{
protected $function;
- public function __construct($function)
+ public function __construct($function, array $options = array())
{
+ $options['callable'] = $function;
+
+ parent::__construct($options);
+
$this->function = $function;
}
diff --git a/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
new file mode 100644
index 0000000000..724f094178
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
@@ -0,0 +1,154 @@
+
+ * @author Karma Dordrak
+ */
+abstract class Twig_Test_IntegrationTestCase extends PHPUnit_Framework_TestCase
+{
+ abstract protected function getExtensions();
+ abstract protected function getFixturesDir();
+
+ /**
+ * @dataProvider getTests
+ */
+ public function testIntegration($file, $message, $condition, $templates, $exception, $outputs)
+ {
+ $this->doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs);
+ }
+
+ public function getTests()
+ {
+ $fixturesDir = realpath($this->getFixturesDir());
+ $tests = array();
+
+ foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($fixturesDir), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+ if (!preg_match('/\.test$/', $file)) {
+ 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 = $this->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 = $this->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);
+ }
+
+ return $tests;
+ }
+
+ protected function doIntegrationTest($file, $message, $condition, $templates, $exception, $outputs)
+ {
+ if ($condition) {
+ eval('$ret = '.$condition.';');
+ if (!$ret) {
+ $this->markTestSkipped($condition);
+ }
+ }
+
+ $loader = new Twig_Loader_Array($templates);
+
+ foreach ($outputs as $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->getExtensions() as $extension) {
+ $twig->addExtension($extension);
+ }
+
+ try {
+ $template = $twig->loadTemplate('index.twig');
+ } catch (Exception $e) {
+ if (false !== $exception) {
+ $this->assertEquals(trim($exception), trim(sprintf('%s: %s', get_class($e), $e->getMessage())));
+
+ return;
+ }
+
+ if ($e instanceof Twig_Error_Syntax) {
+ $e->setTemplateFile($file);
+
+ throw $e;
+ }
+
+ 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->assertEquals(trim($exception), trim(sprintf('%s: %s', get_class($e), $e->getMessage())));
+
+ return;
+ }
+
+ if ($e instanceof Twig_Error_Syntax) {
+ $e->setTemplateFile($file);
+ } else {
+ $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);
+ $this->assertThat(NULL, new PHPUnit_Framework_Constraint_Exception($class));
+ }
+
+ $expected = trim($match[3], "\n ");
+
+ if ($expected != $output) {
+ echo 'Compiled template that failed:';
+
+ foreach (array_keys($templates) as $name) {
+ echo "Template: $name\n";
+ $source = $loader->getSource($name);
+ echo $twig->compile($twig->parse($twig->tokenize($source, $name)));
+ }
+ }
+ $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;
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/Test/Method.php b/vendor/twig/twig/lib/Twig/Test/Method.php
old mode 100755
new mode 100644
similarity index 63%
rename from main/inc/lib/symfony/Twig/Test/Method.php
rename to vendor/twig/twig/lib/Twig/Test/Method.php
index a3b394834b..17c6c041d6
--- a/main/inc/lib/symfony/Twig/Test/Method.php
+++ b/vendor/twig/twig/lib/Twig/Test/Method.php
@@ -12,15 +12,20 @@
/**
* Represents a method template test.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-class Twig_Test_Method implements Twig_TestInterface
+class Twig_Test_Method extends Twig_Test
{
- protected $extension, $method;
+ protected $extension;
+ protected $method;
- public function __construct(Twig_ExtensionInterface $extension, $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;
}
diff --git a/main/inc/lib/symfony/Twig/Test/Node.php b/vendor/twig/twig/lib/Twig/Test/Node.php
old mode 100755
new mode 100644
similarity index 64%
rename from main/inc/lib/symfony/Twig/Test/Node.php
rename to vendor/twig/twig/lib/Twig/Test/Node.php
index 47a978e38d..c832a57bf4
--- a/main/inc/lib/symfony/Twig/Test/Node.php
+++ b/vendor/twig/twig/lib/Twig/Test/Node.php
@@ -12,15 +12,17 @@
/**
* Represents a template test as a Node.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
-class Twig_Test_Node implements Twig_TestInterface
+class Twig_Test_Node extends Twig_Test
{
protected $class;
- public function __construct($class)
+ public function __construct($class, array $options = array())
{
+ parent::__construct($options);
+
$this->class = $class;
}
diff --git a/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
new file mode 100644
index 0000000000..b15c85ffd7
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
@@ -0,0 +1,58 @@
+assertNodeCompilation($source, $node, $environment);
+ }
+
+ public function assertNodeCompilation($source, Twig_Node $node, Twig_Environment $environment = null)
+ {
+ $compiler = $this->getCompiler($environment);
+ $compiler->compile($node);
+
+ $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();
+ }
+
+ protected function getVariableGetter($name)
+ {
+ if (version_compare(phpversion(), '5.4.0RC1', '>=')) {
+ return sprintf('(isset($context["%s"]) ? $context["%s"] : null)', $name, $name);
+ }
+
+ return sprintf('$this->getContext($context, "%s")', $name);
+ }
+
+ protected function getAttributeGetter()
+ {
+ if (function_exists('twig_template_get_attributes')) {
+ return 'twig_template_get_attributes($this, ';
+ }
+
+ return '$this->getAttribute(';
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/vendor/twig/twig/lib/Twig/TestCallableInterface.php
new file mode 100644
index 0000000000..0db43682d0
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/TestCallableInterface.php
@@ -0,0 +1,21 @@
+
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+interface Twig_TestCallableInterface
+{
+ public function getCallable();
+}
diff --git a/main/inc/lib/symfony/Twig/TestInterface.php b/vendor/twig/twig/lib/Twig/TestInterface.php
old mode 100755
new mode 100644
similarity index 74%
rename from main/inc/lib/symfony/Twig/TestInterface.php
rename to vendor/twig/twig/lib/Twig/TestInterface.php
index c2ff725838..30d8a2c4f0
--- a/main/inc/lib/symfony/Twig/TestInterface.php
+++ b/vendor/twig/twig/lib/Twig/TestInterface.php
@@ -12,8 +12,8 @@
/**
* Represents a template test.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
interface Twig_TestInterface
{
@@ -22,5 +22,5 @@ interface Twig_TestInterface
*
* @return string The PHP code for the test
*/
- function compile();
+ public function compile();
}
diff --git a/main/inc/lib/symfony/Twig/Token.php b/vendor/twig/twig/lib/Twig/Token.php
old mode 100755
new mode 100644
similarity index 84%
rename from main/inc/lib/symfony/Twig/Token.php
rename to vendor/twig/twig/lib/Twig/Token.php
index 918bb918ed..599f9f565d
--- a/main/inc/lib/symfony/Twig/Token.php
+++ b/vendor/twig/twig/lib/Twig/Token.php
@@ -13,8 +13,7 @@
/**
* Represents a Token.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_Token
{
@@ -39,9 +38,9 @@ class Twig_Token
/**
* Constructor.
*
- * @param integer $type The type of the token
+ * @param int $type The type of the token
* @param string $value The token value
- * @param integer $lineno The line position in the source
+ * @param int $lineno The line position in the source
*/
public function __construct($type, $value, $lineno)
{
@@ -57,7 +56,7 @@ class Twig_Token
*/
public function __toString()
{
- return sprintf('%s(%s)', self::typeToString($this->type, true, $this->lineno), $this->value);
+ return sprintf('%s(%s)', self::typeToString($this->type, true), $this->value);
}
/**
@@ -68,10 +67,10 @@ class Twig_Token
* * type and value (or array of possible values)
* * just value (or array of possible values) (NAME_TYPE is used as type)
*
- * @param array|integer $type The type to test
+ * @param array|int $type The type to test
* @param array|string|null $values The token value
*
- * @return Boolean
+ * @return bool
*/
public function test($type, $values = null)
{
@@ -90,7 +89,7 @@ class Twig_Token
/**
* Gets the line.
*
- * @return integer The source line
+ * @return int The source line
*/
public function getLine()
{
@@ -100,7 +99,7 @@ class Twig_Token
/**
* Gets the token type.
*
- * @return integer The token type
+ * @return int The token type
*/
public function getType()
{
@@ -120,13 +119,12 @@ class Twig_Token
/**
* Returns the constant representation (internal) of a given type.
*
- * @param integer $type The type as an integer
- * @param Boolean $short Whether to return a short representation or not
- * @param integer $line The code line
+ * @param int $type The type as an integer
+ * @param bool $short Whether to return a short representation or not
*
* @return string The string representation
*/
- static public function typeToString($type, $short = false, $line = -1)
+ public static function typeToString($type, $short = false)
{
switch ($type) {
case self::EOF_TYPE:
@@ -169,7 +167,7 @@ class Twig_Token
$name = 'INTERPOLATION_END_TYPE';
break;
default:
- throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line);
+ throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
}
return $short ? $name : 'Twig_Token::'.$name;
@@ -178,12 +176,11 @@ class Twig_Token
/**
* Returns the english representation of a given type.
*
- * @param integer $type The type as an integer
- * @param integer $line The code line
+ * @param int $type The type as an integer
*
* @return string The string representation
*/
- static public function typeToEnglish($type, $line = -1)
+ public static function typeToEnglish($type)
{
switch ($type) {
case self::EOF_TYPE:
@@ -213,7 +210,7 @@ class Twig_Token
case self::INTERPOLATION_END_TYPE:
return 'end of string interpolation';
default:
- throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line);
+ throw new LogicException(sprintf('Token of type "%s" does not exist.', $type));
}
}
}
diff --git a/main/inc/lib/symfony/Twig/TokenParser.php b/vendor/twig/twig/lib/Twig/TokenParser.php
old mode 100755
new mode 100644
similarity index 90%
rename from main/inc/lib/symfony/Twig/TokenParser.php
rename to vendor/twig/twig/lib/Twig/TokenParser.php
index ab18bfae16..decebd5eea
--- a/main/inc/lib/symfony/Twig/TokenParser.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser.php
@@ -12,8 +12,7 @@
/**
* Base class for all token parsers.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
abstract class Twig_TokenParser implements Twig_TokenParserInterface
{
diff --git a/main/inc/lib/symfony/Twig/TokenParser/AutoEscape.php b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
old mode 100755
new mode 100644
similarity index 57%
rename from main/inc/lib/symfony/Twig/TokenParser/AutoEscape.php
rename to vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
index 880e66469a..2756028839
--- a/main/inc/lib/symfony/Twig/TokenParser/AutoEscape.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
@@ -39,23 +39,35 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser
public function parse(Twig_Token $token)
{
$lineno = $token->getLine();
- $value = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
- if (!in_array($value, array('true', 'false'))) {
- throw new Twig_Error_Syntax("Autoescape value must be 'true' or 'false'", $lineno);
- }
- $value = 'true' === $value ? 'html' : false;
+ $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 Boolean.', $stream->getCurrent()->getLine(), $stream->getFilename());
+ }
+ $value = $expr->getAttribute('value');
- if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE)) {
- if (false === $value) {
- throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $lineno);
+ $compat = true === $value || false === $value;
+
+ if (true === $value) {
+ $value = 'html';
}
- $value = $this->parser->getStream()->next()->getValue();
+ if ($compat && $stream->test(Twig_Token::NAME_TYPE)) {
+ if (false === $value) {
+ throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $stream->getCurrent()->getLine(), $stream->getFilename());
+ }
+
+ $value = $stream->next()->getValue();
+ }
}
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag());
}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Block.php b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
old mode 100755
new mode 100644
similarity index 75%
rename from main/inc/lib/symfony/Twig/TokenParser/Block.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Block.php
index 36643f74d5..81e6b1cffd
--- a/main/inc/lib/symfony/Twig/TokenParser/Block.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
@@ -35,20 +35,19 @@ class Twig_TokenParser_Block extends Twig_TokenParser
$stream = $this->parser->getStream();
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
if ($this->parser->hasBlock($name)) {
- throw new Twig_Error_Syntax("The block '$name' has already been defined", $lineno);
+ throw new Twig_Error_Syntax(sprintf("The block '$name' has already been defined line %d", $this->parser->getBlock($name)->getLine()), $stream->getCurrent()->getLine(), $stream->getFilename());
}
+ $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno));
$this->parser->pushLocalScope();
$this->parser->pushBlockStack($name);
- if ($stream->test(Twig_Token::BLOCK_END_TYPE)) {
- $stream->next();
-
+ if ($stream->nextIf(Twig_Token::BLOCK_END_TYPE)) {
$body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
- if ($stream->test(Twig_Token::NAME_TYPE)) {
- $value = $stream->next()->getValue();
+ if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
+ $value = $token->getValue();
if ($value != $name) {
- throw new Twig_Error_Syntax(sprintf("Expected endblock for block '$name' (but %s given)", $value), $lineno);
+ throw new Twig_Error_Syntax(sprintf("Expected endblock for block '$name' (but %s given)", $value), $stream->getCurrent()->getLine(), $stream->getFilename());
}
}
} else {
@@ -58,8 +57,7 @@ class Twig_TokenParser_Block extends Twig_TokenParser
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
- $block = new Twig_Node_Block($name, $body, $lineno);
- $this->parser->setBlock($name, $block);
+ $block->setNode('body', $body);
$this->parser->popBlockStack();
$this->parser->popLocalScope();
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Do.php b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
old mode 100755
new mode 100644
similarity index 93%
rename from main/inc/lib/symfony/Twig/TokenParser/Do.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Do.php
index 593d1c6dc1..f50939dd21
--- a/main/inc/lib/symfony/Twig/TokenParser/Do.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
@@ -10,7 +10,7 @@
*/
/**
- * Evaluates an expression, disgarding the returned value.
+ * Evaluates an expression, discarding the returned value.
*/
class Twig_TokenParser_Do extends Twig_TokenParser
{
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
new file mode 100644
index 0000000000..69cb5f35ff
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
@@ -0,0 +1,66 @@
+parser->getStream();
+
+ $parent = $this->parser->getExpressionParser()->parseExpression();
+
+ list($variables, $only, $ignoreMissing) = $this->parseArguments();
+
+ // 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()),
+ new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine()),
+ 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
+ $module->setNode('parent', $parent);
+
+ $this->parser->embedTemplate($module);
+
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+ return new Twig_Node_Embed($module->getAttribute('filename'), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+ }
+
+ public function decideBlockEnd(Twig_Token $token)
+ {
+ return $token->test('endembed');
+ }
+
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'embed';
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Extends.php b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
old mode 100755
new mode 100644
similarity index 91%
rename from main/inc/lib/symfony/Twig/TokenParser/Extends.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Extends.php
index 54f49ad3d7..f5ecee2140
--- a/main/inc/lib/symfony/Twig/TokenParser/Extends.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
@@ -29,17 +29,15 @@ class Twig_TokenParser_Extends extends Twig_TokenParser
public function parse(Twig_Token $token)
{
if (!$this->parser->isMainScope()) {
- throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine());
+ throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine(), $this->parser->getFilename());
}
if (null !== $this->parser->getParent()) {
- throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine());
+ throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine(), $this->parser->getFilename());
}
$this->parser->setParent($this->parser->getExpressionParser()->parseExpression());
$this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
-
- return null;
}
/**
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Filter.php b/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/TokenParser/Filter.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Filter.php
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Flush.php b/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/TokenParser/Flush.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Flush.php
diff --git a/vendor/twig/twig/lib/Twig/TokenParser/For.php b/vendor/twig/twig/lib/Twig/TokenParser/For.php
new file mode 100644
index 0000000000..5c07d6395b
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/TokenParser/For.php
@@ -0,0 +1,135 @@
+
+ *
+ * {% for user in users %}
+ * - {{ user.username|e }}
+ * {% endfor %}
+ *
+ *
+ */
+class Twig_TokenParser_For 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();
+ $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 ($stream->next()->getValue() == 'else') {
+ $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->getLine());
+ $valueTarget = $targets->getNode(1);
+ $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
+ } else {
+ $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno);
+ $valueTarget = $targets->getNode(0);
+ $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine());
+ }
+
+ 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->getLine(), $stream->getFilename());
+ }
+
+ 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->getLine(), $stream->getFilename());
+ }
+ }
+
+ // 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);
+ }
+ }
+
+ /**
+ * Gets the tag name associated with this token parser.
+ *
+ * @return string The tag name
+ */
+ public function getTag()
+ {
+ return 'for';
+ }
+}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/From.php b/vendor/twig/twig/lib/Twig/TokenParser/From.php
old mode 100755
new mode 100644
similarity index 83%
rename from main/inc/lib/symfony/Twig/TokenParser/From.php
rename to vendor/twig/twig/lib/Twig/TokenParser/From.php
index 4e20f5cea7..dd73f99089
--- a/main/inc/lib/symfony/Twig/TokenParser/From.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/From.php
@@ -36,27 +36,23 @@ class Twig_TokenParser_From extends Twig_TokenParser
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
$alias = $name;
- if ($stream->test('as')) {
- $stream->next();
-
+ if ($stream->nextIf('as')) {
$alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
}
$targets[$name] = $alias;
- if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+ if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
break;
}
-
- $stream->next();
} 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) {
- $this->parser->addImportedFunction($alias, 'get'.$name, $node->getNode('var'));
+ foreach ($targets as $name => $alias) {
+ $this->parser->addImportedSymbol('function', $alias, 'get'.$name, $node->getNode('var'));
}
return $node;
diff --git a/main/inc/lib/symfony/Twig/TokenParser/If.php b/vendor/twig/twig/lib/Twig/TokenParser/If.php
old mode 100755
new mode 100644
similarity index 84%
rename from main/inc/lib/symfony/Twig/TokenParser/If.php
rename to vendor/twig/twig/lib/Twig/TokenParser/If.php
index 1a694afde9..3d7d1f517f
--- a/main/inc/lib/symfony/Twig/TokenParser/If.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/If.php
@@ -36,22 +36,23 @@ class Twig_TokenParser_If extends Twig_TokenParser
{
$lineno = $token->getLine();
$expr = $this->parser->getExpressionParser()->parseExpression();
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $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 ($this->parser->getStream()->next()->getValue()) {
+ switch ($stream->next()->getValue()) {
case 'else':
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
$else = $this->parser->subparse(array($this, 'decideIfEnd'));
break;
case 'elseif':
$expr = $this->parser->getExpressionParser()->parseExpression();
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
$body = $this->parser->subparse(array($this, 'decideIfFork'));
$tests[] = $expr;
$tests[] = $body;
@@ -62,11 +63,11 @@ class Twig_TokenParser_If extends Twig_TokenParser
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), -1);
+ 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->getFilename());
}
}
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag());
}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Import.php b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
old mode 100755
new mode 100644
similarity index 93%
rename from main/inc/lib/symfony/Twig/TokenParser/Import.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Import.php
index 5219289d9e..e7050c70c6
--- a/main/inc/lib/symfony/Twig/TokenParser/Import.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
@@ -32,6 +32,8 @@ class Twig_TokenParser_Import extends Twig_TokenParser
$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());
}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Include.php b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
old mode 100755
new mode 100644
similarity index 70%
rename from main/inc/lib/symfony/Twig/TokenParser/Include.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Include.php
index 6725b8ffa7..9c3099a68d
--- a/main/inc/lib/symfony/Twig/TokenParser/Include.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
@@ -32,31 +32,35 @@ class Twig_TokenParser_Include extends Twig_TokenParser
{
$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 ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'ignore')) {
- $this->parser->getStream()->next();
- $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, 'missing');
+ if ($stream->nextIf(Twig_Token::NAME_TYPE, 'ignore')) {
+ $stream->expect(Twig_Token::NAME_TYPE, 'missing');
$ignoreMissing = true;
}
$variables = null;
- if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'with')) {
- $this->parser->getStream()->next();
-
+ if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) {
$variables = $this->parser->getExpressionParser()->parseExpression();
}
$only = false;
- if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'only')) {
- $this->parser->getStream()->next();
-
+ if ($stream->nextIf(Twig_Token::NAME_TYPE, 'only')) {
$only = true;
}
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
- return new Twig_Node_Include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
+ return array($variables, $only, $ignoreMissing);
}
/**
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Macro.php b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
old mode 100755
new mode 100644
similarity index 77%
rename from main/inc/lib/symfony/Twig/TokenParser/Macro.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Macro.php
index ffd5848757..87a299d821
--- a/main/inc/lib/symfony/Twig/TokenParser/Macro.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
@@ -30,26 +30,25 @@ class Twig_TokenParser_Macro extends Twig_TokenParser
public function parse(Twig_Token $token)
{
$lineno = $token->getLine();
- $name = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue();
+ $stream = $this->parser->getStream();
+ $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
- $arguments = $this->parser->getExpressionParser()->parseArguments();
+ $arguments = $this->parser->getExpressionParser()->parseArguments(true, true);
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $stream->expect(Twig_Token::BLOCK_END_TYPE);
$this->parser->pushLocalScope();
$body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
- if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE)) {
- $value = $this->parser->getStream()->next()->getValue();
+ if ($token = $stream->nextIf(Twig_Token::NAME_TYPE)) {
+ $value = $token->getValue();
if ($value != $name) {
- throw new Twig_Error_Syntax(sprintf("Expected endmacro for macro '$name' (but %s given)", $value), $lineno);
+ throw new Twig_Error_Syntax(sprintf("Expected endmacro for macro '$name' (but %s given)", $value), $stream->getCurrent()->getLine(), $stream->getFilename());
}
}
$this->parser->popLocalScope();
- $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE);
+ $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()));
-
- return null;
}
public function decideBlockEnd(Twig_Token $token)
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Sandbox.php b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
old mode 100755
new mode 100644
similarity index 71%
rename from main/inc/lib/symfony/Twig/TokenParser/Sandbox.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
index 0277c70c5f..9457325ab4
--- a/main/inc/lib/symfony/Twig/TokenParser/Sandbox.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
@@ -35,6 +35,19 @@ class Twig_TokenParser_Sandbox extends Twig_TokenParser
$body = $this->parser->subparse(array($this, 'decideBlockEnd'), true);
$this->parser->getStream()->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->getLine(), $this->parser->getFilename());
+ }
+ }
+ }
+
return new Twig_Node_Sandbox($body, $token->getLine(), $this->getTag());
}
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Set.php b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
old mode 100755
new mode 100644
similarity index 87%
rename from main/inc/lib/symfony/Twig/TokenParser/Set.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Set.php
index 3b4479c13b..84f7e94cb3
--- a/main/inc/lib/symfony/Twig/TokenParser/Set.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
@@ -42,20 +42,19 @@ class Twig_TokenParser_Set extends Twig_TokenParser
$names = $this->parser->getExpressionParser()->parseAssignmentExpression();
$capture = false;
- if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) {
- $stream->next();
+ 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 assignements.", $lineno);
+ throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignments.", $stream->getCurrent()->getLine(), $stream->getFilename());
}
} else {
$capture = true;
if (count($names) > 1) {
- throw new Twig_Error_Syntax("When using set with a block, you cannot have a multi-target.", $lineno);
+ throw new Twig_Error_Syntax("When using set with a block, you cannot have a multi-target.", $stream->getCurrent()->getLine(), $stream->getFilename());
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Spaceless.php b/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
old mode 100755
new mode 100644
similarity index 100%
rename from main/inc/lib/symfony/Twig/TokenParser/Spaceless.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
diff --git a/main/inc/lib/symfony/Twig/TokenParser/Use.php b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
old mode 100755
new mode 100644
similarity index 84%
rename from main/inc/lib/symfony/Twig/TokenParser/Use.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Use.php
index beafc8053f..3ea68b1a50
--- a/main/inc/lib/symfony/Twig/TokenParser/Use.php
+++ b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
@@ -35,42 +35,33 @@ 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.', $token->getLine());
+ throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $stream->getCurrent()->getLine(), $stream->getFilename());
}
- $stream = $this->parser->getStream();
-
$targets = array();
- if ($stream->test('with')) {
- $stream->next();
-
+ if ($stream->nextIf('with')) {
do {
$name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
$alias = $name;
- if ($stream->test('as')) {
- $stream->next();
-
+ if ($stream->nextIf('as')) {
$alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
}
$targets[$name] = new Twig_Node_Expression_Constant($alias, -1);
- if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
+ if (!$stream->nextIf(Twig_Token::PUNCTUATION_TYPE, ',')) {
break;
}
-
- $stream->next();
} while (true);
}
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
-
- return null;
}
/**
diff --git a/main/inc/lib/symfony/Twig/TokenParserBroker.php b/vendor/twig/twig/lib/Twig/TokenParserBroker.php
old mode 100755
new mode 100644
similarity index 73%
rename from main/inc/lib/symfony/Twig/TokenParserBroker.php
rename to vendor/twig/twig/lib/Twig/TokenParserBroker.php
index b214e99e30..ec3fba6748
--- a/main/inc/lib/symfony/Twig/TokenParserBroker.php
+++ b/vendor/twig/twig/lib/Twig/TokenParserBroker.php
@@ -13,8 +13,8 @@
/**
* Default implementation of a token parser broker.
*
- * @package twig
- * @author Arnaud Le Blanc
+ * @author Arnaud Le Blanc
+ * @deprecated since 1.12 (to be removed in 2.0)
*/
class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
{
@@ -32,13 +32,13 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
{
foreach ($parsers as $parser) {
if (!$parser instanceof Twig_TokenParserInterface) {
- throw new Twig_Error('$parsers must a an array of 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 Twig_Error('$brokers must a an array of Twig_TokenParserBrokerInterface');
+ throw new LogicException('$brokers must a an array of Twig_TokenParserBrokerInterface');
}
$this->brokers[] = $broker;
}
@@ -54,6 +54,19 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
$this->parsers[$parser->getTag()] = $parser;
}
+ /**
+ * Removes a TokenParser.
+ *
+ * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
+ */
+ public function removeTokenParser(Twig_TokenParserInterface $parser)
+ {
+ $name = $parser->getTag();
+ if (isset($this->parsers[$name]) && $parser === $this->parsers[$name]) {
+ unset($this->parsers[$name]);
+ }
+ }
+
/**
* Adds a TokenParserBroker.
*
@@ -64,6 +77,18 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
$this->brokers[] = $broker;
}
+ /**
+ * Removes a TokenParserBroker.
+ *
+ * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance
+ */
+ public function removeTokenParserBroker(Twig_TokenParserBroker $broker)
+ {
+ if (false !== $pos = array_search($broker, $this->brokers)) {
+ unset($this->brokers[$pos]);
+ }
+ }
+
/**
* Gets a suitable TokenParser for a tag.
*
@@ -86,8 +111,6 @@ class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface
}
$broker = prev($this->brokers);
}
-
- return null;
}
public function getParsers()
diff --git a/main/inc/lib/symfony/Twig/TokenParserBrokerInterface.php b/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
old mode 100755
new mode 100644
similarity index 77%
rename from main/inc/lib/symfony/Twig/TokenParserBrokerInterface.php
rename to vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
index 3ce8ca26c7..3f006e339b
--- a/main/inc/lib/symfony/Twig/TokenParserBrokerInterface.php
+++ b/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
@@ -15,31 +15,31 @@
*
* Token parser brokers allows to implement custom logic in the process of resolving a token parser for a given tag name.
*
- * @package twig
- * @author Arnaud Le Blanc
+ * @author Arnaud Le Blanc
+ * @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
+ * @param string $tag A tag name
*
* @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found
*/
- function getTokenParser($tag);
+ public function getTokenParser($tag);
/**
* Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of.
*
* @param Twig_ParserInterface $parser A Twig_ParserInterface interface
*/
- function setParser(Twig_ParserInterface $parser);
+ public function setParser(Twig_ParserInterface $parser);
/**
* Gets the Twig_ParserInterface.
*
- * @return null|Twig_ParserInterface A Twig_ParserInterface instance of null
+ * @return null|Twig_ParserInterface A Twig_ParserInterface instance or null
*/
- function getParser();
+ public function getParser();
}
diff --git a/main/inc/lib/symfony/Twig/TokenParserInterface.php b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
old mode 100755
new mode 100644
similarity index 77%
rename from main/inc/lib/symfony/Twig/TokenParserInterface.php
rename to vendor/twig/twig/lib/Twig/TokenParserInterface.php
index 192c0186db..31e8d5d5e3
--- a/main/inc/lib/symfony/Twig/TokenParserInterface.php
+++ b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
@@ -12,8 +12,7 @@
/**
* Interface implemented by token parsers.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
interface Twig_TokenParserInterface
{
@@ -22,7 +21,7 @@ interface Twig_TokenParserInterface
*
* @param $parser A Twig_Parser instance
*/
- function setParser(Twig_Parser $parser);
+ public function setParser(Twig_Parser $parser);
/**
* Parses a token and returns a node.
@@ -30,13 +29,15 @@ interface Twig_TokenParserInterface
* @param Twig_Token $token A Twig_Token instance
*
* @return Twig_NodeInterface A Twig_NodeInterface instance
+ *
+ * @throws Twig_Error_Syntax
*/
- function parse(Twig_Token $token);
+ public function parse(Twig_Token $token);
/**
* Gets the tag name associated with this token parser.
*
* @return string The tag name
*/
- function getTag();
+ public function getTag();
}
diff --git a/main/inc/lib/symfony/Twig/TokenStream.php b/vendor/twig/twig/lib/Twig/TokenStream.php
old mode 100755
new mode 100644
similarity index 74%
rename from main/inc/lib/symfony/Twig/TokenStream.php
rename to vendor/twig/twig/lib/Twig/TokenStream.php
index a2002b428a..44440daedd
--- a/main/inc/lib/symfony/Twig/TokenStream.php
+++ b/vendor/twig/twig/lib/Twig/TokenStream.php
@@ -13,8 +13,7 @@
/**
* Represents a token stream.
*
- * @package twig
- * @author Fabien Potencier
+ * @author Fabien Potencier
*/
class Twig_TokenStream
{
@@ -45,6 +44,11 @@ class Twig_TokenStream
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.
*
@@ -53,12 +57,24 @@ class Twig_TokenStream
public function next()
{
if (!isset($this->tokens[++$this->current])) {
- throw new Twig_Error_Syntax('Unexpected end of template', -1, $this->filename);
+ throw new Twig_Error_Syntax('Unexpected end of template', $this->tokens[$this->current - 1]->getLine(), $this->filename);
}
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.
*
@@ -71,8 +87,8 @@ class Twig_TokenStream
$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(), $line), $token->getValue(),
- Twig_Token::typeToEnglish($type, $line), $value ? sprintf(' with value "%s"', $value) : ''),
+ Twig_Token::typeToEnglish($token->getType()), $token->getValue(),
+ Twig_Token::typeToEnglish($type), $value ? sprintf(' with value "%s"', $value) : ''),
$line,
$this->filename
);
@@ -85,14 +101,14 @@ class Twig_TokenStream
/**
* Looks at the next token.
*
- * @param integer $number
+ * @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', -1, $this->filename);
+ throw new Twig_Error_Syntax('Unexpected end of template', $this->tokens[$this->current + $number - 1]->getLine(), $this->filename);
}
return $this->tokens[$this->current + $number];
diff --git a/vendor/twig/twig/phpunit.xml.dist b/vendor/twig/twig/phpunit.xml.dist
new file mode 100644
index 0000000000..6c5046f11e
--- /dev/null
+++ b/vendor/twig/twig/phpunit.xml.dist
@@ -0,0 +1,25 @@
+
+
+
+
+
+ ./test/Twig/
+
+
+
+
+
+ ./lib/Twig/
+
+
+