mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-15 02:04:54 +02:00
Update Twig to v2.15.4
This commit is contained in:
@@ -18,10 +18,8 @@ use Twig\Token;
|
||||
|
||||
/**
|
||||
* Embeds a template.
|
||||
*
|
||||
* @final
|
||||
*/
|
||||
class EmbedTokenParser extends IncludeTokenParser
|
||||
final class EmbedTokenParser extends IncludeTokenParser
|
||||
{
|
||||
public function parse(Token $token)
|
||||
{
|
||||
@@ -31,19 +29,19 @@ class EmbedTokenParser extends IncludeTokenParser
|
||||
|
||||
list($variables, $only, $ignoreMissing) = $this->parseArguments();
|
||||
|
||||
$parentToken = $fakeParentToken = new Token(Token::STRING_TYPE, '__parent__', $token->getLine());
|
||||
$parentToken = $fakeParentToken = new Token(/* Token::STRING_TYPE */ 7, '__parent__', $token->getLine());
|
||||
if ($parent instanceof ConstantExpression) {
|
||||
$parentToken = new Token(Token::STRING_TYPE, $parent->getAttribute('value'), $token->getLine());
|
||||
$parentToken = new Token(/* Token::STRING_TYPE */ 7, $parent->getAttribute('value'), $token->getLine());
|
||||
} elseif ($parent instanceof NameExpression) {
|
||||
$parentToken = new Token(Token::NAME_TYPE, $parent->getAttribute('name'), $token->getLine());
|
||||
$parentToken = new Token(/* Token::NAME_TYPE */ 5, $parent->getAttribute('name'), $token->getLine());
|
||||
}
|
||||
|
||||
// inject a fake parent to make the parent() function work
|
||||
$stream->injectTokens([
|
||||
new Token(Token::BLOCK_START_TYPE, '', $token->getLine()),
|
||||
new Token(Token::NAME_TYPE, 'extends', $token->getLine()),
|
||||
new Token(/* Token::BLOCK_START_TYPE */ 1, '', $token->getLine()),
|
||||
new Token(/* Token::NAME_TYPE */ 5, 'extends', $token->getLine()),
|
||||
$parentToken,
|
||||
new Token(Token::BLOCK_END_TYPE, '', $token->getLine()),
|
||||
new Token(/* Token::BLOCK_END_TYPE */ 3, '', $token->getLine()),
|
||||
]);
|
||||
|
||||
$module = $this->parser->parse($stream, [$this, 'decideBlockEnd'], true);
|
||||
@@ -55,7 +53,7 @@ class EmbedTokenParser extends IncludeTokenParser
|
||||
|
||||
$this->parser->embedTemplate($module);
|
||||
|
||||
$stream->expect(Token::BLOCK_END_TYPE);
|
||||
$stream->expect(/* Token::BLOCK_END_TYPE */ 3);
|
||||
|
||||
return new EmbedNode($module->getTemplateName(), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag());
|
||||
}
|
||||
|
Reference in New Issue
Block a user