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

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

Hide file tree

Showing 47 changed files with 16 additions and 167 deletions.
diff --git a/src/Storage/Adapter/MemcachedResourceManager.php b/src/Storage/Adapter/MemcachedResourceManager.php
@@ -489,7 +489,7 @@ protected function normalizeServer(& $server)
 
             // array('host' => <host>[, 'port' => <port>[, 'weight' => <weight>]])
             if (!isset($server[0]) && isset($server['host'])) {
-                $host   = (string)$server['host'];
+                $host   = (string) $server['host'];
                 $port   = isset($server['port'])   ? (int) $server['port']   : $port;
                 $weight = isset($server['weight']) ? (int) $server['weight'] : $weight;
             }
@@ -513,7 +513,7 @@ protected function normalizeServer(& $server)
                 $query = null;
                 parse_str($server['query'], $query);
                 if (isset($query['weight'])) {
-                    $weight = (int)$query['weight'];
+                    $weight = (int) $query['weight'];
                 }
             }
         }

diff --git a/src/Storage/Adapter/RedisResourceManager.php b/src/Storage/Adapter/RedisResourceManager.php
@@ -479,7 +479,7 @@ public function setDatabase($id, $database)
     {
         if (!$this->hasResource($id)) {
             return $this->setResource($id, array(
-                'database' => (int)$database,
+                'database' => (int) $database,
             ));
         }
 
@@ -533,7 +533,7 @@ public function getMajorVersion($id)
         }
 
         $resource = & $this->resources[$id];
-        return (int)$resource['version'];
+        return (int) $resource['version'];
     }
 
     /**

diff --git a/src/Storage/Adapter/XCacheOptions.php b/src/Storage/Adapter/XCacheOptions.php
@@ -74,7 +74,7 @@ public function getNamespaceSeparator()
      */
     public function setAdminUser($adminUser)
     {
-        $adminUser = ($adminUser === null) ? null : (string)$adminUser;
+        $adminUser = ($adminUser === null) ? null : (string) $adminUser;
         if ($this->adminUser !== $adminUser) {
             $this->triggerOptionEvent('admin_user', $adminUser);
             $this->adminUser = $adminUser;
@@ -126,7 +126,7 @@ public function getAdminAuth()
      */
     public function setAdminPass($adminPass)
     {
-        $adminPass = ($adminPass === null) ? null : (string)$adminPass;
+        $adminPass = ($adminPass === null) ? null : (string) $adminPass;
         if ($this->adminPass !== $adminPass) {
             $this->triggerOptionEvent('admin_pass', $adminPass);
             $this->adminPass = $adminPass;

diff --git a/test/Pattern/CallbackCacheTest.php b/test/Pattern/CallbackCacheTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
@@ -24,11 +23,11 @@ class TestCallbackCache
 
     public static function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo   'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo   'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public static function emptyMethod() {}
@@ -53,9 +52,6 @@ function bar()
 }
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class CallbackCacheTest extends CommonPatternTest

diff --git a/test/Pattern/CaptureCacheTest.php b/test/Pattern/CaptureCacheTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class CaptureCacheTest extends CommonPatternTest

diff --git a/test/Pattern/ClassCacheTest.php b/test/Pattern/ClassCacheTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
@@ -24,21 +23,18 @@ class TestClassCache
 
     public static function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo 'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo 'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public static function emptyMethod() {}
 
 }
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class ClassCacheTest extends CommonPatternTest

diff --git a/test/Pattern/CommonPatternTest.php b/test/Pattern/CommonPatternTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class CommonPatternTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Pattern/ObjectCacheTest.php b/test/Pattern/ObjectCacheTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
@@ -26,11 +25,11 @@ class TestObjectCache
 
     public function bar()
     {
-        ++self::$fooCounter;
+        ++static::$fooCounter;
         $args = func_get_args();
 
-        echo 'foobar_output('.implode(', ', $args) . ') : ' . self::$fooCounter;
-        return 'foobar_return('.implode(', ', $args) . ') : ' . self::$fooCounter;
+        echo 'foobar_output('.implode(', ', $args) . ') : ' . static::$fooCounter;
+        return 'foobar_return('.implode(', ', $args) . ') : ' . static::$fooCounter;
     }
 
     public function __invoke()
@@ -43,9 +42,6 @@ public function emptyMethod() {}
 }
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class ObjectCacheTest extends CommonPatternTest

diff --git a/test/Pattern/OutputCacheTest.php b/test/Pattern/OutputCacheTest.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_Cache
  */
 
 namespace ZendTest\Cache\Pattern;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class OutputCacheTest extends CommonPatternTest

diff --git a/test/PatternFactoryTest.php b/test/PatternFactoryTest.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_Cache
  */
 
 namespace ZendTest\Cache;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class PatternFactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Service/StorageCacheAbstractServiceFactoryTest.php b/test/Service/StorageCacheAbstractServiceFactoryTest.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_Cache
  */
 
 namespace ZendTest\Cache\Service;
@@ -14,9 +13,6 @@
 use Zend\ServiceManager\ServiceManager;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class StorageCacheAbstractServiceFactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Service/StorageCacheFactoryTest.php b/test/Service/StorageCacheFactoryTest.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_Cache
  */
 
 namespace ZendTest\Cache\Service;
@@ -14,9 +13,6 @@
 use Zend\ServiceManager\ServiceManager;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class StorageCacheFactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Storage/Adapter/AbstractAdapterTest.php b/test/Storage/Adapter/AbstractAdapterTest.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
@@ -14,9 +13,6 @@
 use Zend\Cache\Exception;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class AbstractAdapterTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Storage/Adapter/AbstractDbaTest.php b/test/Storage/Adapter/AbstractDbaTest.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 abstract class AbstractDbaTest extends CommonAdapterTest

diff --git a/test/Storage/Adapter/AbstractZendServerTest.php b/test/Storage/Adapter/AbstractZendServerTest.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
@@ -14,9 +13,6 @@
 use Zend\Cache\Storage\Adapter\AbstractZendServer;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class AbstractZendServerTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Storage/Adapter/ApcTest.php b/test/Storage/Adapter/ApcTest.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class ApcTest extends CommonAdapterTest

diff --git a/test/Storage/Adapter/CommonAdapterTest.php b/test/Storage/Adapter/CommonAdapterTest.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
@@ -29,9 +28,6 @@
  */
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 abstract class CommonAdapterTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Storage/Adapter/DbaDb2Test.php b/test/Storage/Adapter/DbaDb2Test.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class DbaDb2Test extends AbstractDbaTest

diff --git a/test/Storage/Adapter/DbaDb3Test.php b/test/Storage/Adapter/DbaDb3Test.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_Cache
  */
 
 namespace ZendTest\Cache\Storage\Adapter;
 
 use Zend\Cache;
 
 /**
- * @category   Zend
- * @package    Zend_Cache
- * @subpackage UnitTests
  * @group      Zend_Cache
  */
 class DbaDb3Test extends AbstractDbaTest