Fix handling of kebab-case and snake-case files

giorgiopogliani · Oct 20, 2020 · a1369bf · a1369bf
1 parent b0d429a
commit a1369bf
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/src/ComponentTokenParser.php b/src/ComponentTokenParser.php
@@ -62,11 +62,22 @@ protected function parseArguments()
 
     public function decideBlockEnd(Token $token): bool
     {
-        return $token->test('end' . $this->tag);
+        return $token->test('end' . $this->toCamelCase($this->tag));
+    }
+
+    public function toCamelCase(string $value): string
+    {
+        $value = str_replace(['-', '_'], ' ', $value);
+
+        $value = ucwords($value);
+
+        $value = str_replace(' ', '', $value);
+
+        return lcfirst($value);
     }
 
     public function getTag(): string
     {
-        return $this->tag;
+        return $this->toCamelCase($this->tag);
     }
 }
diff --git a/tests/ComponentTest.php b/tests/ComponentTest.php
@@ -19,6 +19,11 @@ public function render_simple_button_component()
 
         $html = $twig->render('index-button.twig');
 
-        $this->assertEquals("<button class=\"bg-blue-600 text-white\"> test </button>\n", $html);
+        $this->assertEquals(<<<HTML
+        <button class="bg-blue-600 text-white"> test </button>
+        <button class="bg-blue-600 text-white"> test </button>
+        <button class="bg-blue-600 text-white"> test </button>
+
+        HTML, $html);
     }
 }
diff --git a/tests/templates/components/simple-button.twig b/tests/templates/components/simple-button.twig
@@ -0,0 +1 @@
+<button {{ attributes.merge({ class: 'text-white' })|raw }}>{{ slot }}</button>
diff --git a/tests/templates/components/simple_btn.twig b/tests/templates/components/simple_btn.twig
@@ -0,0 +1 @@
+<button {{ attributes.merge({ class: 'text-white' })|raw }}>{{ slot }}</button>
diff --git a/tests/templates/index-button.twig b/tests/templates/index-button.twig
@@ -1 +1,3 @@
 {% button with {class:'bg-blue-600'} %} test {% endbutton %}
+{% simpleButton with {class:'bg-blue-600'} %} test {% endsimpleButton %}
+{% simpleBtn with {class:'bg-blue-600'} %} test {% endsimpleBtn %}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<button {{ attributes.merge({ class: 'text-white' })\|raw }}>{{ slot }}</button>