[TwigComponent] Add support for namespaced templates in TemplateMap #1070
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
stloyd
reviewed
Aug 24, 2023
| */ | ||
| private function parseTemplateName(string $name): mixed | ||
| { | ||
| if (isset($name[0]) && '@' == $name[0]) { |
There was a problem hiding this comment.
Suggested change
| if (isset($name[0]) && '@' == $name[0]) { | |
| if ('@' === $name[0] ?? '') { |
but also test is missing to prove the fix is working.
There was a problem hiding this comment.
Test added, and branch rebased which now incorporates @weaverryan's latest test fixes. All green now here as well!
@stloyd I corrected the loose comparison. The (copied) code from Twig also used loose comparison. I guess because in this case loose comparison would be faster and if the type didn't match it would also fail (i.e. nothing would equal '@' anyway) and the type is already guaranteed because of the parameter type hint. For the same reason I kept the isset instead of ?? because it only needs one check to know to fail while the ?? would always do the assignment and then do the comparison always.
sneakyvv
force-pushed
the
fix-template-map
branch
from
bb1286c to
fcfa2d6
Compare
weaverryan
force-pushed
the
fix-template-map
branch
from
fcfa2d6 to
be663d1
Compare
|
Thank you Bart! |
weaverryan
added a commit
that referenced
this pull request
Aug 30, 2023
…within namespaced template (sneakyvv) This PR was merged into the 2.x branch. Discussion ---------- [TwigComponent][LiveComponent] Fix Live embedded component within namespaced template | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | Tickets | | License | MIT This fix is related to #1070 . That PR made sure that a namespaced template could also be found in the TemplateMap, which contains paths without the namespace, so that the right template name (or actually obscuring hash) is used for the host template reference for live embedded components within such a template (which is used to find the right blocks during a re-render). However, because the Parser was still using the namespaced template name to calculate the deterministic index number for an embedded template, it would not match with the index of the stripped / namespace-less template name, causing it to have a different index for the embedded template during re-render then during parsing, resulting in a template not found error. This PR now also strips namespaces from template names during parsing. Commits ------- ad84cf7 [TwigComponent] Fix Live embedded component with namespace
This was referenced Jan 15, 2025
smnandre
added a commit
that referenced
this pull request
Jan 25, 2025
…yvv) This PR was merged into the 2.x branch. Discussion ---------- [TwigComponent] Remove obsolete TemplateNameParser It no longer parses (and should not have been stripping namespaces as it did before) | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | Issues | | License | MIT As discussed in #1772 (comment), the code added in #1070 (& expanded in #1082) was not needed (even incorrect, based upon a decorator TemplateIterator of Shopware). Commits ------- 99cb909 Remove obsolete TemplateNameParser
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.
Problem
If a template is rendered as "@MyNamespace/some/template.html.twig", and it contains an embedded live component, then that name is used for the host template attribute. When obscuring this name, an error is thrown, because it cannot be found in the template map (which consists of real file paths).
Solution
Parse the name when compiling a ComponentNode, just like the FilesystemLoader would, so it becomes "some/template.html.twig"