Merge pull request #678 from commercetools/php-maintainance

Author: jenschude

src/Core/Builder/Request/CartRequestBuilder.php

@@ -4,12 +4,15 @@
 
 use Commercetools\Core\Request\Carts\CartByCustomerIdGetRequest;
 use Commercetools\Core\Request\Carts\CartByIdGetRequest;
+use Commercetools\Core\Request\Carts\CartByKeyGetRequest;
 use Commercetools\Core\Request\Carts\CartCreateRequest;
 use Commercetools\Core\Model\Cart\CartDraft;
-use Commercetools\Core\Request\Carts\CartDeleteRequest;
+use Commercetools\Core\Request\Carts\CartDeleteByKeyRequest;
 use Commercetools\Core\Model\Cart\Cart;
+use Commercetools\Core\Request\Carts\CartDeleteRequest;
 use Commercetools\Core\Request\Carts\CartQueryRequest;
 use Commercetools\Core\Request\Carts\CartReplicateRequest;
+use Commercetools\Core\Request\Carts\CartUpdateByKeyRequest;
 use Commercetools\Core\Request\Carts\CartUpdateRequest;
 
 class CartRequestBuilder
@@ -37,6 +40,17 @@ public function getById($id)
         return $request;
     }
 
+    /**
+     * @link https://docs.commercetools.com/api/projects/carts#get-a-cart-by-key
+     * @param string $key
+     * @return CartByKeyGetRequest
+     */
+    public function getByKey($key)
+    {
+        $request = CartByKeyGetRequest::ofKey($key);
+        return $request;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-carts.html#create-cart
      * @param CartDraft $cartDraft
@@ -48,6 +62,17 @@ public function create(CartDraft $cartDraft)
         return $request;
     }
 
+    /**
+     * @link https://docs.commercetools.com/api/projects/carts#delete-a-cart-by-key
+     * @param Cart $cart
+     * @return CartDeleteByKeyRequest
+     */
+    public function deleteByKey(Cart $cart)
+    {
+        $request = CartDeleteByKeyRequest::ofKeyAndVersion($cart->getKey(), $cart->getVersion());
+        return $request;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-carts.html#delete-cart
      * @param Cart $cart
@@ -81,6 +106,17 @@ public function replicate($cartId)
         return $request;
     }
 
+    /**
+     * @link https://docs.commercetools.com/api/projects/carts#update-a-cart-by-key
+     * @param Cart $cart
+     * @return CartUpdateByKeyRequest
+     */
+    public function updateByKey(Cart $cart)
+    {
+        $request = CartUpdateByKeyRequest::ofKeyAndVersion($cart->getKey(), $cart->getVersion());
+        return $request;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-carts.html#update-cart
      * @param Cart $cart

src/Core/Builder/Request/CustomerRequestBuilder.php

@@ -2,6 +2,7 @@
 // phpcs:disable Generic.Files.LineLength
 namespace Commercetools\Core\Builder\Request;
 
+use Commercetools\Core\Model\Cart\CartReference;
 use Commercetools\Core\Request\Customers\CustomerByEmailTokenGetRequest;
 use Commercetools\Core\Request\Customers\CustomerByIdGetRequest;
 use Commercetools\Core\Request\Customers\CustomerByKeyGetRequest;
@@ -129,7 +130,7 @@ public function createEmailVerificationToken(Customer $customer, $ttlMinutes)
      * @param string $email
      * @param string $password
      * @param bool $updateProductData
-     * @param string $anonymousCartId
+     * @param CartReference|string $anonymousCartId
      * @return CustomerLoginRequest
      */
     public function login($email, $password, $updateProductData = false, $anonymousCartId = null)

src/Core/Builder/Request/OrderRequestBuilder.php

@@ -2,6 +2,7 @@
 // phpcs:disable Generic.Files.LineLength
 namespace Commercetools\Core\Builder\Request;
 
+use Commercetools\Core\Model\Cart\CartReference;
 use Commercetools\Core\Request\Orders\OrderByIdGetRequest;
 use Commercetools\Core\Request\Orders\OrderByOrderNumberGetRequest;
 use Commercetools\Core\Request\Orders\OrderCreateFromCartRequest;
@@ -47,7 +48,7 @@ public function getByOrderNumber($orderNumber)
      */
     public function createFromCart(Cart $cart)
     {
-        $request = OrderCreateFromCartRequest::ofCartIdAndVersion($cart->getId(), $cart->getVersion());
+        $request = OrderCreateFromCartRequest::ofCartAndVersion(CartReference::ofId($cart->getId()), $cart->getVersion());
         return $request;
     }
 

src/Core/Builder/Update/CartsActionBuilder.php

@@ -44,8 +44,10 @@
 use Commercetools\Core\Request\Carts\Command\CartSetDeleteDaysAfterLastModificationAction;
 use Commercetools\Core\Request\Carts\Command\CartSetItemShippingAddressCustomFieldAction;
 use Commercetools\Core\Request\Carts\Command\CartSetItemShippingAddressCustomTypeAction;
+use Commercetools\Core\Request\Carts\Command\CartSetKeyAction;
 use Commercetools\Core\Request\Carts\Command\CartSetLineItemCustomFieldAction;
 use Commercetools\Core\Request\Carts\Command\CartSetLineItemCustomTypeAction;
+use Commercetools\Core\Request\Carts\Command\CartSetLineItemDistributionChannelAction;
 use Commercetools\Core\Request\Carts\Command\CartSetLineItemPriceAction;
 use Commercetools\Core\Request\Carts\Command\CartSetLineItemShippingDetailsAction;
 use Commercetools\Core\Request\Carts\Command\CartSetLineItemTaxAmountAction;
@@ -506,6 +508,17 @@ public function setItemShippingAddressCustomType($action = null)
         return $this;
     }
 
