[VarDumper] Fix source links with latests Twig versions #20175
Merged
Conversation
This file contains hidden or 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
695c807 to
cf93b79
Compare
|
Closing in favor of #20224 |
cdaa6dc to
6401a33
Compare
stof
requested changes
Oct 18, 2016
| $templateInfo = $template->getDebugInfo(); | ||
| if (isset($templateInfo[$f['line']])) { | ||
| if (method_exists($template, 'getSourceContext')) { | ||
| $templateName = $template->getSourceContext()->getPath(); |
There was a problem hiding this comment.
you should overwrite it only when the path is not null (not all loaders can give you a path, as not all of them are based on a file)
| $templateInfo = $template->getDebugInfo(); | ||
| if (isset($templateInfo[$f['line']])) { | ||
| $templateName = $template->getTemplateName(); | ||
| $templateSrc = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false); |
There was a problem hiding this comment.
I would use the empty string rather than false, to have a consistent variable type (getCode() will return the empty string in non-debug mode anyway)
| twig source | ||
|
|
||
| "; | ||
| return new Twig_Source(" foo bar\n twig source\n\n", 'foo.twig', 'foo.twig'); |
There was a problem hiding this comment.
Please also add tests for other cases:
- Twig_Source with an empty code string (i.e. a non-debug compilation)
- Twig_Source without a path (i.e. a loader not based on the filesystem, or a loader not updated to use new features)
There was a problem hiding this comment.
Bof, that's only a caster, adding a test for that would be quite a bit of work for a minor thing to me...
There was a problem hiding this comment.
well, it would avoid issues when refactoring it, reintroducing the bugs I spotted during the review
d71fcd9 to
888e4bd
Compare
888e4bd to
f3b09d9
Compare
nicolas-grekas
added a commit
that referenced
this pull request
Oct 18, 2016
…icolas-grekas) This PR was merged into the 2.8 branch. Discussion ---------- [VarDumper] Fix source links with latests Twig versions | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Sibling to #20173 Commits ------- f3b09d9 [VarDumper] Fix source links with latests Twig versions
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Sibling to #20173