Fixed array flattening bug.

Author: Chris Pliakas

src/DocumentManager.php

@@ -235,7 +235,7 @@ public function save(EntityInterface $entity)
 
         $commandOptions = array(
             'TableName'              => $this->getEntityTable($entity),
-            'Item'                   => $this->formatAttributes($entity, $entity->getAttributes()),
+            'Item'                   => $this->formatEntityAttributes($entity),
             'ReturnConsumedCapacity' => $this->returnConsumedCapacity,
         );
 
@@ -426,30 +426,37 @@ protected function initEntity($entityClass, $primaryKey)
     }
 
     /**
-     * Converts an array into something
+     * Formats an entity's attributes to the SDK's native data structure.
      *
-     * @param \Cpliakas\DynamoDb\ODM\EntityInterface|string $entity
+     * @param \Cpliakas\DynamoDb\ODM\EntityInterface $entity
+     * @param string $format
+     *
+     * @return array
+     */
+    protected function formatEntityAttributes(EntityInterface $entity, $format = Attribute::FORMAT_PUT)
+    {
+        return $this->formatAttributes(get_class($entity), $entity->getAttributes());
+    }
+
+    /**
+     * Formats an array of attributes to the SDK's native data structure.
+     *
+     * @param string $entityClass
      * @param array $attributes
-     * @param string
+     * @param string $format
      *
      * @return array
      *
      * @throws \InvalidArgumentException
      *
      * @see \Aws\DynamoDb\DynamoDbClient::formatAttributes()
      */
-    protected function formatAttributes($entity, array $attributes, $format = Attribute::FORMAT_PUT)
+    protected function formatAttributes($entityClass, array $attributes, $format = Attribute::FORMAT_PUT)
     {
-        // Ensure entity is a class or a fully qualified class name.
-        if (is_string($entity)) {
-            $entity = $this->getEntityClass($entity);
-        } elseif (!$entity instanceof EntityInterface) {
-            throw new \InvalidArgumentException('Entity must be an instance of \Cpliakas\DynamoDb\ODM\EntityInterface or a string');
-        }
-
+        $entityClass = $this->getEntityClass($entityClass);
         $formatted = array();
 
-        $mappings = $entity::getDataTypeMappings();
+        $mappings = $entityClass::getDataTypeMappings();
         foreach ($attributes as $attribute => $value) {
             if (isset($mappings[$attribute])) {
                 $dataType = $mappings[$attribute];
@@ -482,7 +489,7 @@ protected function formatKeyCondition(EntityInterface $entity)
             $attributes[$rangeKeyAttribute] = $entity->getRangeKey();
         }
 
-        return $this->formatAttributes($entity, $attributes);
+        return $this->formatAttributes(get_class($entity), $attributes);
     }
 
     /**
@@ -569,7 +576,7 @@ protected function flattenArray(array $item)
     protected function populateEntity(EntityInterface $entity, array $item)
     {
         $attributes = $this->flattenArray($item);
-        $entity->setAttributes($item);
+        $entity->setAttributes($attributes);
     }
 
     /**