From debe03d861be189449977bfaa544a7f02f5ef5ed Mon Sep 17 00:00:00 2001
From: John F <15612814+usernotnull@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:00:00 +0200
Subject: [PATCH 1/2] Add Conditionable trait to ComponentAttributeBag

---
 src/Illuminate/View/ComponentAttributeBag.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Illuminate/View/ComponentAttributeBag.php b/src/Illuminate/View/ComponentAttributeBag.php
index 3efb8c6b7966..265418cd7248 100644
--- a/src/Illuminate/View/ComponentAttributeBag.php
+++ b/src/Illuminate/View/ComponentAttributeBag.php
@@ -8,12 +8,14 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
+use Illuminate\Support\Traits\Conditionable;
 use Illuminate\Support\Traits\Macroable;
 use IteratorAggregate;
 
 class ComponentAttributeBag implements ArrayAccess, Htmlable, IteratorAggregate
 {
     use Macroable;
+    use Conditionable;
 
     /**
      * The raw array of attributes.

From ff578d5dd07d90101397c03b2896d713375aa49d Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Wed, 1 Dec 2021 07:08:43 -0600
Subject: [PATCH 2/2] Update ComponentAttributeBag.php

---
 src/Illuminate/View/ComponentAttributeBag.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Illuminate/View/ComponentAttributeBag.php b/src/Illuminate/View/ComponentAttributeBag.php
index 265418cd7248..255d16454127 100644
--- a/src/Illuminate/View/ComponentAttributeBag.php
+++ b/src/Illuminate/View/ComponentAttributeBag.php
@@ -14,8 +14,7 @@
 
 class ComponentAttributeBag implements ArrayAccess, Htmlable, IteratorAggregate
 {
-    use Macroable;
-    use Conditionable;
+    use Conditionable, Macroable;
 
     /**
      * The raw array of attributes.