Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · fab8999 · fab8999
commit fab8999
Show file tree

Hide file tree

Showing 61 changed files with 127 additions and 153 deletions.
diff --git a/src/DispatchableInterface.php b/src/DispatchableInterface.php
@@ -9,17 +9,14 @@
 
 namespace Zend\Stdlib;
 
-use Zend\Stdlib\RequestInterface as Request;
-use Zend\Stdlib\ResponseInterface as Response;
-
 interface DispatchableInterface
 {
     /**
      * Dispatch a request
      *
-     * @param Request $request
-     * @param null|Response $response
+     * @param RequestInterface $request
+     * @param null|ResponseInterface $response
      * @return Response|mixed
      */
-    public function dispatch(Request $request, Response $response = null);
+    public function dispatch(RequestInterface $request, ResponseInterface $response = null);
 }
diff --git a/src/Hydrator/AbstractHydrator.php b/src/Hydrator/AbstractHydrator.php
@@ -149,7 +149,7 @@ public function getFilter()
      *
      * <code>
      * $composite->addFilter("servicelocator",
-     *     function($property) {
+     *     function ($property) {
      *         list($class, $method) = explode('::', $property);
      *         if ($method === 'getServiceLocator') {
      *             return false;

diff --git a/src/Hydrator/ClassMethods.php b/src/Hydrator/ClassMethods.php
@@ -183,7 +183,7 @@ public function hydrate(array $data, $object)
         foreach ($data as $property => $value) {
             $method = 'set' . ucfirst($property);
             if ($this->underscoreSeparatedKeys) {
-                $method = preg_replace_callback('/(_[a-z])/', $transform, $method);
+                $method = preg_replace_callback('/(_[a-z])/i', $transform, $method);
             }
             if (is_callable(array($object, $method))) {
                 $value = $this->hydrateValue($property, $value, $data);

diff --git a/src/Hydrator/Filter/FilterComposite.php b/src/Hydrator/Filter/FilterComposite.php
@@ -41,7 +41,7 @@ class FilterComposite implements FilterInterface
     public function __construct($orFilter = array(), $andFilter = array())
     {
         array_walk($orFilter,
-            function($value, $key) {
+            function ($value, $key) {
                 if (
                     !is_callable($value)
                     && !$value instanceof FilterInterface
@@ -55,7 +55,7 @@ function($value, $key) {
         );
 
         array_walk($andFilter,
-            function($value, $key) {
+            function ($value, $key) {
                 if (
                     !is_callable($value)
                     && !$value instanceof FilterInterface
@@ -79,7 +79,7 @@ function($value, $key) {
      * This example will exclude all methods from the hydration, that starts with 'getService'
      * <code>
      * $composite->addFilter('exclude',
-     *     function($method) {
+     *     function ($method) {
      *         if (preg_match('/^getService/', $method) {
      *             return false;
      *         }

diff --git a/src/Hydrator/Filter/OptionalParametersFilter.php b/src/Hydrator/Filter/OptionalParametersFilter.php
@@ -32,8 +32,8 @@ class OptionalParametersFilter implements FilterInterface
      */
     public function filter($property)
     {
-        if (isset(self::$propertiesCache[$property])) {
-            return self::$propertiesCache[$property];
+        if (isset(static::$propertiesCache[$property])) {
+            return static::$propertiesCache[$property];
         }
 
         try {
@@ -49,6 +49,6 @@ function (ReflectionParameter $parameter) {
             }
         );
 
-        return self::$propertiesCache[$property] = empty($mandatoryParameters);
+        return static::$propertiesCache[$property] = empty($mandatoryParameters);
     }
 }
diff --git a/src/Hydrator/Reflection.php b/src/Hydrator/Reflection.php
@@ -64,8 +64,7 @@ public function hydrate(array $data, $object)
      * Get a reflection properties from in-memory cache and lazy-load if
      * class has not been loaded.
      *
-     * @static
-     * @param string|object $input
+     * @param  string|object $input
      * @throws Exception\InvalidArgumentException
      * @return array
      */
@@ -77,14 +76,17 @@ protected static function getReflProperties($input)
             throw new Exception\InvalidArgumentException('Input must be a string or an object.');
         }
 
-        if (!isset(static::$reflProperties[$input])) {
-            $reflClass      = new ReflectionClass($input);
-            $reflProperties = $reflClass->getProperties();
+        if (isset(static::$reflProperties[$input])) {
+            return static::$reflProperties[$input];
+        }
 
-            foreach ($reflProperties as $property) {
-                $property->setAccessible(true);
-                static::$reflProperties[$input][$property->getName()] = $property;
-            }
+        static::$reflProperties[$input] = array();
+        $reflClass                      = new ReflectionClass($input);
+        $reflProperties                 = $reflClass->getProperties();
+
+        foreach ($reflProperties as $property) {
+            $property->setAccessible(true);
+            static::$reflProperties[$input][$property->getName()] = $property;
         }
 
         return static::$reflProperties[$input];

diff --git a/src/Hydrator/Strategy/ClosureStrategy.php b/src/Hydrator/Strategy/ClosureStrategy.php
@@ -13,7 +13,7 @@ class ClosureStrategy implements StrategyInterface
 {
     /**
      * Function, used in extract method, default:
-     * function($value) {
+     * function ($value) {
      *     return $value;
      * };
      * @var callable
@@ -22,7 +22,7 @@ class ClosureStrategy implements StrategyInterface
 
     /**
      * Function, used in hydrate method, default:
-     * function($value) {
+     * function ($value) {
      *     return $value;
      * };
      * @var callable
@@ -32,11 +32,11 @@ class ClosureStrategy implements StrategyInterface
     /**
      * You can describe how your values will extract and hydrate, like this:
      * $hydrator->addStrategy('category', new ClosureStrategy(
-     *     function(Category $value) {
-     *         return (int)$value->id;
+     *     function (Category $value) {
+     *         return (int) $value->id;
      *     },
-     *     function($value) {
-     *         return new Category((int)$value);
+     *     function ($value) {
+     *         return new Category((int) $value);
      *     }
      * ));
      *
@@ -54,7 +54,7 @@ public function __construct($extractFunc = null, $hydrateFunc = null)
 
             $this->extractFunc = $extractFunc;
         } else {
-            $this->extractFunc = function($value) {
+            $this->extractFunc = function ($value) {
                 return $value;
             };
         }
@@ -66,7 +66,7 @@ public function __construct($extractFunc = null, $hydrateFunc = null)
 
             $this->hydrateFunc = $hydrateFunc;
         } else {
-            $this->hydrateFunc = function($value) {
+            $this->hydrateFunc = function ($value) {
                 return $value;
             };
         }

diff --git a/src/PriorityQueue.php b/src/PriorityQueue.php
@@ -271,15 +271,15 @@ public function hasPriority($priority)
     /**
      * Get the inner priority queue instance
      *
-     * @throws \DomainException
+     * @throws Exception\DomainException
      * @return SplPriorityQueue
      */
     protected function getQueue()
     {
         if (null === $this->queue) {
             $this->queue = new $this->queueClass();
             if (!$this->queue instanceof \SplPriorityQueue) {
-                throw new \DomainException(sprintf(
+                throw new Exception\DomainException(sprintf(
                     'PriorityQueue expects an internal queue of type SplPriorityQueue; received "%s"',
                     get_class($this->queue)
                 ));

diff --git a/test/ArrayObjectTest.php b/test/ArrayObjectTest.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 ZendTest\Stdlib;

diff --git a/test/ArrayUtilsTest.php b/test/ArrayUtilsTest.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 ZendTest\Stdlib;

diff --git a/test/CallbackHandlerTest.php b/test/CallbackHandlerTest.php
@@ -5,17 +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 ZendTest\Stdlib;
 
 use Zend\Stdlib\CallbackHandler;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class CallbackHandlerTest extends \PHPUnit_Framework_TestCase

diff --git a/test/DateTimeTest.php b/test/DateTimeTest.php
@@ -5,17 +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 ZendTest\Stdlib;
 
 use Zend\Stdlib\DateTime;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class DateTimeTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ErrorHandlerTest.php b/test/ErrorHandlerTest.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 ZendTest\Stdlib;

diff --git a/test/FilterTest.php b/test/FilterTest.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_Service
  */
 
 namespace ZendTest\Stdlib;

diff --git a/test/GlobTest.php b/test/GlobTest.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 ZendTest\Stdlib;

diff --git a/test/Hydrator/ReflectionTest.php b/test/Hydrator/ReflectionTest.php
@@ -0,0 +1,47 @@
+<?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 ZendTest\Stdlib\Hydrator;
+
+use stdClass;
+use Zend\Stdlib\Hydrator\Reflection;
+
+/**
+ * Unit tests for {@see \Zend\Stdlib\Hydrator\Reflection}
+ *
+ * @covers \Zend\Stdlib\Hydrator\Reflection
+ * @group Zend_Stdlib
+ */
+class ReflectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Reflection
+     */
+    protected $hydrator;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setUp()
+    {
+        $this->hydrator = new Reflection();
+    }
+
+    public function testCanExtract()
+    {
+        $this->assertSame(array(), $this->hydrator->extract(new stdClass()));
+    }
+
+    public function testCanHydrate()
+    {
+        $object = new stdClass();
+
+        $this->assertSame($object, $this->hydrator->hydrate(array('foo' => 'bar'), $object));
+    }
+}
diff --git a/test/HydratorClosureStrategyTest.php b/test/HydratorClosureStrategyTest.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 ZendTest\Stdlib;
@@ -14,9 +13,6 @@
 use Zend\Stdlib\Hydrator\Strategy\ClosureStrategy;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class HydratorClosureStrategyTest extends \PHPUnit_Framework_TestCase
@@ -77,13 +73,13 @@ public function testRetrieveStrategy()
     public function testExtractingObjects()
     {
         $this->hydrator->addStrategy('field1', new ClosureStrategy(
-            function($value) {
+            function ($value) {
                 return sprintf('%s', $value);
             },
             null
         ));
         $this->hydrator->addStrategy('field2', new ClosureStrategy(
-            function($value) {
+            function ($value) {
                 return sprintf('hello, %s!', $value);
             },
             null
@@ -100,13 +96,13 @@ public function testHydratingObjects()
     {
         $this->hydrator->addStrategy('field2', new ClosureStrategy(
             null,
-            function($value) {
+            function ($value) {
                 return sprintf('hello, %s!', $value);
             }
         ));
         $this->hydrator->addStrategy('field3', new ClosureStrategy(
             null,
-            function($value) {
+            function ($value) {
                 return new TestAsset\HydratorClosureStrategyEntity($value, sprintf('111%s', $value));
             }
         ));
@@ -116,9 +112,9 @@ function($value) {
         $values = $this->hydrator->extract($entity);
         $values['field3'] = 333;
 
-        $this->assertCount(2, (array)$entity);
+        $this->assertCount(2, (array) $entity);
         $this->hydrator->hydrate($values, $entity);
-        $this->assertCount(3, (array)$entity);
+        $this->assertCount(3, (array) $entity);
 
         $this->assertInstanceOf('ZendTest\Stdlib\TestAsset\HydratorClosureStrategyEntity', $entity->field3);
     }

diff --git a/test/HydratorObjectPropertyTest.php b/test/HydratorObjectPropertyTest.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 ZendTest\Stdlib;