Merge remote-tracking branch 'upstream/master'

composer.json

@@ -28,13 +28,12 @@
         "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
         "zendframework/zend-serializer": "Zend\\Serializer component",
         "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
-        "zendframework/zend-filter": "To support naming strategy hydrator usage",
-        "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler"
+        "zendframework/zend-filter": "To support naming strategy hydrator usage"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.2-dev",
+            "dev-develop": "2.3-dev"
         }
     },
     "autoload-dev": {

src/AbstractOptions.php

@@ -3,19 +3,14 @@
  * Zend Framework (http://framework.zend.com/)
  *
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
 
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 abstract class AbstractOptions implements ParameterObjectInterface
 {
     /**
@@ -27,9 +22,9 @@ abstract class AbstractOptions implements ParameterObjectInterface
     protected $__strictMode__ = true;
 
     /**
+     * Constructor
+     *
      * @param  array|Traversable|null $options
-     * @return AbstractOptions
-     * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
     {
@@ -39,22 +34,30 @@ public function __construct($options = null)
     }
 
     /**
-     * @param  array|Traversable $options
+     * Set one or more configuration properties
+     *
+     * @param  array|Traversable|AbstractOptions $options
      * @throws Exception\InvalidArgumentException
-     * @return void
+     * @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;
     }
 
     /**
@@ -78,6 +81,8 @@ public function toArray()
     }
 
     /**
+     * Set a configuration property
+     *
      * @see ParameterObject::__set()
      * @param string $key
      * @param mixed $value
@@ -100,6 +105,8 @@ public function __set($key, $value)
     }
 
     /**
+     * Get a configuration property
+     *
      * @see ParameterObject::__get()
      * @param string $key
      * @throws Exception\BadMethodCallException
@@ -115,30 +122,34 @@ public function __get($key)
                 . 'which must be defined'
             );
         }
+
         return $this->{$getter}();
     }
 
     /**
+     * Test if a configuration property is null
      * @see ParameterObject::__isset()
      * @param string $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key)
     {
         return null !== $this->__get($key);
     }
 
     /**
+     * Set a configuration property to NULL
+     *
      * @see ParameterObject::__unset()
      * @param string $key
-     * @return void
      * @throws Exception\InvalidArgumentException
+     * @return void
      */
     public function __unset($key)
     {
         try {
             $this->__set($key, null);
-        } catch (\InvalidArgumentException $e) {
+        } catch (Exception\BadMethodCallException $e) {
             throw new Exception\InvalidArgumentException(
                 'The class property $' . $key . ' cannot be unset as'
                     . ' NULL is an invalid value for it',

src/ArrayObject.php

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib;
+
+/**
+ * If the version is less than 5.3.4, we'll use Zend\Stdlib\ArrayObject\PhpLegacyCompatibility
+ * which extends the native PHP ArrayObject implementation. For versions greater than or equal
+ * to 5.3.4, we'll use Zend\Stdlib\ArrayObject\PhpReferenceCompatibility, which corrects
+ * issues with how PHP handles references inside ArrayObject.
+ *
+ * class_alias is a global construct, so we can alias either one to Zend\Stdlib\ArrayObject,
+ * and from this point forward, that alias will be used.
+ */
+if (version_compare(PHP_VERSION, '5.3.4', 'lt')) {
+    class_alias('Zend\Stdlib\ArrayObject\PhpLegacyCompatibility', 'Zend\Stdlib\AbstractArrayObject');
+} else {
+    class_alias('Zend\Stdlib\ArrayObject\PhpReferenceCompatibility', 'Zend\Stdlib\AbstractArrayObject');
+}
+
+/**
+ * Custom framework ArrayObject implementation
+ *
+ * Extends version-specific "abstract" implementation.
+ */
+class ArrayObject extends AbstractArrayObject
+{
+}

src/ArrayObject/PhpLegacyCompatibility.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Stdlib\ArrayObject;
+
+use ArrayObject as PhpArrayObject;
+
+/**
+ * ArrayObject
+ *
+ * Since we need to substitute an alternate ArrayObject implementation for
+ * versions > 5.3.3, we need to provide a stub for 5.3.3. This stub
+ * simply extends the PHP ArrayObject implementation, and provides default
+ * behavior in the constructor.
+ */
+abstract class PhpLegacyCompatibility extends PhpArrayObject
+{
+    /**
+     * Constructor
+     *
+     * @param array  $input
+     * @param int    $flags
+     * @param string $iteratorClass
+     */
+    public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
+    {
+        parent::__construct($input, $flags, $iteratorClass);
+    }
+}