Merge pull request #23 from tales-from-a-dev/bugfix/hidden-type

ker0x · web-flow · commit 9e92356839fe · 2024-01-17T00:03:26.000+01:00
🐛 Do not apply class attribute on hidden type
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
@@ -17,12 +17,15 @@
     </testsuites>
 
     <coverage>
-        <include>
-            <directory suffix=".php">src</directory>
-        </include>
         <report>
             <clover outputFile=".coverage/coverage.xml"/>
             <html outputDirectory=".coverage/html/"/>
         </report>
     </coverage>
+
+    <source>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/templates/form/default.html.twig b/templates/form/default.html.twig
@@ -4,14 +4,18 @@
 
 {%- block form_widget_simple -%}
     {%- set type = type|default('text') -%}
-    {%- set attr_class = attr_class|default(block('class_input_text')) -%}
-    {%- if type == 'range' -%}
-        {%- set attr_class = block('class_input_range') -%}
-    {%- elseif type == 'file' -%}
-        {%- set attr_class = block('class_input_file') -%}
+    {%- if type == 'hidden' -%}
+        {{- parent() -}}
+    {%- else -%}
+        {%- set attr_class = attr_class|default(block('class_input_text')) -%}
+        {%- if type == 'range' -%}
+            {%- set attr_class = block('class_input_range') -%}
+        {%- elseif type == 'file' -%}
+            {%- set attr_class = block('class_input_file') -%}
+        {%- endif -%}
+        {%- set attr = attr|merge({'class': (attr_class ~ ' ' ~ attr.class|default(''))|trim}) -%}
+        {{- parent() -}}
     {%- endif -%}
-    {%- set attr = attr|merge({'class': (attr_class ~ ' ' ~ attr.class|default(''))|trim}) -%}
-    {{- parent() -}}
 {%- endblock form_widget_simple -%}
 
 {%- block textarea_widget -%}
diff --git a/tests/FormLayout/BirthdayLayoutTest.php b/tests/FormLayout/BirthdayLayoutTest.php
@@ -9,7 +9,7 @@
 
 final class BirthdayLayoutTest extends AbstractFlowbiteLayoutTestCase
 {
-    public function testBirthDay(): void
+    public function testBirthday(): void
     {
         $form = $this->factory->createNamed('birthday', BirthdayType::class, '2000-02-03', [
             'input' => 'string',
@@ -54,7 +54,7 @@ public function testBirthDay(): void
         );
     }
 
-    public function testBirthDaySingleText(): void
+    public function testBirthdaySingleText(): void
     {
         $form = $this->factory->createNamed('birthday', BirthdayType::class, '2000-02-03', [
             'input' => 'string',
diff --git a/tests/FormLayout/HiddenLayoutTest.php b/tests/FormLayout/HiddenLayoutTest.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TalesFromADev\FlowbiteBundle\Tests\FormLayout;
+
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use TalesFromADev\FlowbiteBundle\Tests\AbstractFlowbiteLayoutTestCase;
+
+final class HiddenLayoutTest extends AbstractFlowbiteLayoutTestCase
+{
+    public function testHidden(): void
+    {
+        $form = $this->factory->createNamed('name', HiddenType::class);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+            '/input
+            [@type="hidden"]
+            [@name="name"]
+            [@id="name"]'
+        );
+    }
+
+    public function testHiddenWithClass(): void
+    {
+        $form = $this->factory->createNamed('name', HiddenType::class, null, [
+            'attr' => [
+                'class' => 'foo bar',
+            ],
+        ]);
+
+        $this->assertWidgetMatchesXpath($form->createView(), [],
+            '/input
+            [@type="hidden"]
+            [@name="name"]
+            [@id="name"]
+            [@class="foo bar"]'
+        );
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`final class BirthdayLayoutTest extends AbstractFlowbiteLayoutTestCase`
`11`	`11`	`{`
`12`		`- public function testBirthDay(): void`
	`12`	`+ public function testBirthday(): void`
`13`	`13`	`{`
`14`	`14`	`$form = $this->factory->createNamed('birthday', BirthdayType::class, '2000-02-03', [`
`15`	`15`	`'input' => 'string',`
`@@ -54,7 +54,7 @@ public function testBirthDay(): void`
`54`	`54`	`);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function testBirthDaySingleText(): void`
	`57`	`+ public function testBirthdaySingleText(): void`
`58`	`58`	`{`
`59`	`59`	`$form = $this->factory->createNamed('birthday', BirthdayType::class, '2000-02-03', [`
`60`	`60`	`'input' => 'string',`