Merge branch 'cs/zendframework/zendframework#7014-empty-return-instea…

…d-of-null-return' into develop Close zendframework/zendframework#7014
zendframework · Dec 16, 2014 · d20b408 · d20b408
4 parents 858b629 + 1ec6c6d + babe345 + 18732c1
commit d20b408
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/src/Storage/Adapter/AbstractAdapter.php b/src/Storage/Adapter/AbstractAdapter.php
@@ -335,7 +335,7 @@ public function getItem($key, & $success = null, & $casToken = null)
     {
         if (!$this->getOptions()->getReadable()) {
             $success = false;
-            return null;
+            return;
         }
 
         $this->normalizeKey($key);

diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
@@ -221,7 +221,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         $result      = apc_fetch($internalKey, $success);
 
         if (!$success) {
-            return null;
+            return;
         }
 
         $casToken = $result;

diff --git a/src/Storage/Adapter/BlackHole.php b/src/Storage/Adapter/BlackHole.php
@@ -113,7 +113,7 @@ public function getOptions()
     public function getItem($key, & $success = null, & $casToken = null)
     {
         $success = false;
-        return null;
+        return;
     }
 
     /**

diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
@@ -334,7 +334,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
 
         if ($value === false) {
             $success = false;
-            return null;
+            return;
         }
 
         $success = true;

diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
@@ -515,7 +515,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
     {
         if (!$this->internalHasItem($normalizedKey)) {
             $success = false;
-            return null;
+            return;
         }
 
         try {

diff --git a/src/Storage/Adapter/Memcache.php b/src/Storage/Adapter/Memcache.php
@@ -220,7 +220,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         $result = $memc->get($internalKey);
         $success = ($result !== false);
         if ($result === false) {
-            return null;
+            return;
         }
 
         $casToken = $result;

diff --git a/src/Storage/Adapter/Memory.php b/src/Storage/Adapter/Memory.php
@@ -307,7 +307,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         }
 
         if (!$success) {
-            return null;
+            return;
         }
 
         $casToken = $data[0];

diff --git a/src/Storage/Adapter/MongoDb.php b/src/Storage/Adapter/MongoDb.php
@@ -120,7 +120,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
         $success = false;
 
         if (null === $result) {
-            return null;
+            return;
         }
 
         if (isset($result['expires'])) {
@@ -137,7 +137,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
             if ($result['expires']->sec < time()) {
                 $this->internalRemoveItem($key);
 
-                return null;
+                return;
             }
         }
 

diff --git a/src/Storage/Adapter/Redis.php b/src/Storage/Adapter/Redis.php
@@ -153,7 +153,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
 
         if ($value === false) {
             $success = false;
-            return null;
+            return;
         }
 
         $success = true;

diff --git a/src/Storage/Adapter/RedisResourceManager.php b/src/Storage/Adapter/RedisResourceManager.php
@@ -233,14 +233,14 @@ protected function extractPassword($resource, $serverUri)
         }
 
         if (! is_string($serverUri)) {
-            return null;
+            return;
         }
 
         // parse server from URI host{:?port}
         $server = trim($serverUri);
 
         if (strpos($server, '/') === 0) {
-            return null;
+            return;
         }
 
         //non unix domain socket connection

diff --git a/src/Storage/Adapter/Session.php b/src/Storage/Adapter/Session.php
@@ -152,13 +152,13 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
 
         if (!$cntr->offsetExists($ns)) {
             $success = false;
-            return null;
+            return;
         }
 
         $data    = $cntr->offsetGet($ns);
         $success = array_key_exists($normalizedKey, $data);
         if (!$success) {
-            return null;
+            return;
         }
 
         $casToken = $value = $data[$normalizedKey];

diff --git a/test/Storage/Adapter/AbstractAdapterTest.php b/test/Storage/Adapter/AbstractAdapterTest.php
@@ -279,7 +279,7 @@ public function testInternalGetItemsCallsInternalGetItemForEachKey()
                         return $items[$k];
                     } else {
                         $success = false;
-                        return null;
+                        return;
                     }
                 }));
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ public function getOptions() @@
         public function getItem($key, & $success = null, & $casToken = null)
         {
             $success = false;
-            return null;
+            return;
         }
         /**
@@ Expand Down @@