projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security update to Drupal 8.4.6 with PHP held back to 7.0.27 to match the stoneboat...
[yaffs-website]
/
vendor
/
twig
/
twig
/
lib
/
Twig
/
Parser.php
diff --git
a/vendor/twig/twig/lib/Twig/Parser.php
b/vendor/twig/twig/lib/Twig/Parser.php
index 21afe4e8552130251cc45a0eb722204fb150f05b..6de879a584496d6e3dd10fdfb04d31a6144c07e7 100644
(file)
--- a/
vendor/twig/twig/lib/Twig/Parser.php
+++ b/
vendor/twig/twig/lib/Twig/Parser.php
@@
-50,7
+50,7
@@
class Twig_Parser implements Twig_ParserInterface
public function getVarName()
{
public function getVarName()
{
- return sprintf('__internal_%s', hash('sha256', __METHOD__.$this->varNameSalt++));
+ return sprintf('__internal_%s', hash('sha256', __METHOD__.$this->
stream->getSourceContext()->getCode().$this->
varNameSalt++));
}
/**
}
/**
@@
-155,7
+155,7
@@
class Twig_Parser implements Twig_ParserInterface
$this->stream->next();
$token = $this->getCurrentToken();
$this->stream->next();
$token = $this->getCurrentToken();
- if (
$token->getType() !== Twig_Token::NAME_TYPE
) {
+ if (
Twig_Token::NAME_TYPE !== $token->getType()
) {
throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext());
}
throw new Twig_Error_Syntax('A block must start with a tag name.', $token->getLine(), $this->stream->getSourceContext());
}