+    /**
+     * @link https://docs.commercetools.com/api/projects/carts#set-key-
+     * @param CartSetKeyAction|callable $action
+     * @return $this
+     */
+    public function setKey($action = null)
+    {
+        $this->addAction($this->resolveAction(CartSetKeyAction::class, $action));
+        return $this;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-carts.html#set-lineitem-customfield
      * @param CartSetLineItemCustomFieldAction|callable $action
@@ -528,6 +541,17 @@ public function setLineItemCustomType($action = null)
         return $this;
     }
 
+    /**
+     *
+     * @param CartSetLineItemDistributionChannelAction|callable $action
+     * @return $this
+     */
+    public function setLineItemDistributionChannel($action = null)
+    {
+        $this->addAction($this->resolveAction(CartSetLineItemDistributionChannelAction::class, $action));
+        return $this;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-carts.html#set-lineitem-totalprice
      * @param CartSetLineItemPriceAction|callable $action

src/Core/Builder/Update/ShippingMethodsActionBuilder.php

@@ -11,6 +11,8 @@
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodChangeTaxCategoryAction;
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodRemoveShippingRateAction;
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodRemoveZoneAction;
+use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetCustomFieldAction;
+use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetCustomTypeAction;
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetDescriptionAction;
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetKeyAction;
 use Commercetools\Core\Request\ShippingMethods\Command\ShippingMethodSetLocalizedDescriptionAction;
@@ -97,6 +99,28 @@ public function removeZone($action = null)
         return $this;
     }
 
+    /**
+     * @link https://docs.commercetools.com/api/projects/shippingMethods#set-customfield
+     * @param ShippingMethodSetCustomFieldAction|callable $action
+     * @return $this
+     */
+    public function setCustomField($action = null)
+    {
+        $this->addAction($this->resolveAction(ShippingMethodSetCustomFieldAction::class, $action));
+        return $this;
+    }
+
+    /**
+     * @link https://docs.commercetools.com/api/projects/shippingMethods#set-customtype
+     * @param ShippingMethodSetCustomTypeAction|callable $action
+     * @return $this
+     */
+    public function setCustomType($action = null)
+    {
+        $this->addAction($this->resolveAction(ShippingMethodSetCustomTypeAction::class, $action));
+        return $this;
+    }
+
     /**
      * @link https://docs.commercetools.com/http-api-projects-shippingMethods.html#set-description
      * @param ShippingMethodSetDescriptionAction|callable $action

src/Core/Builder/Update/StagedOrderActionBuilder.php

@@ -54,6 +54,7 @@
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetItemShippingAddressCustomTypeAction;
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemCustomFieldAction;
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemCustomTypeAction;
+use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemDistributionChannelAction;
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemPriceAction;
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemShippingDetailsAction;
 use Commercetools\Core\Request\OrderEdits\StagedOrder\Command\StagedOrderSetLineItemTaxAmountAction;
@@ -638,6 +639,17 @@ public function setLineItemCustomType($action = null)
         return $this;
     }
 
+    /**
+     *
+     * @param StagedOrderSetLineItemDistributionChannelAction|callable $action
+     * @return $this
+     */
+    public function setLineItemDistributionChannel($action = null)
+    {
+        $this->addAction($this->resolveAction(StagedOrderSetLineItemDistributionChannelAction::class, $action));
+        return $this;
+    }
+
     /**
      *
      * @param StagedOrderSetLineItemPriceAction|callable $action

src/Core/Error/QueryTimedOutError.php

@@ -0,0 +1,24 @@
+<?php
+
+
+namespace Commercetools\Core\Error;
+
+/**
+ * @package Commercetools\Core\Error
+ *
+ * @method string getCode()
+ * @method QueryTimedOutError setCode(string $code = null)
+ * @method string getMessage()
+ * @method QueryTimedOutError setMessage(string $message = null)
+ */
+class QueryTimedOutError extends ApiError
+{
+    const CODE = 'QueryTimedOut';
+
+    public function fieldDefinitions()
+    {
+        $definitions = parent::fieldDefinitions();
+
+        return $definitions;
+    }
+}

