Tweak a Stringy method to have a more sensible return type

This commit is contained in:
Timothy Warren 2023-06-28 14:03:15 -04:00
parent 5242b95a0e
commit 8e7273fa18
2 changed files with 18 additions and 18 deletions

View File

@ -14,8 +14,10 @@
namespace Aviat\AnimeClient\API;
// use Amp\Http\Client\Form;
use Amp\Http\Client\Body\FormBody;
use Amp\Http\Client\HttpClientBuilder;
use Amp\Http\Client\HttpException;
use Amp\Http\Client\Request;
use Aviat\Ion\Json;
@ -203,18 +205,15 @@ abstract class APIRequestBuilder
{
$this->buildUri();
if ($this->logger !== NULL)
{
$this->logger->debug('API Request', [
'request_url' => $this->request->getUri(),
'request_headers' => $this->request->getHeaders(),
'request_body' => wait(
$this->request->getBody()
->createBodyStream()
->read()
),
]);
}
$this->logger?->debug('API Request', [
'request_url' => $this->request->getUri(),
'request_headers' => $this->request->getHeaders(),
'request_body' => wait(
$this->request->getBody()
->createBodyStream()
->read()
),
]);
return $this->request;
}
@ -222,12 +221,11 @@ abstract class APIRequestBuilder
/**
* Get the data from the response of the passed request
*
* @throws Error
* @throws Throwable
* @throws TypeError
* @param Request $request
* @return mixed
* @throws Throwable
*/
public function getResponseData(Request $request)
public function getResponseData(Request $request): mixed
{
$response = getResponse($request);

View File

@ -2122,7 +2122,7 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess
* Alias for mb_regex_encoding which default to a noop if the mbstring
* module is not installed.
*/
protected function regexEncoding(): mixed
protected function regexEncoding(): string|bool|null
{
static $functionExists;
@ -2137,6 +2137,8 @@ abstract class Stringy implements Countable, IteratorAggregate, ArrayAccess
return mb_regex_encoding(...$args);
}
return null;
}
protected function supportsEncoding(): bool|null