Updates patch to follow framework conventions

- Import all classes used
- Return from conditionals in order to prevent if/elseif/else
- Add comments for behavior needing explanations

src/ArraySerializable.php

@@ -9,6 +9,8 @@
 
 namespace Zend\Hydrator;
 
+use Zend\Stdlib\ArrayUtils;
+
 class ArraySerializable extends AbstractHydrator
 {
     /**
@@ -68,18 +70,23 @@ public function hydrate(array $data, $object)
         }
 
         if (is_callable([$object, 'exchangeArray'])) {
+            // Ensure any previously populated values not in the replacement
+            // remain following population.
             if (is_callable([$object, 'getArrayCopy'])) {
                 $original = $object->getArrayCopy($object);
-                $replacement = \Zend\Stdlib\ArrayUtils::merge($original, $replacement);
+                $replacement = ArrayUtils::merge($original, $replacement);
             }
             $object->exchangeArray($replacement);
-        } elseif (is_callable([$object, 'populate'])) {
+            return $object;
+        }
+
+        if (is_callable([$object, 'populate'])) {
             $object->populate($replacement);
-        } else {
-            throw new Exception\BadMethodCallException(
-                sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
-            );
+            return $object;
         }
-        return $object;
+
+        throw new Exception\BadMethodCallException(
+            sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
+        );
     }
 }