Merge branch 'develop'

Preparing to tag 2.1.0 -- all new features from develop are now merged to master.
zendframework · Jan 29, 2013 · eb61c8f · eb61c8f
commit eb61c8f
Show file tree

Hide file tree

Showing 76 changed files with 3,686 additions and 244 deletions.
diff --git a/src/AbstractOptions.php b/src/AbstractOptions.php
@@ -5,17 +5,12 @@
  * @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;
 
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 abstract class AbstractOptions implements ParameterObjectInterface
 {
     /**
@@ -28,8 +23,6 @@ abstract class AbstractOptions implements ParameterObjectInterface
 
     /**
      * @param  array|Traversable|null $options
-     * @return AbstractOptions
-     * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)
     {
@@ -41,7 +34,7 @@ public function __construct($options = null)
     /**
      * @param  array|Traversable $options
      * @throws Exception\InvalidArgumentException
-     * @return void
+     * @return AbstractOptions Provides fluent interface
      */
     public function setFromArray($options)
     {
@@ -55,6 +48,7 @@ public function setFromArray($options)
         foreach ($options as $key => $value) {
             $this->__set($key, $value);
         }
+        return $this;
     }
 
     /**
@@ -115,6 +109,7 @@ public function __get($key)
                 . 'which must be defined'
             );
         }
+
         return $this->{$getter}();
     }
 
@@ -131,14 +126,14 @@ public function __isset($key)
     /**
      * @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',

diff --git a/src/ArraySerializableInterface.php b/src/ArraySerializableInterface.php
@@ -5,15 +5,10 @@
  * @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
- */
 interface ArraySerializableInterface
 {
     /**

diff --git a/src/ArrayStack.php b/src/ArrayStack.php
@@ -5,7 +5,6 @@
  * @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;
@@ -15,9 +14,6 @@
 
 /**
  * ArrayObject that acts as a stack with regards to iteration
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class ArrayStack extends ArrayObject
 {

diff --git a/src/ArrayUtils.php b/src/ArrayUtils.php
@@ -5,7 +5,6 @@
  * @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;
@@ -16,9 +15,6 @@
  * Utility class for testing and manipulation of PHP arrays.
  *
  * Declared abstract, as we have no need for instantiation.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 abstract class ArrayUtils
 {
@@ -164,6 +160,36 @@ public static function isHashTable($value, $allowEmpty = false)
         return (array_values($value) !== $value);
     }
 
+    /**
+     * Checks if a value exists in an array.
+     *
+     * Due to "foo" == 0 === TRUE with in_array when strict = false, an option
+     * has been added to prevent this. When $strict = 0/false, the most secure
+     * non-strict check is implemented. if $strict = -1, the default in_array
+     * non-strict behaviour is used.
+     *
+     * @param mixed $needle
+     * @param array $haystack
+     * @param int|bool $strict
+     * @return bool
+     */
+    public static function inArray($needle, array $haystack, $strict = false)
+    {
+        if (!$strict) {
+            if (is_int($needle) || is_float($needle)) {
+                $needle = (string) $needle;
+            }
+            if (is_string($needle)) {
+                foreach ($haystack as &$h) {
+                    if (is_int($h) || is_float($h)) {
+                        $h = (string) $h;
+                    }
+                }
+            }
+        }
+        return in_array($needle, $haystack, $strict);
+    }
+
     /**
      * Convert an iterator to an array.
      *

diff --git a/src/CallbackHandler.php b/src/CallbackHandler.php
@@ -5,7 +5,6 @@
  * @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;
@@ -20,9 +19,6 @@
  * A handler for a event, event, filterchain, etc. Abstracts PHP callbacks,
  * primarily to allow for lazy-loading and ensuring availability of default
  * arguments (currying).
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class CallbackHandler
 {

diff --git a/src/DateTime.php b/src/DateTime.php
@@ -5,7 +5,6 @@
  * @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;
@@ -16,9 +15,6 @@
  * DateTime
  *
  * An extension of the \DateTime object.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 class DateTime extends \DateTime
 {

diff --git a/src/DispatchableInterface.php b/src/DispatchableInterface.php
@@ -5,18 +5,13 @@
  * @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;
 
 use Zend\Stdlib\RequestInterface as Request;
 use Zend\Stdlib\ResponseInterface as Response;
 
-/**
- * @category   Zend
- * @package    Zend_Stdlib
- */
 interface DispatchableInterface
 {
     /**

diff --git a/src/ErrorHandler.php b/src/ErrorHandler.php
@@ -5,7 +5,6 @@
  * @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;
@@ -15,84 +14,92 @@
 /**
  * ErrorHandler that can be used to catch internal PHP errors
  * and convert to a ErrorException instance.
- *
- * @category   Zend
- * @package    Zend_Stdlib
  */
 abstract class ErrorHandler
 {
     /**
-     * Flag to mark started
+     * Active stack
      *
-     * @var bool
+     * @var array
      */
-    protected static $started = false;
+    protected static $stack = array();
 
     /**
-     * All errors as one instance of ErrorException
-     * using the previous exception support.
+     * Check if this error handler is active
      *
-     * @var null|ErrorException
+     * @return boolean
      */
-    protected static $errorException = null;
+    public static function started()
+    {
+        return (bool) static::getNestedLevel();
+    }
 
     /**
-     * If the error handler has been started.
+     * Get the current nested level
      *
-     * @return bool
+     * @return int
      */
-    public static function started()
+    public static function getNestedLevel()
     {
-        return static::$started;
+        return count(static::$stack);
     }
 
     /**
      * Starting the error handler
      *
      * @param int $errorLevel
-     * @throws Exception\LogicException If already started
      */
     public static function start($errorLevel = \E_WARNING)
     {
-        if (static::started() === true) {
-            throw new Exception\LogicException('ErrorHandler already started');
+        if (!static::$stack) {
+            set_error_handler(array(get_called_class(), 'addError'), $errorLevel);
         }
 
-        static::$started        = true;
-        static::$errorException = null;
-
-        set_error_handler(array(get_called_class(), 'addError'), $errorLevel);
+        static::$stack[] = null;
     }
 
     /**
      * Stopping the error handler
      *
      * @param  bool $throw Throw the ErrorException if any
      * @return null|ErrorException
-     * @throws Exception\LogicException If not started before
      * @throws ErrorException If an error has been catched and $throw is true
      */
     public static function stop($throw = false)
     {
-        if (static::started() === false) {
-            throw new Exception\LogicException('ErrorHandler not started');
-        }
+        $errorException = null;
 
-        $errorException = static::$errorException;
+        if (static::$stack) {
+            $errorException = array_pop(static::$stack);
 
-        static::$started        = false;
-        static::$errorException = null;
-        restore_error_handler();
+            if (!static::$stack) {
+                restore_error_handler();
+            }
 
-        if ($errorException && $throw) {
-            throw $errorException;
+            if ($errorException && $throw) {
+                throw $errorException;
+            }
         }
 
         return $errorException;
     }
 
     /**
-     * Add an error to the stack.
+     * Stop all active handler
+     *
+     * @return void
+     */
+    public static function clean()
+    {
+        if (static::$stack) {
+            restore_error_handler();
+        }
+
+        static::$stack = array();
+    }
+
+    /**
+     * Add an error to the stack
      *
      * @param int    $errno
      * @param string $errstr
@@ -102,6 +109,7 @@ public static function stop($throw = false)
      */
     public static function addError($errno, $errstr = '', $errfile = '', $errline = 0)
     {
-        static::$errorException = new ErrorException($errstr, 0, $errno, $errfile, $errline, static::$errorException);
+        $stack = & static::$stack[ count(static::$stack) - 1 ];
+        $stack = new ErrorException($errstr, 0, $errno, $errfile, $errline, $stack);
     }
 }
diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -5,17 +5,12 @@
  * @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\Exception;
 
 /**
  * Bad method call exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {

diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -5,17 +5,12 @@
  * @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\Exception;
 
 /**
  * Domain exception
- *
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage Exception
  */
 class DomainException extends \DomainException implements ExceptionInterface
 {