Merge branch 'release/v1.0.0-RC7'

Author: Jens Schulze

CHANGELOG.md

@@ -1,3 +1,41 @@
+<a name="1.0.0-RC7"></a>
+# [1.0.0-RC7](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC5...v1.0.0-RC7) (2015-10-19)
+
+
+### Bug Fixes
+
+* **Cart:** add corrected cart discount fields ([b0bf1b7](https://github.com/sphereio/commercetools-php-sdk/commit/b0bf1b7))
+* **LocalizedString:** fix array conversion of locales for LocalizedString ([ea50790](https://github.com/sphereio/commercetools-php-sdk/commit/ea50790))
+* **PaymentInfo** correct class path ([a9501fc](https://github.com/sphereio/commercetools-php-sdk/commit/a9501fc))
+
+### Features
+
+* **JsonObject:** recurse toArray method to child objects ([feb3729](https://github.com/sphereio/commercetools-php-sdk/commit/feb3729))
+
+### BREAKING CHANGES
+
+* discountedPrice at LineItems has been removed
+
+  The discountedPrice field has been deprecated at the API and therefor was removed from the SDK.
+
+  Before:
+  ```
+  $lineItem->getDiscountedPrice();
+  $discountedCentAmount = $lineItem->getDiscountedPrice()->getValue()->getCentAmount();
+  ```
+
+  After:
+
+  ```
+  $lineItem->getDiscountedPricePerQuantity();
+  $discountedCentAmount = 0;
+  foreach ($lineItem->getDiscountedPricePerQuantity() as $discountedPricePerQuantity) {
+    $discountedCentAmount += $discountedPricePerQuantity()->getQuantity() *
+      $discountedPricePerQuantity->getDiscountedPrice()->getValue()->getCentAmount();
+  }
+  ```
+  ([b0bf1b7](https://github.com/sphereio/commercetools-php-sdk/commit/b0bf1b7))
+
 <a name="1.0.0-RC5"></a>
 # [1.0.0-RC5](https://github.com/sphereio/commercetools-php-sdk/compare/v1.0.0-RC4...v1.0.0-RC5) (2015-10-07)
 

README.md

@@ -1,6 +1,6 @@
 # <img src="build/theme/resources/CT_cube_200px.png" width="40" align="center"></img> commercetools PHP SDK
 
->  STATUS: Release Candidate 5.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
+>  STATUS: Release Candidate 7.  We ask you to really use this API thoroughly now, especially the API design and object structure. Thank you very much!
 >
 > See the [Milestone Plan](https://github.com/sphereio/commercetools-php-sdk/milestones?direction=desc&sort=completeness&state=open) for details of what's planned in detail. We love feedback and [Issue reports](https://github.com/sphereio/commercetools-php-sdk/issues?q=is%3Aopen+is%3Aissue+sort%3Acreated-asc)!
 > Up-to-Date planning status can be found on this [Waffle Board](https://waffle.io/sphereio/commercetools-php-sdk)

src/AbstractHttpClient.php

@@ -15,7 +15,7 @@
 abstract class AbstractHttpClient
 {
 
-    const VERSION = '1.0.0-RC5';
+    const VERSION = '1.0.0-RC7';
 
     /**
      * @var AdapterInterface

src/Model/Cart/CustomLineItem.php

@@ -34,6 +34,12 @@
  * @method CustomLineItem setTaxRate(TaxRate $taxRate = null)
  * @method CustomFieldObject getCustom()
  * @method CustomLineItem setCustom(CustomFieldObject $custom = null)
+ * @method Money getTotalPrice()
+ * @method CustomLineItem setTotalPrice(Money $totalPrice = null)
+ * @method DiscountedPricePerQuantityCollection getDiscountedPricePerQuantity()
+ * @codingStandardsIgnoreStart
+ * @method CustomLineItem setDiscountedPricePerQuantity(DiscountedPricePerQuantityCollection $discountedPricePerQuantity = null)
+ * @codingStandardsIgnoreEnd
  */
 class CustomLineItem extends JsonObject
 {
@@ -49,6 +55,10 @@ public function fieldDefinitions()
             'taxCategory' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxCategoryReference'],
             'taxRate' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxRate'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
+            'totalPrice' => [static::TYPE => '\Commercetools\Core\Model\Common\Money'],
+            'discountedPricePerQuantity' => [
+                static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
+            ],
         ];
     }
 }

src/Model/Cart/DiscountedPricePerQuantity.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ */
+
+namespace Commercetools\Core\Model\Cart;
+
+use Commercetools\Core\Model\Common\JsonObject;
+
+/**
+ * @package Commercetools\Core\Model\Cart
+ * @apidoc http://dev.sphere.io/http-api-projects-carts.html#discounted-line-item-price-for-quantity
+ * @method int getQuantity()
+ * @method DiscountedPricePerQuantity setQuantity(int $quantity = null)
+ * @method DiscountedLineItemPrice getDiscountedPrice()
+ * @method DiscountedPricePerQuantity setDiscountedPrice(DiscountedLineItemPrice $discountedPrice = null)
+ */
+class DiscountedPricePerQuantity extends JsonObject
+{
+    public function fieldDefinitions()
+    {
+        return [
+            'quantity' => [static::TYPE => 'int'],
+            'discountedPrice' => [static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedLineItemPrice']
+        ];
+    }
+}

src/Model/Cart/DiscountedPricePerQuantityCollection.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ */
+
+namespace Commercetools\Core\Model\Cart;
+
+use Commercetools\Core\Model\Common\Collection;
+
+/**
+ * @package Commercetools\Core\Model\Cart
+ *
+ * @method DiscountedPricePerQuantityCollection add(DiscountedPricePerQuantity $element)
+ * @method DiscountedPricePerQuantity current()
+ * @method DiscountedPricePerQuantity getAt($offset)
+ */
+class DiscountedPricePerQuantityCollection extends Collection
+{
+    protected $type = '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantity';
+}

src/Model/Cart/LineItem.php

@@ -45,6 +45,12 @@
  * @method LineItem setDistributionChannel(ChannelReference $distributionChannel = null)
  * @method CustomFieldObject getCustom()
  * @method LineItem setCustom(CustomFieldObject $custom = null)
+ * @method Money getTotalPrice()
+ * @method LineItem setTotalPrice(Money $totalPrice = null)
+ * @method DiscountedPricePerQuantityCollection getDiscountedPricePerQuantity()
+ * @codingStandardsIgnoreStart
+ * @method LineItem setDiscountedPricePerQuantity(DiscountedPricePerQuantityCollection $discountedPricePerQuantity = null)
+ * @codingStandardsIgnoreEnd
  */
 class LineItem extends JsonObject
 {
@@ -61,19 +67,12 @@ public function fieldDefinitions()
             'state' => [static::TYPE => '\Commercetools\Core\Model\Order\ItemStateCollection'],
             'taxRate' => [static::TYPE => '\Commercetools\Core\Model\TaxCategory\TaxRate'],
             'supplyChannel' => [static::TYPE => '\Commercetools\Core\Model\Channel\ChannelReference'],
-            'discountedPrice' => [static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedLineItemPrice'],
             'distributionChannel' => [static::TYPE => '\Commercetools\Core\Model\Channel\ChannelReference'],
             'custom' => [static::TYPE => '\Commercetools\Core\Model\CustomField\CustomFieldObject'],
+            'totalPrice' => [static::TYPE => '\Commercetools\Core\Model\Common\Money'],
+            'discountedPricePerQuantity' => [
+                static::TYPE => '\Commercetools\Core\Model\Cart\DiscountedPricePerQuantityCollection'
+            ],
         ];
     }
-
-    /**
-     * @return Money
-     */
-    public function getTotal()
-    {
-        $price = $this->getPrice()->getValue();
-        $amount = $this->getQuantity() * $price->getCentAmount();
-        return Money::ofCurrencyAndAmount($price->getCurrencyCode(), $amount, $this->getContext());
-    }
 }

src/Model/Common/AbstractJsonDeserializeObject.php

@@ -46,6 +46,11 @@ public function __construct(array $data = [], $context = null)
      */
     protected static $interfaces = [];
 
+    public function __sleep()
+    {
+        return array_diff(array_keys(get_object_vars($this)), ['context']);
+    }
+
     /**
      * @param $type
      * @param $interfaceName
@@ -189,6 +194,15 @@ public function toArray()
         $data = array_filter($data, function ($value) {
             return !is_null($value);
         });
+        $data = array_map(
+            function ($value) {
+                if ($value instanceof JsonDeserializeInterface) {
+                    return $value->toArray();
+                }
+                return $value;
+            },
+            $data
+        );
         return $data;
     }
 

src/Model/Common/LocalizedString.php

@@ -127,21 +127,21 @@ public function __toString()
      */
     public function toArray()
     {
-        return $this->values;
+        $values = $this->values;
+
+        $data = [];
+        foreach ($values as $key => $value) {
+            $data[str_replace('_', '-', $key)] = $value;
+        }
+        return $data;
     }
 
     /**
      * @return array
      */
     public function jsonSerialize()
     {
-        $values = $this->toArray();
-
-        $data = [];
-        foreach ($values as $key => $value) {
-            $data[str_replace('_', '-', $key)] = $value;
-        }
-        return $data;
+        return $this->toArray();
     }
 
     /**

src/Model/Order/Order.php

@@ -18,6 +18,7 @@
 use Commercetools\Core\Model\CustomField\CustomFieldObject;
 use Commercetools\Core\Model\Common\DateTimeDecorator;
 use Commercetools\Core\Model\State\StateReference;
+use Commercetools\Core\Model\Payment\PaymentInfo;
 
 /**
  * @package Commercetools\Core\Model\Order

tests/fixtures/models.yaml

@@ -38,8 +38,9 @@ lineItem:
     - taxRate
     - supplyChannel
     - distributionChannel
-    - discountedPrice
     - custom
+    - discountedPricePerQuantity
+    - totalPrice
 
 customLineItem:
   domain: cart
@@ -54,6 +55,8 @@ customLineItem:
     - taxCategory
     - taxRate
     - custom
+    - discountedPricePerQuantity
+    - totalPrice
 
 taxedPrice:
   domain: common

tests/unit/Model/Cart/LineItemTest.php

@@ -6,11 +6,9 @@
 
 namespace Commercetools\Core\Model\Type;
 
-
 use Commercetools\Core\Model\Common\JsonObject;
 use Commercetools\Core\Model\ProductType\AttributeDefinition;
 use Commercetools\Core\Model\ProductType\AttributeDefinitionCollection;
-use Commercetools\Core\Model\ProductType\ProductType;
 use Commercetools\Core\Model\ProductType\ProductTypeDraft;
 
 /**

tests/unit/Model/Common/JsonObjectTest.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author @ct-jensschulze <jens.schulze@commercetools.de>
+ */
+
+namespace Commercetools\Core\Model\Customer;
+
+use Commercetools\Core\Model\CustomerGroup\CustomerGroup;
+use Commercetools\Core\Model\CustomerGroup\CustomerGroupReference;
+
+class CustomerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testSerialize()
+    {
+        $t = Customer::of()
+            ->setFirstName('John')
+            ->setLastName('Doe')
+            ->setCustomerGroup(
+                CustomerGroupReference::ofId('id1')->setObj(CustomerGroup::of()->setName('Test'))
+            );
+        $t = serialize($t->toArray());
+        $customer = Customer::fromArray(unserialize($t));
+
+        $this->assertSame('John', $customer->getFirstName());
+        $this->assertSame('Test', $customer->getCustomerGroup()->getObj()->getName());
+    }
+}

tests/unit/Model/Customer/CustomerTest.php

@@ -1,6 +1,6 @@
 {
   "name": "commercetools-php-sdk-changelog",
-  "version": "1.0.0-RC5",
+  "version": "1.0.0-RC7",
   "description": "commercetools PHP SDK changelog generator package description",
   "homepage": "https://github.com/sphereio/commercetools-php-sdk",
   "bugs": "https://github.com/sphereio/commercetools-php-sdk/issues",