From a49a4cd6493d2b2f43e04f1ecdd728726d943e78 Mon Sep 17 00:00:00 2001 From: Szymon Wnuk Date: Sun, 16 Jul 2023 23:20:05 +0200 Subject: [PATCH 1/5] composer init --- .gitignore | 3 +++ composer.json | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 composer.json diff --git a/.gitignore b/.gitignore index 7a45843..f865f49 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Don't include vendor files installed via Composer /src-composer/vendor/ + +/vendor/ +/.idea/ \ No newline at end of file diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..4a6caf0 --- /dev/null +++ b/composer.json @@ -0,0 +1,16 @@ +{ + "name": "mcwnuq/php-bbb-api-wrapper", + "description": "A PHP wrapper for BuiltByBit's Ultimate REST API.", + "authors": [ + { + "name": "Majored" + }, + { + "name": "BuiltByBit" + }, + { + "name": "mcwnuq" + } + ], + "require": {} +} From 4397789051a278ee800e9d67404fde778d008ce2 Mon Sep 17 00:00:00 2001 From: Szymon Wnuk Date: Sun, 16 Jul 2023 23:21:06 +0200 Subject: [PATCH 2/5] fix handleResponse return type --- src/APIWrapper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/APIWrapper.php b/src/APIWrapper.php index 7a9f7e2..bd31289 100644 --- a/src/APIWrapper.php +++ b/src/APIWrapper.php @@ -157,9 +157,9 @@ function delete(string $endpoint): APIResponse { * Handles a CURL response and sets/resets local rate limiting metadata. * * @param int The type of request which the response originated from (RequestType). - * @return string The raw JSON response or null if a rate limit was hit. + * @return string|null The raw JSON response or null if a rate limit was hit. */ - private function handleResponse(int $type): string { + private function handleResponse(int $type): ?string { list($header, $body) = explode("\r\n\r\n", curl_exec($this->http), 2); $status = curl_getinfo($this->http, CURLINFO_HTTP_CODE); $header = APIWrapper::parseHeaders(explode("\r\n", $header)); From 2866d47d6ac6efac9d047839d23ea41b3f6963ad Mon Sep 17 00:00:00 2001 From: Szymon Wnuk Date: Sun, 16 Jul 2023 23:33:46 +0200 Subject: [PATCH 3/5] composer init --- composer.json | 5 +++++ src/APIResponse.php | 3 ++- src/APIToken.php | 10 +--------- src/APIWrapper.php | 8 ++++++++ src/RequestType.php | 12 ++++++++++++ src/Throttler.php | 10 +--------- src/TokenType.php | 12 ++++++++++++ src/helpers/AlertsHelper.php | 4 ++++ src/helpers/ConversationsHelper.php | 4 ++++ src/helpers/MembersHelper.php | 4 ++++ src/helpers/ThreadsHelper.php | 4 ++++ src/helpers/resources/DownloadsHelper.php | 4 ++++ src/helpers/resources/LicensesHelper.php | 4 ++++ src/helpers/resources/PurchasesHelper.php | 4 ++++ src/helpers/resources/ResourcesHelper.php | 4 ++++ src/helpers/resources/ReviewsHelper.php | 4 ++++ src/helpers/resources/UpdatesHelper.php | 4 ++++ src/helpers/resources/VersionsHelper.php | 4 ++++ 18 files changed, 85 insertions(+), 19 deletions(-) create mode 100644 src/RequestType.php create mode 100644 src/TokenType.php diff --git a/composer.json b/composer.json index 4a6caf0..7898ed0 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,11 @@ { "name": "mcwnuq/php-bbb-api-wrapper", "description": "A PHP wrapper for BuiltByBit's Ultimate REST API.", + "autoload": { + "psr-4": { + "Majored\\PhpBbbApiWrapper\\": "src/" + } + }, "authors": [ { "name": "Majored" diff --git a/src/APIResponse.php b/src/APIResponse.php index 0c0e200..003ff4d 100644 --- a/src/APIResponse.php +++ b/src/APIResponse.php @@ -1,6 +1,7 @@ type, $this->value); } } - -/** Holds declarations for different API token types. */ -class TokenType { - /** @var string A string value representing the Private token type. */ - public const PRIVATE = "Private"; - - /** @var string A string value representing the Shared token type. */ - public const SHARED = "Shared"; -} \ No newline at end of file diff --git a/src/APIWrapper.php b/src/APIWrapper.php index bd31289..c2cf39b 100644 --- a/src/APIWrapper.php +++ b/src/APIWrapper.php @@ -1,6 +1,14 @@ Date: Sun, 16 Jul 2023 23:42:15 +0200 Subject: [PATCH 4/5] added license to composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 7898ed0..bbf1642 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name": "mcwnuq/php-bbb-api-wrapper", "description": "A PHP wrapper for BuiltByBit's Ultimate REST API.", + "license": "MIT", "autoload": { "psr-4": { "Majored\\PhpBbbApiWrapper\\": "src/" From 48c7d7c2ecc2219158d37bf3910e13a3e7c92953 Mon Sep 17 00:00:00 2001 From: Szymon Wnuk Date: Sun, 16 Jul 2023 23:51:44 +0200 Subject: [PATCH 5/5] fix --- src/APIWrapper.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/APIWrapper.php b/src/APIWrapper.php index c2cf39b..5e08a1b 100644 --- a/src/APIWrapper.php +++ b/src/APIWrapper.php @@ -10,23 +10,6 @@ use Majored\PhpBbbApiWrapper\Helpers\Resources\ResourcesHelper; use Majored\PhpBbbApiWrapper\Helpers\ThreadsHelper; -require __DIR__ . "/APIToken.php"; -require __DIR__ . "/APIResponse.php"; -require __DIR__ . "/Throttler.php"; - -require __DIR__ . "/helpers/AlertsHelper.php"; -require __DIR__ . "/helpers/ConversationsHelper.php"; -require __DIR__ . "/helpers/MembersHelper.php"; -require __DIR__ . "/helpers/ThreadsHelper.php"; - -require __DIR__ . "/helpers/resources/ResourcesHelper.php"; -require __DIR__ . "/helpers/resources/LicensesHelper.php"; -require __DIR__ . "/helpers/resources/PurchasesHelper.php"; -require __DIR__ . "/helpers/resources/DownloadsHelper.php"; -require __DIR__ . "/helpers/resources/VersionsHelper.php"; -require __DIR__ . "/helpers/resources/UpdatesHelper.php"; -require __DIR__ . "/helpers/resources/ReviewsHelper.php"; - /** The primary class for interactions with BuiltByBit's API. */ class APIWrapper { /** @var string The base URL of BuiltByBit's API that we prepend to endpoints. */