Merge branch 'master' into master

README.md

@@ -823,21 +823,28 @@ Cart::add('1239ad0', 'Product 2', 2, 5.95, ['size' => 'large']);
             <sub><b>Sartoric</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/macbookandrew">
+            <img src="https://avatars.githubusercontent.com/u/784333?v=4" width="100;" alt="macbookandrew"/>
+            <br />
+            <sub><b>Andrew Minion</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/dtwebuk">
             <img src="https://avatars.githubusercontent.com/u/6045378?v=4" width="100;" alt="dtwebuk"/>
             <br />
             <sub><b>Daniel Tomlinson</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/tkaw220">
             <img src="https://avatars.githubusercontent.com/u/694289?v=4" width="100;" alt="tkaw220"/>
             <br />
             <sub><b>Edwin Aw</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/manojo123">
             <img src="https://avatars.githubusercontent.com/u/20805943?v=4" width="100;" alt="manojo123"/>
@@ -872,15 +879,15 @@ Cart::add('1239ad0', 'Product 2', 2, 5.95, ['size' => 'large']);
             <br />
             <sub><b>Andrés</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/ganyicz">
             <img src="https://avatars.githubusercontent.com/u/3823354?v=4" width="100;" alt="ganyicz"/>
             <br />
             <sub><b>Filip Ganyicz</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/guysolamour">
             <img src="https://avatars.githubusercontent.com/u/22590722?v=4" width="100;" alt="guysolamour"/>
@@ -915,15 +922,15 @@ Cart::add('1239ad0', 'Product 2', 2, 5.95, ['size' => 'large']);
             <br />
             <sub><b>JT Smith</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/mrabbani">
             <img src="https://avatars.githubusercontent.com/u/4253979?v=4" width="100;" alt="mrabbani"/>
             <br />
             <sub><b>Mahbub Rabbani</b></sub>
         </a>
-    </td></tr>
+    </td>
-<tr>
     <td align="center">
         <a href="https://github.com/xpundel">
             <img src="https://avatars.githubusercontent.com/u/1384653?v=4" width="100;" alt="xpundel"/>
@@ -958,13 +965,6 @@ Cart::add('1239ad0', 'Product 2', 2, 5.95, ['size' => 'large']);
             <br />
             <sub><b>Pascal Kousbroek</b></sub>
         </a>
-    </td>
-    <td align="center">
-        <a href="https://github.com/publiux">
-            <img src="https://avatars.githubusercontent.com/u/2847188?v=4" width="100;" alt="publiux"/>
-            <br />
-            <sub><b>Raul Ruiz</b></sub>
-        </a>
     </td></tr>
 </table>
 <!-- readme: contributors -end -->

src/CartItem.php

@@ -70,7 +70,7 @@ class CartItem implements Arrayable, Jsonable
     /**
      * The options for this cart item.
      *
-     * @var array
+     * @var CartItemOptions|array
      */
     public $options;
 
@@ -501,7 +501,9 @@ class CartItem implements Arrayable, Jsonable
             'qty'      => $this->qty,
             'price'    => $this->price,
             'weight'   => $this->weight,
-            'options'  => $this->options->toArray(),
+            'options'  => is_object($this->options)
+                ? $this->options->toArray()
+                : $this->options,
             'discount' => $this->discount,
             'tax'      => $this->tax,
             'subtotal' => $this->subtotal,