Merge branch 'hotfix/3286'

Close zendframework/zendframework#3286

Author: weierophinney

src/Client/Cookies.php

@@ -237,9 +237,9 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
                     throw new Exception\InvalidArgumentException("Invalid value passed for \$ret_as: {$ret_as}");
                     break;
             }
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**

src/Cookies.php

@@ -214,9 +214,9 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
                     throw new Exception\InvalidArgumentException("Invalid value passed for \$ret_as: {$ret_as}");
                     break;
             }
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**

src/Header/SetCookie.php

@@ -473,9 +473,9 @@ public function isExpired($now = null)
 
         if (is_int($this->expires) && $this->expires < $now) {
             return true;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**