Merge pull request zendframework/zendframework#5114 in master

zendframework · Oct 2, 2013 · 54f7675 · 54f7675
commit 54f7675
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 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/Storage/Adapter/RedisTest.php b/test/Storage/Adapter/RedisTest.php
@@ -151,7 +151,7 @@ public function testGetCapabilitiesTtl()
         $redisResource = new RedisResource();
         $redisResource->connect($host, $port);
         $info = $redisResource->info();
-        $majorVersion = (int)$info['redis_version'];
+        $majorVersion = (int) $info['redis_version'];
 
         $this->assertEquals($majorVersion, $this->_options->getResourceManager()->getMajorVersion($this->_options->getResourceId()));