Merge branch '8.x' into bug/blade-component-falsy-slots

laravel · Aug 25, 2021 · 716835e · 716835e
2 parents 19d3158 + b830dcb
commit 716835e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/src/Illuminate/View/ComponentSlot.php b/src/Illuminate/View/ComponentSlot.php
@@ -30,25 +30,11 @@ class ComponentSlot implements Htmlable
     public function __construct($contents = '', $attributes = [])
     {
         $this->contents = $contents;
-
         $this->withAttributes($attributes);
     }
 
     /**
-     * Set the extra attributes that the slot should make available.
-     *
-     * @param  array  $attributes
-     * @return $this
-     */
-    public function withAttributes(array $attributes)
-    {
-        $this->attributes = new ComponentAttributeBag($attributes);
-
-        return $this;
-    }
-
-    /**
-     * Get the slot's HTML string.
+     * Get the HTML string.
      *
      * @return string
      */
@@ -58,7 +44,7 @@ public function toHtml()
     }
 
     /**
-     * Determine if the slot is empty.
+     * Determine if the given slot is empty.
      *
      * @return bool
      */
@@ -68,7 +54,7 @@ public function isEmpty()
     }
 
     /**
-     * Determine if the slot is not empty.
+     * Determine if the given slot is not empty.
      *
      * @return bool
      */
@@ -78,7 +64,20 @@ public function isNotEmpty()
     }
 
     /**
-     * Get the slot's HTML string.
+     * Set the extra attributes that the slot should make available.
+     *
+     * @param  array  $attributes
+     * @return $this
+     */
+    public function withAttributes(array $attributes)
+    {
+        $this->attributes = new ComponentAttributeBag($attributes);
+
+        return $this;
+    }
+
+    /**
+     * Get the HTML string.
      *
      * @return string
      */

diff --git a/src/Illuminate/View/Concerns/ManagesComponents.php b/src/Illuminate/View/Concerns/ManagesComponents.php
@@ -119,8 +119,8 @@ protected function componentData()
      * Start the slot rendering process.
      *
      * @param  string  $name
-     * @param  string|null  $content
      * @param  array  $attributes
+     * @param  string|null  $content
      * @return void
      */
     public function slot($name, $content = null, $attributes = [])
@@ -147,11 +147,9 @@ public function endSlot()
             $this->slotStack[$this->currentComponent()]
         );
 
-        [$currentName, $currentAttributes] = $currentSlot;
+        [$currentSlotName, $currentSlotAttributes] = $currentSlot;
 
-        $this->slots[$this->currentComponent()][$currentName] = new ComponentSlot(
-            trim(ob_get_clean()), $currentAttributes
-        );
+        $this->slots[$this->currentComponent()][$currentSlotName] = new ComponentSlot(trim(ob_get_clean()), $currentSlotAttributes);
     }
 
     /**