From dcd41d37903550bbcd4d96266fd4262f1920fce8 Mon Sep 17 00:00:00 2001
From: Chris Thompson <chris@marketmuscles.com>
Date: Tue, 30 Nov 2021 17:25:47 -0500
Subject: [PATCH 1/4] Make the CartItem aware of its cart instance

---
 src/Cart.php     |  2 ++
 src/CartItem.php | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/Cart.php b/src/Cart.php
index 7063879..b9c865d 100644
--- a/src/Cart.php
+++ b/src/Cart.php
@@ -813,6 +813,8 @@ class Cart
             $cartItem->setQuantity($qty);
         }
 
+        $cartItem->setInstance($this->instance);
+
         return $cartItem;
     }
 
diff --git a/src/CartItem.php b/src/CartItem.php
index 5d183be..abc69d0 100644
--- a/src/CartItem.php
+++ b/src/CartItem.php
@@ -95,6 +95,13 @@ class CartItem implements Arrayable, Jsonable
      */
     private $discountRate = 0;
 
+    /**
+     * The cart instance of the cart item.
+     *
+     * @var string
+     */
+    public $instance;
+
     /**
      * CartItem constructor.
      *
@@ -372,6 +379,20 @@ class CartItem implements Arrayable, Jsonable
         return $this;
     }
 
+    /**
+     * Set cart instance
+     *
+     * @param string $instance
+     *
+     * @return \Gloudemans\Shoppingcart\CartItem
+     */
+    public function setInstance($instance)
+    {
+        $this->instance = $instance;
+
+        return $this;
+    }
+
     /**
      * Get an attribute from the cart item or get the associated model.
      *

From 16b49f06f8ae6ed520796c013287d7c2c6ec8365 Mon Sep 17 00:00:00 2001
From: Chris Thompson <chris@marketmuscles.com>
Date: Tue, 30 Nov 2021 17:36:01 -0500
Subject: [PATCH 2/4] Use the helper method

---
 src/Cart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cart.php b/src/Cart.php
index b9c865d..fc33359 100644
--- a/src/Cart.php
+++ b/src/Cart.php
@@ -813,7 +813,7 @@ class Cart
             $cartItem->setQuantity($qty);
         }
 
-        $cartItem->setInstance($this->instance);
+        $cartItem->setInstance($this->currentInstance());
 
         return $cartItem;
     }

From 01f7bb04e8fab46fda49603ca133163b8a415838 Mon Sep 17 00:00:00 2001
From: Chris Thompson <chris@marketmuscles.com>
Date: Wed, 1 Dec 2021 08:36:30 -0500
Subject: [PATCH 3/4] Fixing continous-integration complaint

---
 src/CartItem.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CartItem.php b/src/CartItem.php
index abc69d0..d189a39 100644
--- a/src/CartItem.php
+++ b/src/CartItem.php
@@ -380,7 +380,7 @@ class CartItem implements Arrayable, Jsonable
     }
 
     /**
-     * Set cart instance
+     * Set cart instance.
      *
      * @param string $instance
      *

From 09378ab742d85dc9e03c454e1ddb146f1aa1831a Mon Sep 17 00:00:00 2001
From: Patrick <privat@skyraptor.eu>
Date: Mon, 17 Jan 2022 19:24:12 +0100
Subject: [PATCH 4/4] Update CartItem.php

---
 src/CartItem.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CartItem.php b/src/CartItem.php
index d189a39..961523e 100644
--- a/src/CartItem.php
+++ b/src/CartItem.php
@@ -98,9 +98,9 @@ class CartItem implements Arrayable, Jsonable
     /**
      * The cart instance of the cart item.
      *
-     * @var string
+     * @var null|string
      */
-    public $instance;
+    public $instance = null;
 
     /**
      * CartItem constructor.
@@ -382,7 +382,7 @@ class CartItem implements Arrayable, Jsonable
     /**
      * Set cart instance.
      *
-     * @param string $instance
+     * @param null|string $instance
      *
      * @return \Gloudemans\Shoppingcart\CartItem
      */