Enable inline objects in Twig {% with %} tags

Twig_Node_MergeContext.php

<?php

/*
 * This file is part of Twig.
 *
 * (c) 2009 Fabien Potencier
 * (c) 2013 Berny Cantos
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

class Twig_Node_MergeContext extends Twig_Node
{
    public function __construct(array $nodes, $lineno)
    {
        parent::__construct($nodes, array(), $lineno);
    }

    public function compile(Twig_Compiler $compiler)
    {
        $compiler->write("\$context = array_merge(\$context")->indent();
        foreach ($this->nodes as $node) {
            $compiler->raw(", \n")->write('(array) ')->subcompile($node);
        }
        $compiler->raw("\n")->outdent()->write(");\n");
    }
}

Twig_TokenParser_With.php

<?php

/*
 * This file is part of Twig.
 *
 * (c) 2009 Fabien Potencier
 * (c) 2013 Berny Cantos
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

/**
 * Enforces a nested scope
 *
 * <pre>
 * {% set foo = 'Hello', separator = ', ', bar = 'Twig' %}
 * {% with foo = 'Goodbye' %} {# Optional setter #}
 *     {% set bar = 'World' %}
 *     {{ foo ~ separator ~ bar }} {# This should print "Goodbye, World" #}
 * {% endwith %}
 * {{ foo ~ separator ~ bar }} {# This should print "Hello, Twig" #}
 * </pre>
 *
 * @author Berny Cantos <[email protected]>
 */
class Twig_TokenParser_With 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();

        if ($stream->test(Twig_Token::BLOCK_END_TYPE)) {
            $setter = new Twig_Node();

        } else if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
            $setter = $this->parseInlineObject($lineno);

        } else {
            $setter = $this->parseSet($lineno);
        }

        $stream->expect(Twig_Token::BLOCK_END_TYPE);
        $body = $this->parser->subparse(array($this, 'decideWithEnd'), true);

        $stream->expect(Twig_Token::BLOCK_END_TYPE);
        return new Twig_Node_With($body, $setter, $lineno, $this->getTag());
    }

    public function decideWithEnd(Twig_Token $token)
    {
        return $token->test('endwith');
    }

    /**
     * Gets the tag name associated with this token parser.
     *
     * @return string The tag name
     */
    public function getTag()
    {
        return 'with';
    }

    protected function parseInlineObject($lineno)
    {
        $hash = $this->parser->getExpressionParser()->parseHashExpression();
        return new Twig_Node_MergeContext(array($hash), $lineno);
    }

    protected function parseSet($lineno)
    {
        $stream = $this->parser->getStream();
        $expressionParser = $this->parser->getExpressionParser();
        $names = $expressionParser->parseAssignmentExpression();
        $stream->expect(Twig_Token::OPERATOR_TYPE, '=');
        $values = $expressionParser->parseMultitargetExpression();

        if (count($names) !== count($values)) {
            throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignments.", $stream->getCurrent()->getLine(), $stream->getFilename());
        }

        return new Twig_Node_Set(false, $names, $values, $lineno);
    }
}