From 5c8fd580adae2293177263a99ec91950061abfb1 Mon Sep 17 00:00:00 2001 From: abdulmohsen Date: Wed, 6 Mar 2024 00:13:32 +0300 Subject: [PATCH] followup for api_response changes. --- src/API/Backends/Index.php | 2 +- src/API/Backends/View.php | 2 +- src/API/History/Index.php | 2 +- src/API/History/View.php | 2 +- src/API/System/Env.php | 2 +- src/API/Tasks/Index.php | 2 +- src/Libs/Initializer.php | 16 ++++++++-------- src/Libs/helpers.php | 3 ++- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/API/Backends/Index.php b/src/API/Backends/Index.php index def312ec..916ad3c1 100644 --- a/src/API/Backends/Index.php +++ b/src/API/Backends/Index.php @@ -48,7 +48,7 @@ final class Index $response['backends'][] = $backend; } - return api_response(HTTP_STATUS::HTTP_OK, $response, []); + return api_response(HTTP_STATUS::HTTP_OK, $response); } public static function getBackends(string|null $name = null, bool $blacklist = false): array diff --git a/src/API/Backends/View.php b/src/API/Backends/View.php index dbee4781..5705dd5f 100644 --- a/src/API/Backends/View.php +++ b/src/API/Backends/View.php @@ -36,7 +36,7 @@ final class View ], ]; - return api_response(HTTP_STATUS::HTTP_OK, ['backend' => $response], []); + return api_response(HTTP_STATUS::HTTP_OK, ['backend' => $response]); } } diff --git a/src/API/History/Index.php b/src/API/History/Index.php index 632c2566..e310a987 100644 --- a/src/API/History/Index.php +++ b/src/API/History/Index.php @@ -314,6 +314,6 @@ final class Index $response['history'][] = $item; } - return api_response(HTTP_STATUS::HTTP_OK, $response, []); + return api_response(HTTP_STATUS::HTTP_OK, $response); } } diff --git a/src/API/History/View.php b/src/API/History/View.php index 61ec347c..13a1fd84 100644 --- a/src/API/History/View.php +++ b/src/API/History/View.php @@ -46,6 +46,6 @@ final readonly class View ], ]; - return api_response(HTTP_STATUS::HTTP_OK, ['history' => $item], []); + return api_response(HTTP_STATUS::HTTP_OK, ['history' => $item]); } } diff --git a/src/API/System/Env.php b/src/API/System/Env.php index 502fca6f..5753fe99 100644 --- a/src/API/System/Env.php +++ b/src/API/System/Env.php @@ -71,6 +71,6 @@ final class Env ]; } - return api_response(HTTP_STATUS::HTTP_OK, $response, []); + return api_response(HTTP_STATUS::HTTP_OK, $response); } } diff --git a/src/API/Tasks/Index.php b/src/API/Tasks/Index.php index 1cd0e9b6..8aabf20e 100644 --- a/src/API/Tasks/Index.php +++ b/src/API/Tasks/Index.php @@ -41,7 +41,7 @@ final class Index $response['tasks'][] = $task; } - return api_response(HTTP_STATUS::HTTP_OK, $response, []); + return api_response(HTTP_STATUS::HTTP_OK, $response); } public static function formatTask(array $task): array diff --git a/src/Libs/Initializer.php b/src/Libs/Initializer.php index 45286964..1bb490a1 100644 --- a/src/Libs/Initializer.php +++ b/src/Libs/Initializer.php @@ -243,12 +243,12 @@ final class Initializer // -- health endpoint. if (true === str_starts_with($requestPath, '/healthcheck')) { - return api_response(HTTP_STATUS::HTTP_OK, []); + return api_response(HTTP_STATUS::HTTP_OK); } // -- favicon endpoint. if (true === str_starts_with($requestPath, '/favicon.ico')) { - return api_response(HTTP_STATUS::HTTP_NO_CONTENT, []); + return api_response(HTTP_STATUS::HTTP_NO_CONTENT); } // -- Forward requests to API server. @@ -269,7 +269,7 @@ final class Initializer 'headers' => $request->getHeaders(), 'query' => $request->getQueryParams(), ], true); - return api_response(HTTP_STATUS::HTTP_UNAUTHORIZED, []); + return api_response(HTTP_STATUS::HTTP_UNAUTHORIZED); } $validUser = $validUUid = null; @@ -371,7 +371,7 @@ final class Initializer } $this->write($request, $loglevel ?? Level::Error, $message, ['messages' => $log]); - return api_response(HTTP_STATUS::HTTP_UNAUTHORIZED, []); + return api_response(HTTP_STATUS::HTTP_UNAUTHORIZED); } // -- sanity check in case user has both import.enabled and options.IMPORT_METADATA_ONLY enabled. @@ -388,7 +388,7 @@ final class Initializer 'backend' => $class->getName() ]); - return api_response(HTTP_STATUS::HTTP_NOT_ACCEPTABLE, []); + return api_response(HTTP_STATUS::HTTP_NOT_ACCEPTABLE); } $entity = $class->parseWebhook($request); @@ -412,7 +412,7 @@ final class Initializer ] ); - return api_response(HTTP_STATUS::HTTP_NOT_MODIFIED, []); + return api_response(HTTP_STATUS::HTTP_NOT_MODIFIED); } if ((0 === (int)$entity->episode || null === $entity->season) && $entity->isEpisode()) { @@ -431,7 +431,7 @@ final class Initializer ] ); - return api_response(HTTP_STATUS::HTTP_NOT_MODIFIED, []); + return api_response(HTTP_STATUS::HTTP_NOT_MODIFIED); } $cache = Container::get(CacheInterface::class); @@ -471,7 +471,7 @@ final class Initializer ] ]); - return api_response(HTTP_STATUS::HTTP_OK, []); + return api_response(HTTP_STATUS::HTTP_OK); } /** diff --git a/src/Libs/helpers.php b/src/Libs/helpers.php index f81a2db6..9e8d008f 100644 --- a/src/Libs/helpers.php +++ b/src/Libs/helpers.php @@ -1055,11 +1055,12 @@ if (false === function_exists('isValidURL')) { * @param string $url The URL to validate. * * @return bool True if the URL is valid, false otherwise. + * @noinspection PhpArgumentWithoutNamedIdentifierInspection */ function isValidURL(string $url): bool { // RFC 3987 For absolute IRIs (internationalized): - /** @noinspection PhpArgumentWithoutNamedIdentifierInspection */ + /** @SuppressWarnings */ return (bool)@preg_match( '/^[a-z](?:[-a-z0-9\+\.])*:(?:\/\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:])*@)?(?:\[(?:(?:(?:[0-9a-f]{1,4}:){6}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|::(?:[0-9a-f]{1,4}:){5}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:[0-9a-f]{1,4}:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3})|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|v[0-9a-f]+[-a-z0-9\._~!\$&\'\(\)\*\+,;=:]+)\]|(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(?:\.(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}|(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=@])*)(?::[0-9]*)?(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@]))*)*|\/(?:(?:(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@]))+)(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@]))*)*)?|(?:(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@]))+)(?:\/(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@]))*)*|(?!(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@])))(?:\?(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@])|[\x{E000}-\x{F8FF}\x{F0000}-\x{FFFFD}|\x{100000}-\x{10FFFD}\/\?])*)?(?:\#(?:(?:%[0-9a-f][0-9a-f]|[-a-z0-9\._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!\$&\'\(\)\*\+,;=:@])|[\/\?])*)?$/iu', $url