Fix error for component name with : #806
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
Contributor
WebMamba
commented
Apr 19, 2023
WebMamba
commented
| Q | A |
|---|---|
| Bug fix? | yes |
| New feature? | no |
| Tickets | Fix #803 |
| License | MIT |
|
This is a fix on the HTML twig component syntax but do you think we should extend the fix to allow this |
jdreesen
reviewed
Apr 19, 2023
kbond
reviewed
Apr 19, 2023
WebMamba
commented
Apr 19, 2023
weaverryan
reviewed
Apr 19, 2023
| ]; | ||
|
|
||
| yield 'component_with_default_block_that_holds_a_component_and_multi_blocks' => [ | ||
| '<twig:foo>Foo <twig:bar /><twig:block name="other_block">Other block</twig:block></twig:foo>', | ||
| '{% component foo %}{% block content %}Foo {% component bar %}{% endcomponent %}{% endblock %}{% block other_block %}Other block{% endblock %}{% endcomponent %}', | ||
| '{% component \'foo\' %}{% block content %}Foo {% component \'bar\' %}{% endcomponent %}{% endblock %}{% block other_block %}Other block{% endblock %}{% endcomponent %}', | ||
| ]; |
There was a problem hiding this comment.
Let's add tests specifically for any of the new character we allow - e.g. <twig:foo:bar or <twig:foo-bar, etc
kbond
reviewed
Apr 19, 2023
| @@ -58,7 +58,7 @@ public function preLexComponents(string $input): string | |||
| $this->currentComponents[] = ['name' => $componentName, 'hasDefaultBlock' => false]; | |||
| } | |||
|
|
|||
| $output .= "{% component {$componentName}".($attributes ? " with { {$attributes} }" : '').' %}'; | |||
| $output .= "{% component '{$componentName}'".($attributes ? " with { {$attributes} }" : '').' %}'; | |||
There was a problem hiding this comment.
Does {% component @foo/bar-baz.html.twig %} (no ') not work?
There was a problem hiding this comment.
Yes It works with both
kbond
approved these changes
Apr 19, 2023
weaverryan
force-pushed
the
matheo/fix-803
branch
from
1d37aa6 to
ce7f1bf
Compare
|
Thanks Matheo! |
|
Thanks a lot for the fix @WebMamba ! |
weaverryan
added a commit
that referenced
this pull request
Apr 24, 2023
This PR was squashed before being merged into the 2.x branch. Discussion ---------- remove / character in the list of allowed character | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | Tickets | | License | MIT By allowing the / character in #806, we introduce a bug. You can't now use the self-closing syntax because it enters in conflict with the component name. ```php <twig:foo/> ``` The Lexer thinks now that the name is `foo/` I just remove the / from the allowing list, tell me if you think we should go a bit further. Commits ------- cb79adf remove / character in the list of allowed character
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.