Merge branch 'master', remote-tracking branch 'upstream/master'

zendframework · Oct 3, 2013 · ce5f388 · ce5f388
commit ce5f388
Show file tree

Hide file tree

Showing 55 changed files with 9 additions and 102 deletions.
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/Strategy/ClosureStrategy.php b/src/Hydrator/Strategy/ClosureStrategy.php
@@ -33,10 +33,10 @@ 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;
+     *         return (int) $value->id;
      *     },
      *     function($value) {
-     *         return new Category((int)$value);
+     *         return new Category((int) $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/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
@@ -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;

diff --git a/test/HydratorStrategyTest.php b/test/HydratorStrategyTest.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\ClassMethods;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class HydratorStrategyTest extends \PHPUnit_Framework_TestCase

diff --git a/test/HydratorTest.php b/test/HydratorTest.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;
@@ -32,9 +31,6 @@
 
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class HydratorTest extends \PHPUnit_Framework_TestCase

diff --git a/test/MessageTest.php b/test/MessageTest.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\Http;

diff --git a/test/OptionsTest.php b/test/OptionsTest.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/ParametersTest.php b/test/ParametersTest.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/PriorityQueueTest.php b/test/PriorityQueueTest.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\PriorityQueue;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class PriorityQueueTest extends \PHPUnit_Framework_TestCase

diff --git a/test/SignalHandlers/InstanceMethod.php b/test/SignalHandlers/InstanceMethod.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\SignalHandlers;

diff --git a/test/SignalHandlers/Invokable.php b/test/SignalHandlers/Invokable.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\SignalHandlers;

diff --git a/test/SignalHandlers/ObjectCallback.php b/test/SignalHandlers/ObjectCallback.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\SignalHandlers;

diff --git a/test/SignalHandlers/Overloadable.php b/test/SignalHandlers/Overloadable.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\SignalHandlers;

diff --git a/test/SplPriorityQueueTest.php b/test/SplPriorityQueueTest.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\SplPriorityQueue;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class SplPriorityQueueTest extends \PHPUnit_Framework_TestCase

diff --git a/test/SplQueueTest.php b/test/SplQueueTest.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\SplQueue;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class SplQueueTest extends \PHPUnit_Framework_TestCase

diff --git a/test/SplStackTest.php b/test/SplStackTest.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\SplStack;
 
 /**
- * @category   Zend
- * @package    Zend_Stdlib
- * @subpackage UnitTests
  * @group      Zend_Stdlib
  */
 class SplStackTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Strategy/SerializableStrategyTest.php b/test/Strategy/SerializableStrategyTest.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\Strategy;

diff --git a/test/StringUtilsTest.php b/test/StringUtilsTest.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/StringWrapper/CommonStringWrapperTest.php b/test/StringWrapper/CommonStringWrapperTest.php
@@ -5,8 +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
- * @subpackage StringWrapper
  */
 
 namespace ZendTest\Stdlib\StringWrapper;

diff --git a/test/StringWrapper/IconvTest.php b/test/StringWrapper/IconvTest.php
@@ -5,8 +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
- * @subpackage StringWrapper
  */
 
 namespace ZendTest\Stdlib\StringWrapper;

diff --git a/test/StringWrapper/IntlTest.php b/test/StringWrapper/IntlTest.php
@@ -5,8 +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
- * @subpackage StringWrapper
  */
 
 namespace ZendTest\Stdlib\StringWrapper;

diff --git a/test/StringWrapper/MbStringTest.php b/test/StringWrapper/MbStringTest.php
@@ -5,8 +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
- * @subpackage StringWrapper
  */
 
 namespace ZendTest\Stdlib\StringWrapper;

diff --git a/test/StringWrapper/NativeTest.php b/test/StringWrapper/NativeTest.php
@@ -5,8 +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
- * @subpackage StringWrapper
  */
 
 namespace ZendTest\Stdlib\StringWrapper;

diff --git a/test/TestAsset/AggregateObject.php b/test/TestAsset/AggregateObject.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\TestAsset;