Merge pull request zendframework/zendframework#1 from wryck7/ZendHydr…

…ator

CS fixes

composer.json

@@ -10,10 +10,7 @@
     "autoload": {
         "psr-4": {
             "Zend\\Stdlib\\": "src/"
-        },
-        "files": [
-            "Zend/Stdlib/compatibility/autoload.php"
-        ]
+        }
     },
     "require": {
         "php": ">=5.3.3"
@@ -36,8 +33,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

src/AbstractOptions.php

@@ -22,6 +22,8 @@ abstract class AbstractOptions implements ParameterObjectInterface
     protected $__strictMode__ = true;
 
     /**
+     * Constructor
+     *
      * @param  array|Traversable|null $options
      */
     public function __construct($options = null)
@@ -32,22 +34,29 @@ public function __construct($options = null)
     }
 
     /**
-     * @param  array|Traversable $options
+     * Set one or more configuration properties
+     *
+     * @param  array|Traversable|AbstractOptions $options
      * @throws Exception\InvalidArgumentException
      * @return AbstractOptions Provides fluent interface
      */
     public function setFromArray($options)
     {
+        if ($options instanceof self) {
+            $options = $options->toArray();
+        }
+
         if (!is_array($options) && !$options instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Parameter provided to %s must be an array or Traversable',
-                __METHOD__
+                'Parameter provided to %s must be an %s, %s or %s',
+                __METHOD__, 'array', 'Traversable', 'Zend\Stdlib\AbstractOptions'
             ));
         }
 
         foreach ($options as $key => $value) {
             $this->__set($key, $value);
         }
+
         return $this;
     }
 
@@ -72,6 +81,8 @@ public function toArray()
     }
 
     /**
+     * Set a configuration property
+     *
      * @see ParameterObject::__set()
      * @param string $key
      * @param mixed $value
@@ -94,6 +105,8 @@ public function __set($key, $value)
     }
 
     /**
+     * Get a configuration property
+     *
      * @see ParameterObject::__get()
      * @param string $key
      * @throws Exception\BadMethodCallException
@@ -114,6 +127,7 @@ public function __get($key)
     }
 
     /**
+     * Test if a configuration property is null
      * @see ParameterObject::__isset()
      * @param string $key
      * @return bool
@@ -124,6 +138,8 @@ public function __isset($key)
     }
 
     /**
+     * Set a configuration property to NULL
+     *
      * @see ParameterObject::__unset()
      * @param string $key
      * @throws Exception\InvalidArgumentException