zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 15:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix Response class null error (build 438)

Browse Source
This commit is contained in:
crazywhalecc
2022-03-17 20:48:09 +08:00
parent a7f84fb53a
commit db6e63e91c
2 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/ConsoleApplication.php
View File

@@ -28,7 +28,7 @@ use ZM\Exception\InitException;
class ConsoleApplication extends Application class ConsoleApplication extends Application
{ {
public const VERSION_ID = 437; public const VERSION_ID = 438;
public const VERSION = '2.7.0-beta3'; public const VERSION = '2.7.0-beta3';

47
src/ZM/Http/Response.php
View File

@@ -56,50 +56,31 @@ class Response
/** /**
* @param $name * @param $name
* @param $value * @param mixed ...$params
* @param $expires
* @param $path
* @param $domain
* @param $secure
* @param $httponly
* @param $samesite
* @return mixed * @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 mixed ...$params
* @param $value * @param mixed $name
* @param $expires
* @param $path
* @param $domain
* @param $secure
* @param $httponly
* @param $samesite
* @return mixed * @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 mixed ...$params
* @param $value
* @param $expires
* @param $path
* @param $domain
* @param $secure
* @param $httponly
* @param $samesite
* @return mixed * @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 * @param $reason
* @return mixed * @return mixed
*/ */
public function status($http_code, $reason = null) public function status($http_code, ...$params)
{ {
$this->status_code = $http_code; $this->status_code = $http_code;
if (!$this->is_end) { 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; return false;
} }
@@ -126,10 +107,10 @@ class Response
* @param $reason * @param $reason
* @return mixed * @return mixed
*/ */
public function setStatusCode($http_code, $reason = null) public function setStatusCode($http_code, ...$params)
{ {
if (!$this->is_end) { 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; return false;
} }