Merge branch 'bugfix/sku-fixes'

Nosto · May 8, 2017 · f1b391d · f1b391d
2 parents d92d2ab + 8cc4404
commit f1b391d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to Semantic Versioning (http://semver.org/).
 ## 3.0.1
 * Add collection for SKUs
 * Add set availability method to SKU model
+* Make the serializer to handle collections (implementations of Iterable interface)
 
 ## 3.0.0
 * Add namespaces and comply to PSR-4

diff --git a/src/Helper/SerializationHelper.php b/src/Helper/SerializationHelper.php
@@ -89,23 +89,26 @@ private static function toArray($object)
             if (!method_exists($object, $getter)) {
                 continue;
             }
-
             $key = self::toSnakeCase($key);
-            if (is_object($object->$getter())) {
-                $json[$key] = self::toArray($object->$getter());
+            $value = $object->$getter();
+            if ($value instanceof \Iterator) {
+                $value = iterator_to_array($value);
+            }
+            if (is_object($value)) {
+                $json[$key] = self::toArray($value);
             } else {
-                if (is_array($object->$getter())) {
+                if (is_array($value)) {
                     $json[$key] = array();
-                    if (self::isAssoc($object->$getter())) {
-                        foreach ($object->$getter() as $k => $anObject) {
+                    if (self::isAssoc($value)) {
+                        foreach ($value as $k => $anObject) {
                             if (is_object($anObject)) {
                                 $json[$key][$k] = self::toArray($anObject);
                             } else {
                                 $json[$key][$k] = $anObject;
                             }
                         }
                     } else {
-                        foreach ($object->$getter() as $anObject) {
+                        foreach ($value as $anObject) {
                             if (is_object($anObject)) {
                                 $json[$key][] = self::toArray($anObject);
                             } else {
@@ -114,10 +117,11 @@ private static function toArray($object)
                         }
                     }
                 } else {
-                    $json[$key] = $object->$getter();
+                    $json[$key] = $value;
                 }
             }
         }
+
         return $json;
     }
 

diff --git a/src/Object/Product/Product.php b/src/Object/Product/Product.php
@@ -830,9 +830,9 @@ public function getSkus()
     /**
      * Sets the SKUs
      *
-     * @param array $skus
+     * @param SkuCollection $skus
      */
-    public function setSkus($skus)
+    public function setSkus(SkuCollection $skus)
     {
         $this->skus = $skus;
     }

diff --git a/src/Types/Product/ProductInterface.php b/src/Types/Product/ProductInterface.php
@@ -250,7 +250,7 @@ public function getUnitPricingUnit();
     /**
      * Returns the product variations
      *
-     * @returns
+     * @return Nosto\Object\Product\SkuCollection
      */
     public function getSkus();
 }