diff --git a/src/ZM/ConsoleApplication.php b/src/ZM/ConsoleApplication.php index f2edc04e..8fe0346f 100644 --- a/src/ZM/ConsoleApplication.php +++ b/src/ZM/ConsoleApplication.php @@ -28,7 +28,7 @@ use ZM\Exception\InitException; class ConsoleApplication extends Application { - public const VERSION_ID = 437; + public const VERSION_ID = 438; public const VERSION = '2.7.0-beta3'; diff --git a/src/ZM/Http/Response.php b/src/ZM/Http/Response.php index 9cffc63e..28ee8887 100644 --- a/src/ZM/Http/Response.php +++ b/src/ZM/Http/Response.php @@ -56,50 +56,31 @@ class Response /** * @param $name - * @param $value - * @param $expires - * @param $path - * @param $domain - * @param $secure - * @param $httponly - * @param $samesite + * @param mixed ...$params * @return mixed */ - public function cookie($name, $value = null, $expires = null, $path = null, $domain = null, $secure = null, $httponly = null, $samesite = null) + public function cookie($name, ...$params) { - return $this->response->rawcookie($name, $value, $expires, $path, $domain, $secure, $httponly, $samesite); + return empty($params) ? $this->response->rawcookie($name) : $this->response->rawcookie($name, ...$params); } /** - * @param $name - * @param $value - * @param $expires - * @param $path - * @param $domain - * @param $secure - * @param $httponly - * @param $samesite + * @param mixed ...$params + * @param mixed $name * @return mixed */ - public function setCookie($name, $value = null, $expires = null, $path = null, $domain = null, $secure = null, $httponly = null, $samesite = null) + public function setCookie($name, ...$params) { - return $this->response->setCookie($name, $value, $expires, $path, $domain, $secure, $httponly, $samesite); + return empty($params) ? $this->response->rawcookie($name) : $this->response->setCookie($name, ...$params); } /** - * @param $name - * @param $value - * @param $expires - * @param $path - * @param $domain - * @param $secure - * @param $httponly - * @param $samesite + * @param mixed ...$params * @return mixed */ - public function rawcookie($name, $value = null, $expires = null, $path = null, $domain = null, $secure = null, $httponly = null, $samesite = null) + public function rawcookie($name, ...$params) { - return $this->response->rawcookie($name, $value, $expires, $path, $domain, $secure, $httponly, $samesite); + return empty($params) ? $this->response->rawcookie($name) : $this->response->rawcookie($name, ...$params); } /** @@ -107,11 +88,11 @@ class Response * @param $reason * @return mixed */ - public function status($http_code, $reason = null) + public function status($http_code, ...$params) { $this->status_code = $http_code; if (!$this->is_end) { - return $this->response->status($http_code, $reason); + return empty($params) ? $this->response->status($http_code) : $this->response->status($http_code, ...$params); } return false; } @@ -126,10 +107,10 @@ class Response * @param $reason * @return mixed */ - public function setStatusCode($http_code, $reason = null) + public function setStatusCode($http_code, ...$params) { if (!$this->is_end) { - return $this->response->setStatusCode($http_code, $reason); + return empty($params) ? $this->response->status($http_code) : $this->response->status($http_code, ...$params); } return false; }