Merge remote-tracking branch 'upstream/master'

Conflicts: library/Zend/Soap/Wsdl.php tests/Zend/Soap/Server/DocumentLiteralWrapperTest.php tests/Zend/Soap/WsdlTest.php
zendframework · Jan 25, 2013 · eb57af4 · eb57af4
commit eb57af4
Show file tree

Hide file tree

Showing 67 changed files with 1,905 additions and 852 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-stdlib",
-    "description": "Zend\\Stdlib component",
+    "description": " ",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.23"
+        "php": ">=5.3.3"
     },
     "require-dev": {
         "zendframework/zend-eventmanager": "self.version",
@@ -28,7 +28,8 @@
         "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"
+        "zendframework/zend-filter": "To support naming strategy hydrator usage",
+        "pecl-weakref": "Implementation of weak references for Stdlib\\CallbackHandler"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/Options.php → src/AbstractOptions.php b/src/Options.php → src/AbstractOptions.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -25,14 +15,20 @@
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-abstract class Options implements ParameterObjectInterface
+abstract class AbstractOptions implements ParameterObjectInterface
 {
+    /**
+     * We use the __ prefix to avoid collisions with properties in
+     * user-implementations.
+     *
+     * @var bool
+     */
+    protected $__strictMode__ = true;
+
     /**
      * @param  array|Traversable|null $options
-     * @return Options
+     * @return AbstractOptions
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
@@ -44,6 +40,7 @@ public function __construct($options = null)
 
     /**
      * @param  array|Traversable $options
+     * @throws Exception\InvalidArgumentException
      * @return void
      */
     public function setFromArray($options)
@@ -61,72 +58,70 @@ public function setFromArray($options)
     }
 
     /**
-     * @param string $key name of option with underscore
-     * @return string name of setter method
-     * @throws Exception\BadMethodCallException if setter method is undefined
-     */
-    protected function assembleSetterNameFromKey($key)
-    {
-        $parts = explode('_', $key);
-        $parts = array_map('ucfirst', $parts);
-        $setter = 'set' . implode('', $parts);
-        if (!method_exists($this, $setter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $setter . ' setter method '
-                . 'which must be defined'
-            );
-        }
-        return $setter;
-    }
-
-    /**
-     * @param string $key name of option with underscore
-     * @return string name of getter method
-     * @throws Exception\BadMethodCallException if getter method is undefined
+     * Cast to array
+     *
+     * @return array
      */
-    protected function assembleGetterNameFromKey($key)
+    public function toArray()
     {
-        $parts = explode('_', $key);
-        $parts = array_map('ucfirst', $parts);
-        $getter = 'get' . implode('', $parts);
-        if (!method_exists($this, $getter)) {
-            throw new Exception\BadMethodCallException(
-                'The option "' . $key . '" does not '
-                . 'have a matching ' . $getter . ' getter method '
-                . 'which must be defined'
-            );
+        $array = array();
+        $transform = function ($letters) {
+            $letter = array_shift($letters);
+            return '_' . strtolower($letter);
+        };
+        foreach ($this as $key => $value) {
+            if ($key === '__strictMode__') continue;
+            $normalizedKey = preg_replace_callback('/([A-Z])/', $transform, $key);
+            $array[$normalizedKey] = $value;
         }
-        return $getter;
+        return $array;
     }
 
     /**
      * @see ParameterObject::__set()
      * @param string $key
      * @param mixed $value
+     * @throws Exception\BadMethodCallException
      * @return void
      */
     public function __set($key, $value)
     {
-        $setter = $this->assembleSetterNameFromKey($key);
+        $setter = 'set' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+        if ($this->__strictMode__ && !method_exists($this, $setter)) {
+            throw new Exception\BadMethodCallException(
+                'The option "' . $key . '" does not '
+                . 'have a matching ' . $setter . ' setter method '
+                . 'which must be defined'
+            );
+        } elseif (!$this->__strictMode__ && !method_exists($this, $setter)) {
+            return;
+        }
         $this->{$setter}($value);
     }
 
     /**
      * @see ParameterObject::__get()
      * @param string $key
+     * @throws Exception\BadMethodCallException
      * @return mixed
      */
     public function __get($key)
     {
-        $getter = $this->assembleGetterNameFromKey($key);
+        $getter = 'get' . str_replace(' ', '', ucwords(str_replace('_', ' ', $key)));
+        if (!method_exists($this, $getter)) {
+            throw new Exception\BadMethodCallException(
+                'The option "' . $key . '" does not '
+                . 'have a matching ' . $getter . ' getter method '
+                . 'which must be defined'
+            );
+        }
         return $this->{$getter}();
     }
 
     /**
      * @see ParameterObject::__isset()
      * @param string $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key)
     {
@@ -143,7 +138,7 @@ public function __unset($key)
     {
         try {
             $this->__set($key, null);
-        } catch(\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             throw new Exception\InvalidArgumentException(
                 'The class property $' . $key . ' cannot be unset as'
                     . ' NULL is an invalid value for it',

diff --git a/src/ArraySerializableInterface.php b/src/ArraySerializableInterface.php
@@ -1,44 +1,32 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
 
 /**
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface ArraySerializableInterface
 {
     /**
      * Exchange internal values from provided array
-     * 
-     * @param  array $array 
+     *
+     * @param  array $array
      * @return void
      */
     public function exchangeArray(array $array);
 
     /**
      * Return an array representation of the object
-     * 
+     *
      * @return array
      */
     public function getArrayCopy();

diff --git a/src/ArrayStack.php b/src/ArrayStack.php
@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @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
+ * @package   Zend_Stdlib
  */
 
 namespace Zend\Stdlib;
@@ -28,17 +18,15 @@
  *
  * @category   Zend
  * @package    Zend_Stdlib
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class ArrayStack extends ArrayObject
 {
     /**
      * Retrieve iterator
      *
-     * Retrieve an array copy of the object, reverse its order, and return an 
+     * Retrieve an array copy of the object, reverse its order, and return an
      * ArrayIterator with that reversed array.
-     * 
+     *
      * @return ArrayIterator
      */
     public function getIterator()