[6.x] Fix "Recursion detected" error with cart endpoints (#1025)

* Fix "Recursion detected" error with cart endpoints

* wip

* this should still be `data`

* Ignore `.phpunit.cache`

* we're not returning `cart` from delete endpoint anymore

When you're deleting something, you shouldn't really get anything back.

* Use the "local" cart, rather than fetching it from the cart driver

Author: duncanmcclean

.gitignore

@@ -7,6 +7,7 @@ package-lock.json
 .idea
 .antlers.json
 composer.lock
+.phpunit.cache
 
 tests/__fixtures__/users/*.yaml
 

src/Http/Controllers/CartController.php

@@ -24,6 +24,7 @@ public function index(IndexRequest $request)
         return [
             'data' => $this->getCart()
                 ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
                 ->withShallowNesting()
                 ->toArray(),
         ];
@@ -58,7 +59,11 @@ public function update(UpdateRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Cart Updated'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -72,7 +77,6 @@ public function destroy(DestroyRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Cart Deleted'),
-            'cart' => null,
         ]);
     }
 

src/Http/Controllers/CartItemController.php

@@ -119,7 +119,11 @@ public function store(StoreRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Added to Cart'),
-            'cart' => $cart->fresh()->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -163,7 +167,11 @@ public function update(UpdateRequest $request, string $requestItem)
 
         return $this->withSuccess($request, [
             'message' => __('Line Item Updated'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -175,7 +183,11 @@ public function destroy(DestroyRequest $request, string $item)
 
         return $this->withSuccess($request, [
             'message' => __('Item Removed from Cart'),
-            'cart' => $cart->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 

src/Http/Controllers/CheckoutController.php

@@ -52,7 +52,11 @@ public function __invoke(CheckoutRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Checkout Complete!'),
-            'cart' => $this->order->toAugmentedArray(),
+            'cart' => $this->order
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
             'is_checkout_request' => true,
         ]);
     }

src/Http/Controllers/CouponController.php

@@ -25,7 +25,11 @@ public function store(StoreRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Coupon added to cart'),
-            'cart' => $this->getCart()->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 
@@ -41,7 +45,11 @@ public function destroy(DestroyRequest $request)
 
         return $this->withSuccess($request, [
             'message' => __('Coupon removed from cart'),
-            'cart' => $this->getCart()->toAugmentedArray(),
+            'cart' => $cart
+                ->toAugmentedCollection()
+                ->withRelations(['customer', 'customer_id'])
+                ->withShallowNesting()
+                ->toArray(),
         ]);
     }
 }

tests/Http/Controllers/CartControllerTest.php

@@ -674,7 +674,6 @@
     $response->assertJsonStructure([
         'status',
         'message',
-        'cart',
     ]);
 
     $cart = $cart->fresh();