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

…d-of-null-return' into develop Close zendframework/zendframework#7014
zendframework · Dec 16, 2014 · 9eb9d28 · 9eb9d28
2 parents 3490a26 + 80d18d3
commit 9eb9d28
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -1409,6 +1409,6 @@ public static function encodeAuthHeader($user, $password, $type = self::AUTH_BAS
 
         }
 
-        return null;
+        return;
     }
 }
diff --git a/src/Cookies.php b/src/Cookies.php
@@ -277,7 +277,7 @@ protected function _flattenCookiesArray($ptr, $retAs = self::COOKIE_OBJECT)
             }
         }
 
-        return null;
+        return;
     }
 
     /**

diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -216,7 +216,7 @@ public function getCharset()
         if (isset($this->parameters['charset'])) {
             return $this->parameters['charset'];
         }
-        return null;
+        return;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
             }
-            return null;
+            return;
         }
     }