Merge branch 'hotfix/4098' into develop

Close zendframework/zendframework#4098

Author: weierophinney

src/Client.php

@@ -1004,7 +1004,7 @@ public function removeFileUpload($filename)
      *
      * @param   string $domain
      * @param   string $path
-     * @param   boolean $secure
+     * @param   bool $secure
      * @return  Header\Cookie|bool
      */
     protected function prepareCookies($domain, $path, $secure)

src/Header/SetCookie.php

@@ -512,9 +512,9 @@ public function isValidForRequest($requestDomain, $path, $isSecure = false)
      * Checks whether the cookie should be sent or not in a specific scenario
      *
      * @param string|Zend\Uri\Uri $uri URI to check against (secure, domain, path)
-     * @param boolean $matchSessionCookies Whether to send session cookies
+     * @param bool $matchSessionCookies Whether to send session cookies
      * @param int $now Override the current time when checking for expiry time
-     * @return boolean
+     * @return bool
      */
     public function match($uri, $matchSessionCookies = true, $now = null)
     {
@@ -554,7 +554,7 @@ public function match($uri, $matchSessionCookies = true, $now = null)
      * @param  string $cookieDomain
      * @param  string $host
      *
-     * @return boolean
+     * @return bool
      */
     public static function matchCookieDomain($cookieDomain, $host)
     {
@@ -580,7 +580,7 @@ public static function matchCookieDomain($cookieDomain, $host)
      *
      * @param  string $cookiePath
      * @param  string $path
-     * @return boolean
+     * @return bool
      */
     public static function matchCookiePath($cookiePath, $path)
     {