Skip to content

[TwigComponent] Fix twig:blockquote is not a block #3762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smnandre wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+47 −1
Open

[TwigComponent] Fix twig:blockquote is not a block #3762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/TwigComponent/src/Twig/TwigPreLexer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ private function consumeUntilEndBlock(): string
--$depth;
}

if (!$inComment && '<twig:block' === substr($this->input, $this->position, 11)) {
if (!$inComment && preg_match('/\G<twig:block(?![A-Za-z0-9_:@\-.])/', $this->input, $matches, 0, $this->position)) {
++$depth;
}

Expand Down
46 changes: 46 additions & 0 deletions src/TwigComponent/tests/Unit/TwigPreLexerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,52 @@ public static function getLexTests(): iterable
'{% component \'foo\' %}{% block foo_block %}{% component \'bar\' %}{% block content %}{{ component(\'baz\') }}{% endblock %}{% endcomponent %}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name' => [
'<twig:foo><twig:block name="foo_block"><twig:blockquote>Quote</twig:blockquote></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{% component \'blockquote\' %}{% block content %}Quote{% endblock %}{% endcomponent %}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_self_closing' => [
'<twig:foo><twig:block name="foo_block"><twig:blockquote /></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{{ component(\'blockquote\') }}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_with_dash' => [
'<twig:foo><twig:block name="foo_block"><twig:block-title /></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{{ component(\'block-title\') }}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_with_colon' => [
'<twig:foo><twig:block name="foo_block"><twig:block:title /></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{{ component(\'block:title\') }}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_with_suffix' => [
'<twig:foo><twig:block name="foo_block"><twig:blocked /></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{{ component(\'blocked\') }}{% endblock %}{% endcomponent %}',
];

// a traditional block does not pre-lex the components nested in it, hence the verbatim tag
yield 'block_prefixed_component_name_in_traditional_block' => [
'<twig:foo>{% block foo_block %}<twig:blockquote />{% endblock %}</twig:foo>',
'{% component \'foo\' %}{% block foo_block %}<twig:blockquote />{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_capitalized' => [
'<twig:foo><twig:block name="foo_block"><twig:Blockquote /></twig:block></twig:foo>',
'{% component \'foo\' %}{% block foo_block %}{{ component(\'Blockquote\') }}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_outside_block' => [
'<twig:foo><twig:blockquote /></twig:foo>',
'{% component \'foo\' %}{% block content %}{{ component(\'blockquote\') }}{% endblock %}{% endcomponent %}',
];

yield 'block_prefixed_component_name_around_a_real_nested_block' => [
'<twig:foo><twig:block name="a"><twig:blockquote /><twig:bar><twig:block name="b">x</twig:block></twig:bar></twig:block></twig:foo>',
'{% component \'foo\' %}{% block a %}{{ component(\'blockquote\') }}{% component \'bar\' %}{% block b %}x{% endblock %}{% endcomponent %}{% endblock %}{% endcomponent %}',
];

yield 'component_with_embedded_component' => [
'<twig:foo>foo_content<twig:bar><twig:baz /></twig:bar></twig:foo>',
'{% component \'foo\' %}{% block content %}foo_content{% component \'bar\' %}{% block content %}{{ component(\'baz\') }}{% endblock %}{% endcomponent %}{% endblock %}{% endcomponent %}',
Expand Down
Loading