Skip to content

Respect the api version that is being set in the ConfigurationVO #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Respect the api version that is being set in the ConfigurationVO #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54e64f3
Respect the api version that is being set in the ConfigurationVO
skoop Sep 19, 2024
b8546b8
Respect the API version when using OAuth as well
skoop Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MastodonAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function __construct(
private function getResponse(string $endpoint, string $method, array $json, bool $authenticate = true): mixed
{
$uri = $this->config->getBaseUrl() . '/api/';
$uri .= ConfigurationVO::API_VERSION . $endpoint;
$uri .= $this->config->apiVersion . $endpoint;

$allowedMethods = array_column(HttpOperation::cases(), 'name');
if (!in_array($method, $allowedMethods)) {
Expand Down
8 changes: 5 additions & 3 deletions src/MastodonOAuth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ class MastodonOAuth
* Creates the OAuth object from the configuration.
*/
public function __construct(
$client_name = ConfigurationVO::DEFAULT_NAME,
$mastodon_instance = ConfigurationVO::DEFAULT_INSTANCE
string $client_name = ConfigurationVO::DEFAULT_NAME,
string $mastodon_instance = ConfigurationVO::DEFAULT_INSTANCE,
string $redirectUris = ConfigurationVO::DEFAULT_REDIRECT_URIS,
string $api_version = ConfigurationVO::API_VERSION
) {
$this->config = new ConfigurationVO($client_name, $mastodon_instance);
$this->config = new ConfigurationVO($client_name, $mastodon_instance, $redirectUris, $api_version);
$this->client = new Client();
}

Expand Down