Fix custom tags configuration effect

giorgiopogliani · Apr 9, 2022 · b37cdd5 · b37cdd5
1 parent c2eab35
commit b37cdd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -131,7 +131,9 @@ public function setup()
     {
         $this->twig->addExtension(new ComponentExtension($this));
 
-        $this->twig->setLexer(new ComponentLexer($this->twig));
+        if ($this->isUsingCustomTags()) {
+            $this->twig->setLexer(new ComponentLexer($this->twig));
+        }
 
         /** @var \Twig\Extension\EscaperExtension */
         $escaper = $this->twig->getExtension(\Twig\Extension\EscaperExtension::class);

diff --git a/tests/ComponentTest.php b/tests/ComponentTest.php
@@ -22,7 +22,8 @@ protected function setupTwig(): \Twig\Environment
         Configuration::make($twig)
             ->setTemplatesPath('components')
             ->setTemplatesExtension('twig')
-            ->useGlobalContext(false)
+            ->useGlobalContext()
+            ->useCustomTags()
             ->setup();
 
         return $twig;