[Twig] Improves Parser exception

(following Twig #4601 : twigphp/Twig#4601)

Author: smnandre

src/TwigComponent/src/Twig/ComponentTokenParser.php

@@ -12,6 +12,7 @@
 namespace Symfony\UX\TwigComponent\Twig;
 
 use Symfony\UX\TwigComponent\BlockStack;
+use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
 use Twig\Node\Expression\ArrayExpression;
 use Twig\Node\Expression\ConstantExpression;
@@ -33,13 +34,18 @@ final class ComponentTokenParser extends AbstractTokenParser
     public function parse(Token $token): Node
     {
         $stream = $this->parser->getStream();
+
         if (method_exists($this->parser, 'parseExpression')) {
             // Since Twig 3.21
             $componentName = $this->componentName($this->parser->parseExpression());
         } else {
             $componentName = $this->componentName($this->parser->getExpressionParser()->parseExpression());
         }
 
+        if (null === $componentName) {
+            throw new SyntaxError('Could not parse component name.', $stream->getCurrent()->getLine(), $stream->getSourceContext());
+        }
+
         [$propsExpression, $only] = $this->parseArguments();
 
         // Write a fake: "extends __parent__" into the "embedded" template.
@@ -80,7 +86,7 @@ public function getTag(): string
         return 'component';
     }
 
-    private function componentName(AbstractExpression $expression): string
+    private function componentName(AbstractExpression $expression): ?string
     {
         if ($expression instanceof ConstantExpression) { // using {% component 'name' %}
             return $expression->getAttribute('value');
@@ -90,7 +96,7 @@ private function componentName(AbstractExpression $expression): string
             return $expression->getAttribute('name');
         }
 
-        throw new \LogicException('Could not parse component name.');
+        return null;
     }
 
     /**

src/TwigComponent/tests/Integration/Twig/ComponentParserTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Twig\Environment;
+use Twig\Error\SyntaxError;
 use Twig\Loader\ArrayLoader;
 use Twig\TemplateWrapper;
 
@@ -28,38 +29,50 @@ final class ComponentParserTest extends KernelTestCase
      */
     public function testAcceptTwigComponentTagWithValidComponentName(string $name): void
     {
-        $environment = self::createEnvironment();
+        $environment = $this->createEnvironment();
         $source = str_replace('XXX', $name, "{% component 'XXX' %}{% endcomponent %}");
 
         $template = $environment->createTemplate($source);
 
-        self::assertInstanceOf(TemplateWrapper::class, $template);
+        $this->assertInstanceOf(TemplateWrapper::class, $template);
     }
 
     /**
      * @dataProvider provideValidComponentNames
      */
     public function testAcceptHtmlComponentTagWithValidComponentName(string $name): void
     {
-        $environment = self::createEnvironment();
+        $environment = $this->createEnvironment();
         $source = \sprintf('<twig:%s></twig:%s>', $name, $name);
 
         $template = $environment->createTemplate($source);
 
-        self::assertInstanceOf(TemplateWrapper::class, $template);
+        $this->assertInstanceOf(TemplateWrapper::class, $template);
     }
 
     /**
      * @dataProvider provideValidComponentNames
      */
     public function testAcceptHtmlSelfClosingComponentTagWithValidComponentName(string $name): void
     {
-        $environment = self::createEnvironment();
+        $environment = $this->createEnvironment();
         $source = \sprintf('<twig:%s />', $name);
 
         $template = $environment->createTemplate($source);
 
-        self::assertInstanceOf(TemplateWrapper::class, $template);
+        $this->assertInstanceOf(TemplateWrapper::class, $template);
+    }
+
+    public function testItThrowsWhenComponentNameCannotBeParsed(): void
+    {
+        $environment = $this->createEnvironment();
+        $source = '{% component [] %}{% endcomponent %}';
+
+        $this->expectException(SyntaxError::class);
+        $this->expectExceptionMessage('Could not parse component name in "foo.html.twig');
+        $this->expectExceptionMessage(')" at line 1.');
+
+        $environment->createTemplate($source, 'foo.html.twig');
     }
 
     public static function provideValidComponentNames(): iterable