fix(Cart): fix serialization of cart draft

fix test for cart discount predicates

Author: jenschude

src/Core/Model/Common/LocaleTrait.php

@@ -16,17 +16,12 @@ public function setLocale($locale)
         return $this;
     }
 
-    /**
-     * @return array
-     */
-    abstract public function toArray();
-
     /**
      * @return array
      */
     public function toJson()
     {
-        $data = $this->toArray();
+        $data = parent::toJson();
         if (isset($data['locale'])) {
             $data['locale'] = str_replace('_', '-', $data['locale']);
         }

tests/integration/Cart/CartUpdateRequestTest.php

@@ -1219,16 +1219,16 @@ public function testDiscountCodeCustomPredicate()
             AbsoluteCartDiscountValue::of()->setMoney(
                 MoneyCollection::of()->add(Money::ofCurrencyAndAmount('EUR', 100))
             ),
-            'custom(testField = "' . $this->getTestRun() . '")',
+            'custom.testField = "' . $this->getTestRun() . '"',
             LineItemsTarget::of()->setPredicate('1=1'),
             '0.9' . trim((string)mt_rand(1, TestHelper::RAND_MAX), '0'),
             true,
             true
         );
         $request = CartDiscountCreateRequest::ofDraft($draft);
         $response = $request->executeWithClient($this->getClient());
-        TestHelper::getInstance($this->getClient())->setCartDiscount($request->mapResponse($response));
-
+        $cartDiscount = $request->mapFromResponse($response);
+        TestHelper::getInstance($this->getClient())->setCartDiscount($cartDiscount);
         $discountCode = $this->getDiscountCode();
 
         $request = CartUpdateRequest::ofIdAndVersion($cart->getId(), $cart->getVersion())
@@ -1241,7 +1241,7 @@ public function testDiscountCodeCustomPredicate()
         $this->assertSame($discountCode->getId(), $cart->getDiscountCodes()->current()->getDiscountCode()->getId());
 
         $this->assertSame(
-            TestHelper::getInstance($this->getClient())->getCartDiscount()->getId(),
+            $cartDiscount->getId(),
             $cart->getLineItems()->current()
                 ->getDiscountedPricePerQuantity()->current()
                 ->getDiscountedPrice()->getIncludedDiscounts()->current()

tests/unit/Model/Common/ResourceTest.php

@@ -5,8 +5,13 @@
 
 namespace Commercetools\Core\Model\Common;
 
+use Commercetools\Core\Model\Cart\Cart;
+use Commercetools\Core\Model\Cart\CartDraft;
+use Commercetools\Core\Model\Product\Product;
+use Commercetools\Core\Model\Product\ProductDraft;
 use Commercetools\Core\Model\ProductType\ProductType;
 use Commercetools\Core\Model\ProductType\ProductTypeReference;
+use Commercetools\Core\Model\ShippingMethod\ShippingMethod;
 
 class ResourceTest extends \PHPUnit\Framework\TestCase
 {
@@ -50,6 +55,16 @@ public function testGetReference()
         );
     }
 
+    public function testSerializeNestedReference()
+    {
+        $method = ShippingMethod::of()->setId('123456');
+        $product = CartDraft::of()->setShippingMethod($method->getReference());
+        $this->assertJsonStringEqualsJsonString(
+            '{ "shippingMethod":{"typeId":"shipping-method", "id":"123456"} }',
+            json_encode($product)
+        );
+    }
+
     public function testGetReferenceWithoutReferenceClass()
     {
         $obj = $this->getObject();