Skip to content

Commit f154efd

Browse files
committed
feature #1368 Use TwigComponent HTML syntax (smnandre)
This PR was squashed before being merged into the 1.x-dev branch. Discussion ---------- Use TwigComponent HTML syntax Use the new default HTML syntax ( `<twig:Alert />` instead of `{{ component('Alert') }}` ) cc `@weaverryan` Commits ------- 9d557b2 Use TwigComponent HTML syntax
2 parents ab025cd + 9d557b2 commit f154efd

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/Maker/MakeTwigComponent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
4242
{
4343
$command
4444
->setDescription(self::getCommandDescription())
45-
->addArgument('name', InputArgument::OPTIONAL, 'The name of your twig component (ie <fg=yellow>NotificationComponent</>)')
45+
->addArgument('name', InputArgument::OPTIONAL, 'The name of your twig component (ie <fg=yellow>Notification</>)')
4646
->addOption('live', null, InputOption::VALUE_NONE, 'Whether to create a live twig component (requires <fg=yellow>symfony/ux-live-component</>)')
4747
;
4848
}
@@ -84,7 +84,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
8484

8585
$this->writeSuccessMessage($io);
8686
$io->newLine();
87-
$io->writeln(" To render the component, use {{ component('{$shortName}') }}.");
87+
$io->writeln(" To render the component, use <fg=yellow><twig:{$shortName} /></>.");
8888
$io->newLine();
8989
}
9090

src/Resources/skeleton/twig/Component.tpl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
66

7-
#[AsTwigComponent()]
7+
#[AsTwigComponent]
88
final class <?= $class_name."\n" ?>
99
{
1010
}

src/Resources/skeleton/twig/LiveComponent.tpl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
66
use Symfony\UX\LiveComponent\DefaultActionTrait;
77

8-
#[AsLiveComponent()]
8+
#[AsLiveComponent]
99
final class <?= $class_name."\n" ?>
1010
{
1111
use DefaultActionTrait;

tests/Maker/MakeTwigComponentTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function getTestDetails(): \Generator
2727

2828
$this->assertStringContainsString('src/Twig/Components/Alert.php', $output);
2929
$this->assertStringContainsString('templates/components/Alert.html.twig', $output);
30-
$this->assertStringContainsString("To render the component, use {{ component('Alert') }}.", $output);
30+
$this->assertStringContainsString('To render the component, use <twig:Alert />.', $output);
3131

3232
$runner->copy(
3333
'make-twig-component/tests/it_generates_twig_component.php',
@@ -46,7 +46,7 @@ public function getTestDetails(): \Generator
4646

4747
$this->assertStringContainsString('src/Twig/Components/FormInput.php', $output);
4848
$this->assertStringContainsString('templates/components/FormInput.html.twig', $output);
49-
$this->assertStringContainsString("To render the component, use {{ component('FormInput') }}.", $output);
49+
$this->assertStringContainsString('To render the component, use <twig:FormInput />.', $output);
5050

5151
$runner->copy(
5252
'make-twig-component/tests/it_generates_twig_component.php',
@@ -65,7 +65,7 @@ public function getTestDetails(): \Generator
6565

6666
$this->assertStringContainsString('src/Twig/Components/Alert.php', $output);
6767
$this->assertStringContainsString('templates/components/Alert.html.twig', $output);
68-
$this->assertStringContainsString("To render the component, use {{ component('Alert') }}.", $output);
68+
$this->assertStringContainsString('To render the component, use <twig:Alert />.', $output);
6969

7070
$runner->copy(
7171
'make-twig-component/tests/it_generates_live_component.php',
@@ -84,7 +84,7 @@ public function getTestDetails(): \Generator
8484

8585
$this->assertStringContainsString('src/Twig/Components/FormInput.php', $output);
8686
$this->assertStringContainsString('templates/components/FormInput.html.twig', $output);
87-
$this->assertStringContainsString("To render the component, use {{ component('FormInput') }}.", $output);
87+
$this->assertStringContainsString('To render the component, use <twig:FormInput />.', $output);
8888

8989
$runner->copy(
9090
'make-twig-component/tests/it_generates_live_component.php',

tests/fixtures/make-twig-component/tests/it_generates_live_component.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class GeneratedTwigComponentTest extends KernelTestCase
88
{
99
public function testController()
1010
{
11-
$output = self::getContainer()->get('twig')->createTemplate("{{ component('{name}') }}")->render();
11+
$output = self::getContainer()->get('twig')->createTemplate("<twig:{name} />")->render();
1212

1313
$this->assertStringContainsString('<div data-controller="live"', $output);
1414
$this->assertStringContainsString('data-live-name-value="', $output);

tests/fixtures/make-twig-component/tests/it_generates_twig_component.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class GeneratedTwigComponentTest extends KernelTestCase
88
{
99
public function testController()
1010
{
11-
$output = self::getContainer()->get('twig')->createTemplate("{{ component('{name}') }}")->render();
11+
$output = self::getContainer()->get('twig')->createTemplate("<twig:{name} />")->render();
1212

1313
$this->assertSame("<div>\n <!-- component html -->\n</div>\n", $output);
1414
}

0 commit comments

Comments
 (0)