src/Core/Model/Cart/Cart.php

@@ -89,6 +89,8 @@
  * @method Cart setCreatedBy(CreatedBy $createdBy = null)
  * @method LastModifiedBy getLastModifiedBy()
  * @method Cart setLastModifiedBy(LastModifiedBy $lastModifiedBy = null)
+ * @method string getKey()
+ * @method Cart setKey(string $key = null)
  * @method CartReference getReference()
  */
 class Cart extends Resource
@@ -113,6 +115,7 @@ public function fieldDefinitions()
     {
         return [
             'id' => [static::TYPE => 'string'],
+            'key' => [static::TYPE => 'string'],
             'version' => [static::TYPE => 'int'],
             'createdAt' => [
                 static::TYPE => DateTime::class,

src/Core/Model/Cart/CartDraft.php

@@ -66,6 +66,8 @@
  * @method CartDraft setStore(StoreReference $store = null)
  * @method array getDiscountCodes()
  * @method CartDraft setDiscountCodes(array $discountCodes = null)
+ * @method string getKey()
+ * @method CartDraft setKey(string $key = null)
  */
 class CartDraft extends JsonObject
 {
@@ -75,6 +77,7 @@ public function fieldDefinitions()
     {
         return [
             'currency' => [static::TYPE => 'string'],
+            'key' => [static::TYPE => 'string'],
             'customerId' => [static::TYPE => 'string'],
             'customerEmail' => [static::TYPE => 'string'],
             'country' => [static::TYPE => 'string'],

src/Core/Model/Customer/CustomerDraft.php

@@ -6,10 +6,12 @@
 
 namespace Commercetools\Core\Model\Customer;
 
+use Commercetools\Core\Model\Cart\CartReference;
 use Commercetools\Core\Model\Common\Context;
 use Commercetools\Core\Model\Common\JsonObject;
 use Commercetools\Core\Model\Common\DateTimeDecorator;
 use Commercetools\Core\Model\Common\LocaleTrait;
+use Commercetools\Core\Model\Common\ResourceIdentifier;
 use Commercetools\Core\Model\CustomerGroup\CustomerGroupReference;
 use Commercetools\Core\Model\Common\AddressCollection;
 use Commercetools\Core\Model\CustomField\CustomFieldObjectDraft;
@@ -69,6 +71,8 @@
  * @method CustomerDraft setAnonymousId(string $anonymousId = null)
  * @method StoreReferenceCollection getStores()
  * @method CustomerDraft setStores(StoreReferenceCollection $stores = null)
+ * @method CartReference getAnonymousCart()
+ * @method CustomerDraft setAnonymousCart(CartReference $anonymousCart = null)
  */
 class CustomerDraft extends JsonObject
 {
@@ -105,6 +109,7 @@ public function fieldDefinitions()
             'key' => [static::TYPE => 'string'],
             'anonymousId' => [static::TYPE => 'string'],
             'stores' => [static::TYPE => StoreReferenceCollection::class],
+            'anonymousCart' => [static::TYPE => CartReference::class],
         ];
     }