WIP: review changes

Author: jenschude

src/Core/Request/Customers/CustomerLoginRequest.php

@@ -80,8 +80,8 @@ public function __construct($email, $password, $anonymousCart = null, Context $c
         $this->password = $password;
         if ($anonymousCart instanceof CartReference) {
             $this->anonymousCart = $anonymousCart;
-        } elseif ($anonymousCart != null) {
-            $this->anonymousCartId = CartReference::ofId($anonymousCart);
+        } elseif ($anonymousCart !== null) {
+            $this->anonymousCart = CartReference::ofId($anonymousCart);
         }
     }
 
@@ -129,7 +129,10 @@ public function setPassword($password)
      */
     public function getAnonymousCartId()
     {
-        return $this->anonymousCartId;
+        if ($this->anonymousCart == null) {
+            return null;
+        }
+        return $this->anonymousCart->getId();
     }
 
     /**
@@ -139,7 +142,7 @@ public function getAnonymousCartId()
      */
     public function setAnonymousCartId($anonymousCartId)
     {
-        $this->anonymousCartId = $anonymousCartId;
+        $this->anonymousCart = CartReference::ofId($anonymousCartId);
 
         return $this;
     }
@@ -209,9 +212,6 @@ public function setAnonymousCart($anonymousCart)
      */
     public static function ofEmailAndPassword($email, $password, $anonymousCart = null, Context $context = null)
     {
-        if (!$anonymousCart instanceof CartReference & $anonymousCart != null) {
-            $anonymousCart = CartReference::ofId($anonymousCart);
-        }
         return new static($email, $password, $anonymousCart, $context);
     }
 
@@ -230,9 +230,6 @@ public static function ofEmailPasswordAndUpdateProductData(
         $anonymousCart = null,
         Context $context = null
     ) {
-        if (!$anonymousCart instanceof CartReference & $anonymousCart != null) {
-            $anonymousCart = CartReference::ofId($anonymousCart);
-        }
         $request = new static($email, $password, $anonymousCart, $context);
         $request->setUpdateProductData($updateProductData);
 

src/Core/Request/Orders/OrderCreateFromCartRequest.php

@@ -44,6 +44,9 @@ class OrderCreateFromCartRequest extends AbstractApiRequest
      * @deprecated use $cart instead
      */
     protected $cartId;
+    /**
+     * @var CartReference
+     */
     protected $cart;
     protected $version;
     protected $orderNumber;
@@ -95,7 +98,10 @@ public function setCart($cart)
      */
     public function getCartId()
     {
-        return $this->cartId;
+        if ($this->cart == null) {
+            return null;
+        }
+        return $this->cart->getId();
     }
 
     /**
@@ -105,7 +111,7 @@ public function getCartId()
      */
     public function setCartId($cartId)
     {
-        $this->cartId = $cartId;
+        $this->cart = CartReference::ofId($cartId);
 
         return $this;
     }
@@ -264,7 +270,6 @@ public function buildResponse(ResponseInterface $response)
     public function httpRequest()
     {
         $payload = [
-            static::ID => $this->getCart()->getId(),
             static::CART => $this->getCart(),
             static::VERSION => $this->getVersion(),
         ];

tests/unit/Request/Orders/OrderCreateFromCartRequestTest.php

@@ -75,7 +75,10 @@ public function testHttpRequestObject()
         $httpRequest = $request->httpRequest();
 
         $expectedResult = [
-            'id' => '12345',
+            "cart" => [
+                "id" =>  "12345",
+                "typeId" => "cart"
+            ],
             'version' => 1,
             'orderNumber' => '12345678',
             'paymentState' => 'paid',