[7.x] Fix merging boolean or null attributes in Blade components (#32245

) * Fix merging boolean or null attributes in Blade components * fix style * fix style again
laravel · Apr 6, 2020 · ff1a13e · ff1a13e
1 parent 79b433a
commit ff1a13e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Illuminate/View/ComponentAttributeBag.php b/src/Illuminate/View/ComponentAttributeBag.php
@@ -111,6 +111,10 @@ public function merge(array $attributeDefaults = [])
         $attributes = [];
 
         $attributeDefaults = array_map(function ($value) {
+            if (is_null($value) || is_bool($value)) {
+                return $value;
+            }
+
             return e($value);
         }, $attributeDefaults);
 

diff --git a/tests/View/ViewComponentAttributeBagTest.php b/tests/View/ViewComponentAttributeBagTest.php
@@ -40,5 +40,25 @@ public function testAttributeRetrieval()
 
         $this->assertSame('test-string="ok" test-true="test-true" test-0="0" test-0-string="0" test-empty-string=""', (string) $bag);
         $this->assertSame('test-string="ok" test-true="test-true" test-0="0" test-0-string="0" test-empty-string=""', (string) $bag->merge());
+
+        $bag = (new ComponentAttributeBag)
+            ->merge([
+                'test-escaped' => '<tag attr="attr">',
+            ]);
+
+        $this->assertSame('test-escaped="&lt;tag attr=&quot;attr&quot;&gt;"', (string) $bag);
+
+        $bag = (new ComponentAttributeBag)
+            ->merge([
+                'test-string' => 'ok',
+                'test-null' => null,
+                'test-false' => false,
+                'test-true' => true,
+                'test-0' => 0,
+                'test-0-string' => '0',
+                'test-empty-string' => '',
+            ]);
+
+        $this->assertSame('test-string="ok" test-true="test-true" test-0="0" test-0-string="0" test-empty-string=""', (string) $bag);
     }
 }