Merge branch 'develop'

Prepping for 2.2.0RC1.

src/ArrayObject/PhpLegacyCompatibility.php

@@ -24,10 +24,9 @@ abstract class PhpLegacyCompatibility extends PhpArrayObject
     /**
      * Constructor
      *
-     * @param  array       $input
-     * @param  int         $flags
-     * @param  string      $iteratorClass
-     * @return ArrayObject
+     * @param array  $input
+     * @param int    $flags
+     * @param string $iteratorClass
      */
     public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
     {

src/ArrayObject/PhpReferenceCompatibility.php

@@ -59,10 +59,9 @@ abstract class PhpReferenceCompatibility implements IteratorAggregate, ArrayAcce
     /**
      * Constructor
      *
-     * @param  array       $input
-     * @param  int         $flags
-     * @param  string      $iteratorClass
-     * @return ArrayObject
+     * @param array  $input
+     * @param int    $flags
+     * @param string $iteratorClass
      */
     public function __construct($input = array(), $flags = self::STD_PROP_LIST, $iteratorClass = 'ArrayIterator')
     {
@@ -76,7 +75,7 @@ public function __construct($input = array(), $flags = self::STD_PROP_LIST, $ite
      * Returns whether the requested key exists
      *
      * @param  mixed $key
-     * @return boolean
+     * @return bool
      */
     public function __isset($key)
     {
@@ -279,7 +278,7 @@ public function natsort()
      * Returns whether the requested key exists
      *
      * @param  mixed $key
-     * @return boolean
+     * @return bool
      */
     public function offsetExists($key)
     {

src/ArrayUtils.php

@@ -93,11 +93,11 @@ public static function hasNumericKeys($value, $allowEmpty = false)
      *
      * For example:
      * <code>
-     * $list = array( 'a','b','c','d' );
+     * $list = array('a', 'b', 'c', 'd');
      * $list = array(
      *     0 => 'foo',
      *     1 => 'bar',
-     *     2 => array( 'foo' => 'baz' ),
+     *     2 => array('foo' => 'baz'),
      * );
      * </code>
      *

src/DateTime.php

@@ -11,10 +11,14 @@
 
 use DateTimeZone;
 
+trigger_error('DateTime extension deprecated as of ZF 2.1.4; use the \DateTime constructor to parse extended ISO8601 dates instead', E_USER_DEPRECATED);
+
 /**
  * DateTime
  *
  * An extension of the \DateTime object.
+ *
+ * @deprecated
  */
 class DateTime extends \DateTime
 {

src/ErrorHandler.php

@@ -27,7 +27,7 @@ abstract class ErrorHandler
     /**
      * Check if this error handler is active
      *
-     * @return boolean
+     * @return bool
      */
     public static function started()
     {
@@ -109,7 +109,7 @@ public static function clean()
      */
     public static function addError($errno, $errstr = '', $errfile = '', $errline = 0)
     {
-        $stack = & static::$stack[ count(static::$stack) - 1 ];
+        $stack = & static::$stack[count(static::$stack) - 1];
         $stack = new ErrorException($errstr, 0, $errno, $errfile, $errline, $stack);
     }
 }

src/Glob.php

@@ -9,6 +9,9 @@
 
 namespace Zend\Stdlib;
 
+use Zend\Stdlib\Exception;
+use Zend\Stdlib\ErrorHandler;
+
 /**
  * Wrapper for glob with fallback if GLOB_BRACE is not available.
  */
@@ -31,11 +34,12 @@ abstract class Glob
      *
      * @see    http://docs.php.net/glob
      * @param  string  $pattern
-     * @param  integer $flags
+     * @param  int $flags
      * @param  bool $forceFallback
-     * @return array|false
+     * @return array
+     * @throws Exception\RuntimeException
      */
-    public static function glob($pattern, $flags, $forceFallback = false)
+    public static function glob($pattern, $flags = 0, $forceFallback = false)
     {
         if (!defined('GLOB_BRACE') || $forceFallback) {
             return static::fallbackGlob($pattern, $flags);
@@ -48,8 +52,9 @@ public static function glob($pattern, $flags, $forceFallback = false)
      * Use the glob function provided by the system.
      *
      * @param  string  $pattern
-     * @param  integer $flags
-     * @return array|false
+     * @param  int     $flags
+     * @return array
+     * @throws Exception\RuntimeException
      */
     protected static function systemGlob($pattern, $flags)
     {
@@ -75,15 +80,22 @@ protected static function systemGlob($pattern, $flags)
             $globFlags = 0;
         }
 
-        return glob($pattern, $globFlags);
+        ErrorHandler::start();
+        $res = glob($pattern, $globFlags);
+        $err = ErrorHandler::stop();
+        if ($res === false) {
+            throw new Exception\RuntimeException("glob('{$pattern}', {$globFlags}) failed", 0, $err);
+        }
+        return $res;
     }
 
     /**
      * Expand braces manually, then use the system glob.
      *
      * @param  string  $pattern
-     * @param  integer $flags
-     * @return array|false
+     * @param  int     $flags
+     * @return array
+     * @throws Exception\RuntimeException
      */
     protected static function fallbackGlob($pattern, $flags)
     {
@@ -162,9 +174,9 @@ protected static function fallbackGlob($pattern, $flags)
      * Find the end of the sub-pattern in a brace expression.
      *
      * @param  string  $pattern
-     * @param  integer $begin
-     * @param  integer $flags
-     * @return integer|null
+     * @param  int $begin
+     * @param  int $flags
+     * @return int|null
      */
     protected static function nextBraceSub($pattern, $begin, $flags)
     {

src/Hydrator/AbstractHydrator.php

@@ -102,15 +102,16 @@ public function removeStrategy($name)
     /**
      * Converts a value for extraction. If no strategy exists the plain value is returned.
      *
-     * @param string $name The name of the strategy to use.
-     * @param mixed $value The value that should be converted.
+     * @param  string $name  The name of the strategy to use.
+     * @param  mixed  $value  The value that should be converted.
+     * @param  array  $object The object is optionally provided as context.
      * @return mixed
      */
-    public function extractValue($name, $value)
+    public function extractValue($name, $value, $object = null)
     {
         if ($this->hasStrategy($name)) {
             $strategy = $this->getStrategy($name);
-            $value = $strategy->extract($value);
+            $value = $strategy->extract($value, $object);
         }
         return $value;
     }
@@ -120,13 +121,14 @@ public function extractValue($name, $value)
      *
      * @param string $name The name of the strategy to use.
      * @param mixed $value The value that should be converted.
+     * @param array $data The whole data is optionally provided as context.
      * @return mixed
      */
-    public function hydrateValue($name, $value)
+    public function hydrateValue($name, $value, $data = null)
     {
         if ($this->hasStrategy($name)) {
             $strategy = $this->getStrategy($name);
-            $value = $strategy->hydrate($value);
+            $value = $strategy->hydrate($value, $data);
         }
         return $value;
     }

src/Hydrator/ClassMethods.php

@@ -15,10 +15,10 @@
 use Zend\Stdlib\ArrayUtils;
 use Zend\Stdlib\Hydrator\Filter\FilterComposite;
 use Zend\Stdlib\Hydrator\Filter\FilterProviderInterface;
-use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
 use Zend\Stdlib\Hydrator\Filter\GetFilter;
 use Zend\Stdlib\Hydrator\Filter\HasFilter;
 use Zend\Stdlib\Hydrator\Filter\IsFilter;
+use Zend\Stdlib\Hydrator\Filter\MethodMatchFilter;
 use Zend\Stdlib\Hydrator\Filter\NumberOfParameterFilter;
 
 class ClassMethods extends AbstractHydrator implements HydratorOptionsInterface
@@ -66,7 +66,7 @@ public function setOptions($options)
     }
 
     /**
-     * @param  boolean      $underscoreSeparatedKeys
+     * @param  bool      $underscoreSeparatedKeys
      * @return ClassMethods
      */
     public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
@@ -77,7 +77,7 @@ public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function getUnderscoreSeparatedKeys()
     {
@@ -136,13 +136,15 @@ public function extract($object)
             $attribute = $method;
             if (preg_match('/^get/', $method)) {
                 $attribute = substr($method, 3);
-                $attribute = lcfirst($attribute);
+                if (!property_exists($object, $attribute)) {
+                    $attribute = lcfirst($attribute);
+                }
             }
 
             if ($this->underscoreSeparatedKeys) {
                 $attribute = preg_replace_callback('/([A-Z])/', $transform, $attribute);
             }
-            $attributes[$attribute] = $this->extractValue($attribute, $object->$method());
+            $attributes[$attribute] = $this->extractValue($attribute, $object->$method(), $object);
         }
 
         return $attributes;
@@ -178,13 +180,11 @@ public function hydrate(array $data, $object)
                 $method = preg_replace_callback('/(_[a-z])/', $transform, $method);
             }
             if (is_callable(array($object, $method))) {
-                $value = $this->hydrateValue($property, $value);
-
+                $value = $this->hydrateValue($property, $value, $data);
                 $object->$method($value);
             }
         }
 
         return $object;
     }
-
 }

src/Hydrator/Filter/FilterComposite.php

@@ -96,7 +96,7 @@ function($value, $key) {
      */
     public function addFilter($name, $filter, $condition = self::CONDITION_OR)
     {
-        if ( !is_callable($filter) && !($filter instanceof FilterInterface) ) {
+        if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
             throw new InvalidArgumentException(
                 'The value of ' . $name . ' should be either a callable or ' .
                 'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
@@ -166,13 +166,13 @@ public function filter($property)
         // Check if 1 from the or filters return true
         foreach ($this->orFilter as $filter) {
             if (is_callable($filter)) {
-                if ( $filter($property) === true) {
+                if ($filter($property) === true) {
                     $returnValue = true;
                     break;
                 }
                 continue;
             } else {
-                if ( $filter->filter($property) === true) {
+                if ($filter->filter($property) === true) {
                     $returnValue = true;
                     break;
                 }

src/Hydrator/Filter/NumberOfParameterFilter.php

@@ -9,8 +9,8 @@
 
 namespace Zend\Stdlib\Hydrator\Filter;
 
-use ReflectionMethod;
 use ReflectionException;
+use ReflectionMethod;
 use Zend\Stdlib\Exception\InvalidArgumentException;
 use Zend\Stdlib\Hydrator\Filter\FilterInterface;
 
@@ -39,7 +39,7 @@ public function filter($property)
     {
         try {
             $reflectionMethod = new ReflectionMethod($property);
-        } catch( ReflectionException $exception) {
+        } catch (ReflectionException $exception) {
             throw new InvalidArgumentException(
                 "Method $property doesn't exist"
             );

src/Hydrator/HydratorAwareInterface.php

@@ -0,0 +1,28 @@
+<?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\Hydrator;
+
+interface HydratorAwareInterface
+{
+    /**
+     * Set hydrator
+     *
+     * @param  HydratorInterface $hydrator
+     * @return HydratorAwareInterface
+     */
+    public function setHydrator(HydratorInterface $hydrator);
+
+    /**
+     * Retrieve hydrator
+     *
+     * @return HydratorInterface
+     */
+    public function getHydrator();
+}