Removed old Twig_TokenStream::getFilename call in AsseticTokenParser,… #845
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… which occurred when an unexpected punctuation exception was thrown.
soullivaneuh
suggested changes
Feb 21, 2017
| @@ -113,7 +113,7 @@ public function parse(\Twig_Token $token) | |||
| $attributes[$key] = $stream->expect(\Twig_Token::STRING_TYPE)->getValue(); | |||
| } else { | |||
| $token = $stream->getCurrent(); | |||
| throw new \Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', \Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $stream->getFilename()); | |||
| throw new \Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', \Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $stream->getSourceContext()); | |||
There was a problem hiding this comment.
Should be $stream->getSourceContext()->getName().
|
@soullivaneuh thanks, change made, tested & committed. |
|
Any update on this? |
|
Please resubmit to the 2.0 branch of assetic-php/assetic. |
|
@LukeTowers done: #898 . |
|
Sorry! Misunderstood what you said @LukeTowers . I think I finally got it right: assetic-php/assetic#2 |
|
@davividal perfect, thanks! |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… which occurred when an unexpected punctuation exception was thrown (throwing its own exception as a result). It was replaced with Twig_TokenStream::getSourceContext.
If you're using Twig 2 and you use 'unexpected punctuation', you'll get an exception about the call.