update 2024-01-27
This commit is contained in:
parent
b36508a0bd
commit
ef30723ea9
@ -12,7 +12,7 @@
|
|||||||
namespace VDM\Joomla\Gitea\Utilities;
|
namespace VDM\Joomla\Gitea\Utilities;
|
||||||
|
|
||||||
|
|
||||||
use Joomla\CMS\Http\Response as JoomlaResponse;
|
use Joomla\Http\Response as JoomlaResponse;
|
||||||
use VDM\Joomla\Utilities\JsonHelper;
|
use VDM\Joomla\Utilities\JsonHelper;
|
||||||
use VDM\Joomla\Utilities\StringHelper;
|
use VDM\Joomla\Utilities\StringHelper;
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ final class Response
|
|||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
* @throws \DomainException
|
* @throws \DomainException
|
||||||
**/
|
**/
|
||||||
public function get(JoomlaResponse $response, int $expectedCode = 200, $default = null)
|
public function get($response, int $expectedCode = 200, $default = null)
|
||||||
{
|
{
|
||||||
// Validate the response code.
|
// Validate the response code.
|
||||||
if ($response->code != $expectedCode)
|
if ($response->code != $expectedCode)
|
||||||
@ -62,7 +62,7 @@ final class Response
|
|||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
* @throws \DomainException
|
* @throws \DomainException
|
||||||
**/
|
**/
|
||||||
public function get_(JoomlaResponse $response, array $validate = [200 => null])
|
public function get_($response, array $validate = [200 => null])
|
||||||
{
|
{
|
||||||
// Validate the response code.
|
// Validate the response code.
|
||||||
if (!isset($validate[$response->code]))
|
if (!isset($validate[$response->code]))
|
||||||
@ -86,24 +86,23 @@ final class Response
|
|||||||
* @return mixed
|
* @return mixed
|
||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
**/
|
**/
|
||||||
protected function body(JoomlaResponse $response, $default = null)
|
protected function body($response, $default = null)
|
||||||
{
|
{
|
||||||
// check that we have a body and that its JSON
|
$body = $response->body ?? null;
|
||||||
if (isset($response->body) && StringHelper::check($response->body))
|
// check that we have a body
|
||||||
|
if (StringHelper::check($body))
|
||||||
{
|
{
|
||||||
if (JsonHelper::check($response->body))
|
if (JsonHelper::check($body))
|
||||||
{
|
{
|
||||||
$body = json_decode((string) $response->body);
|
$body = json_decode((string) $body);
|
||||||
|
|
||||||
if (isset($body->content_base64))
|
if (isset($body->content_base64))
|
||||||
{
|
{
|
||||||
$body->content = base64_decode((string) $body->content_base64);
|
$body->content = base64_decode((string) $body->content_base64);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $body;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $response->body;
|
return $body;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default;
|
return $default;
|
||||||
@ -117,7 +116,7 @@ final class Response
|
|||||||
* @return string
|
* @return string
|
||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
**/
|
**/
|
||||||
protected function error(JoomlaResponse $response): string
|
protected function error($response): string
|
||||||
{
|
{
|
||||||
// do we have a json string
|
// do we have a json string
|
||||||
if (isset($response->body) && JsonHelper::check($response->body))
|
if (isset($response->body) && JsonHelper::check($response->body))
|
||||||
@ -140,7 +139,6 @@ final class Response
|
|||||||
}
|
}
|
||||||
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
* @throws \DomainException
|
* @throws \DomainException
|
||||||
**/
|
**/
|
||||||
public function get(JoomlaResponse $response, int $expectedCode = 200, $default = null)
|
public function get($response, int $expectedCode = 200, $default = null)
|
||||||
{
|
{
|
||||||
// Validate the response code.
|
// Validate the response code.
|
||||||
if ($response->code != $expectedCode)
|
if ($response->code != $expectedCode)
|
||||||
@ -36,7 +36,7 @@
|
|||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
* @throws \DomainException
|
* @throws \DomainException
|
||||||
**/
|
**/
|
||||||
public function get_(JoomlaResponse $response, array $validate = [200 => null])
|
public function get_($response, array $validate = [200 => null])
|
||||||
{
|
{
|
||||||
// Validate the response code.
|
// Validate the response code.
|
||||||
if (!isset($validate[$response->code]))
|
if (!isset($validate[$response->code]))
|
||||||
@ -60,24 +60,23 @@
|
|||||||
* @return mixed
|
* @return mixed
|
||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
**/
|
**/
|
||||||
protected function body(JoomlaResponse $response, $default = null)
|
protected function body($response, $default = null)
|
||||||
{
|
{
|
||||||
// check that we have a body and that its JSON
|
$body = $response->body ?? null;
|
||||||
if (isset($response->body) && StringHelper::check($response->body))
|
// check that we have a body
|
||||||
|
if (StringHelper::check($body))
|
||||||
{
|
{
|
||||||
if (JsonHelper::check($response->body))
|
if (JsonHelper::check($body))
|
||||||
{
|
{
|
||||||
$body = json_decode((string) $response->body);
|
$body = json_decode((string) $body);
|
||||||
|
|
||||||
if (isset($body->content_base64))
|
if (isset($body->content_base64))
|
||||||
{
|
{
|
||||||
$body->content = base64_decode((string) $body->content_base64);
|
$body->content = base64_decode((string) $body->content_base64);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $body;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $response->body;
|
return $body;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $default;
|
return $default;
|
||||||
@ -91,7 +90,7 @@
|
|||||||
* @return string
|
* @return string
|
||||||
* @since 3.2.0
|
* @since 3.2.0
|
||||||
**/
|
**/
|
||||||
protected function error(JoomlaResponse $response): string
|
protected function error($response): string
|
||||||
{
|
{
|
||||||
// do we have a json string
|
// do we have a json string
|
||||||
if (isset($response->body) && JsonHelper::check($response->body))
|
if (isset($response->body) && JsonHelper::check($response->body))
|
||||||
@ -114,4 +113,4 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
@ -22,6 +22,6 @@
|
|||||||
"namespace": "VDM\\Joomla\\Gitea\\Utilities.Response",
|
"namespace": "VDM\\Joomla\\Gitea\\Utilities.Response",
|
||||||
"description": "The Gitea Response\r\n\r\n@since 3.2.0",
|
"description": "The Gitea Response\r\n\r\n@since 3.2.0",
|
||||||
"licensing_template": "\/**\r\n * @package Joomla.Component.Builder\r\n *\r\n * @created 4th September, 2022\r\n * @author Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
|
"licensing_template": "\/**\r\n * @package Joomla.Component.Builder\r\n *\r\n * @created 4th September, 2022\r\n * @author Llewellyn van der Merwe <https:\/\/dev.vdm.io>\r\n * @git Joomla Component Builder <https:\/\/git.vdm.dev\/joomla\/Component-Builder>\r\n * @copyright Copyright (C) 2015 Vast Development Method. All rights reserved.\r\n * @license GNU General Public License version 2 or later; see LICENSE.txt\r\n *\/\r\n",
|
||||||
"head": "use Joomla\\CMS\\Http\\Response as JoomlaResponse;",
|
"head": "use Joomla\\Http\\Response as JoomlaResponse;",
|
||||||
"composer": ""
|
"composer": ""
|
||||||
}
|
}
|
@ -52,7 +52,7 @@ final class Http extends JoomlaHttp
|
|||||||
// add the token if given
|
// add the token if given
|
||||||
if (is_string($token))
|
if (is_string($token))
|
||||||
{
|
{
|
||||||
$config['headers']['Authorization'] = 'token ' . $token;
|
$config['headers']['Authorization'] = $token;
|
||||||
$this->_token_ = $token;
|
$this->_token_ = $token;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ final class Http extends JoomlaHttp
|
|||||||
);
|
);
|
||||||
|
|
||||||
// add the token
|
// add the token
|
||||||
$headers['Authorization'] = 'token ' . $token;
|
$headers['Authorization'] = $token;
|
||||||
$this->_token_ = $token;
|
$this->_token_ = $token;
|
||||||
|
|
||||||
$this->setOption('headers', $headers);
|
$this->setOption('headers', $headers);
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
// add the token if given
|
// add the token if given
|
||||||
if (is_string($token))
|
if (is_string($token))
|
||||||
{
|
{
|
||||||
$config['headers']['Authorization'] = 'token ' . $token;
|
$config['headers']['Authorization'] = $token;
|
||||||
$this->_token_ = $token;
|
$this->_token_ = $token;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
// add the token
|
// add the token
|
||||||
$headers['Authorization'] = 'token ' . $token;
|
$headers['Authorization'] = $token;
|
||||||
$this->_token_ = $token;
|
$this->_token_ = $token;
|
||||||
|
|
||||||
$this->setOption('headers', $headers);
|
$this->setOption('headers', $headers);
|
||||||
|
Loading…
Reference in New Issue
Block a user