This commit is contained in:
2021-08-01 15:16:50 +08:00
parent ff1f891ec3
commit ea4e6e9651
3 changed files with 12 additions and 3 deletions
+10
View File
@@ -68,6 +68,16 @@ class HttpHeaders
return $this; return $this;
} }
/**
* @param array $headers
*/
public function setHeaders(array $headers)
{
$this->_headers = $headers;
}
/** /**
* @return array * @return array
*/ */
+1 -1
View File
@@ -429,7 +429,7 @@ class Request extends HttpService
$httpRequest->fd = $request->fd; $httpRequest->fd = $request->fd;
$httpRequest->headers = new HttpHeaders(); $httpRequest->headers = new HttpHeaders();
$httpRequest->headers->addHeaders(array_merge($request->header, $request->server)); $httpRequest->headers->setHeaders(array_merge($request->header, $request->server));
$httpRequest->_uri = $httpRequest->headers->get('request_uri'); $httpRequest->_uri = $httpRequest->headers->get('request_uri');
$httpRequest->_method = $httpRequest->headers->get('request_method'); $httpRequest->_method = $httpRequest->headers->get('request_method');
+1 -2
View File
@@ -21,13 +21,12 @@ class Xml
* @param bool $asArray * @param bool $asArray
* @return array|object * @return array|object
*/ */
public static function toArray($data, $asArray = true): object|array public static function toArray($data, bool $asArray = true): object|array
{ {
$data = simplexml_load_string($data, 'SimpleXMLElement', LIBXML_NOCDATA); $data = simplexml_load_string($data, 'SimpleXMLElement', LIBXML_NOCDATA);
if ($asArray) { if ($asArray) {
return json_decode(json_encode($data), TRUE); return json_decode(json_encode($data), TRUE);
} }
return json_decode(json_encode($data)); return json_decode(json_encode($data));
} }