Transform ApiResponse::unspported() into dynamic method

diff --git a/src/Module/Api/ApiResponse.php b/src/Module/Api/ApiResponse.php
index d09cfe3bc514f9471f9c6ae89e84684cbc8fac80..5f7e4e51fbb610802e8784b8d57a847e74633558 100644 (file)
--- a/src/Module/Api/ApiResponse.php
+++ b/src/Module/Api/ApiResponse.php
@@ -6,7 +6,6 @@ use Friendica\App\Arguments;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\DI;
 use Friendica\Object\Api\Mastodon\Error;
 use Friendica\Util\Arrays;
 use Friendica\Util\HTTPInputData;
@@ -199,9 +198,9 @@ class ApiResponse
         * @return void
         * @throws \Exception
         */
-       public static function unsupported(string $method = 'all')
+       public function unsupported(string $method = 'all')
        {
-               $path = DI::args()->getQueryString();
+               $path = $this->args->getQueryString();
                Logger::info('Unimplemented API call',
                        [
                                'method'  => $method,
@@ -209,8 +208,8 @@ class ApiResponse
                                'agent'   => $_SERVER['HTTP_USER_AGENT'] ?? '',
                                'request' => HTTPInputData::process()
                        ]);
-               $error             = DI::l10n()->t('API endpoint %s %s is not implemented', strtoupper($method), $path);
-               $error_description = DI::l10n()->t('The API endpoint is currently not implemented but might be in the future.');
+               $error             = $this->l10n->t('API endpoint %s %s is not implemented', strtoupper($method), $path);
+               $error_description = $this->l10n->t('The API endpoint is currently not implemented but might be in the future.');
                $errorobj          = new Error($error, $error_description);
                System::jsonError(501, $errorobj->toArray());
        }

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index ccd2e903c08be497635eae80d1263ee307a92255..449e26fb96e040c903c1f13202524350c83b4dd8 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -23,7 +23,7 @@ namespace Friendica\Module\Api\Mastodon\Accounts;
 
 use Friendica\App\Router;
 use Friendica\Core\Logger;
-use Friendica\Module\Api\ApiResponse;
+use Friendica\DI;
 use Friendica\Module\BaseApi;
 use Friendica\Util\HTTPInputData;
 
@@ -41,6 +41,6 @@ class UpdateCredentials extends BaseApi
 
                Logger::info('Patch data', ['data' => $data]);
 
-               ApiResponse::unsupported(Router::PATCH);
+               DI::apiResponse()->unsupported(Router::PATCH);
        }
 }

diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index 8a9cd810b6154a998560e393ad359469fdb286f1..f14b74a0bd8dd2ef0fb2e9c72c30f2d1c7419707 100644 (file)
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -23,7 +23,7 @@ namespace Friendica\Module\Api\Mastodon;
 
 use Friendica\App\Router;
 use Friendica\Core\System;
-use Friendica\Module\Api\ApiResponse;
+use Friendica\DI;
 use Friendica\Module\BaseApi;
 
 /**
@@ -35,7 +35,7 @@ class Filters extends BaseApi
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
-               ApiResponse::unsupported(Router::POST);
+               DI::apiResponse()->unsupported(Router::POST);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index e1de45b64d837e3598caaf3b18ecda2fc3f2c184..b83f4903a9db0cd8d254d9ae165ae60a3364c7a7 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -37,12 +37,12 @@ class Accounts extends BaseApi
 {
        public static function delete(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::DELETE);
+               DI::apiResponse()->unsupported(Router::DELETE);
        }
 
        public static function post(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::POST);
+               DI::apiResponse()->unsupported(Router::POST);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index a45611c2dcba613508707d10bd0f1d3c40d0755b..394d508d77557ca3e04595535f7f485e49e4aac3 100644 (file)
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -23,7 +23,7 @@ namespace Friendica\Module\Api\Mastodon;
 
 use Friendica\App\Router;
 use Friendica\Core\System;
-use Friendica\Module\Api\ApiResponse;
+use Friendica\DI;
 use Friendica\Module\BaseApi;
 
 /**
@@ -35,7 +35,7 @@ class Markers extends BaseApi
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
-               ApiResponse::unsupported(Router::POST);
+               DI::apiResponse()->unsupported(Router::POST);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index 9f3e53c046838e44cbb057fc71cd6eb736f7fdbc..82be0d6e7bd2a72c012adfb9154efccf88dd0b2a 100644 (file)
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -39,7 +39,7 @@ class ScheduledStatuses extends BaseApi
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               ApiResponse::unsupported(Router::PUT);
+               DI::apiResponse()->unsupported(Router::PUT);
        }
 
        public static function delete(array $parameters = [])

diff --git a/src/Module/Api/Mastodon/Unimplemented.php b/src/Module/Api/Mastodon/Unimplemented.php
index d0b32b99743be579135422180d9013c59bb36480..6a0a100c3152c79ca61b75298c395f2327261af3 100644 (file)
--- a/src/Module/Api/Mastodon/Unimplemented.php
+++ b/src/Module/Api/Mastodon/Unimplemented.php
@@ -22,7 +22,7 @@
 namespace Friendica\Module\Api\Mastodon;
 
 use Friendica\App\Router;
-use Friendica\Module\Api\ApiResponse;
+use Friendica\DI;
 use Friendica\Module\BaseApi;
 
 /**
@@ -36,7 +36,7 @@ class Unimplemented extends BaseApi
         */
        public static function delete(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::DELETE);
+               DI::apiResponse()->unsupported(Router::DELETE);
        }
 
        /**
@@ -45,7 +45,7 @@ class Unimplemented extends BaseApi
         */
        public static function patch(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::PATCH);
+               DI::apiResponse()->unsupported(Router::PATCH);
        }
 
        /**
@@ -54,7 +54,7 @@ class Unimplemented extends BaseApi
         */
        public static function post(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::POST);
+               DI::apiResponse()->unsupported(Router::POST);
        }
 
        /**
@@ -63,7 +63,7 @@ class Unimplemented extends BaseApi
         */
        public static function put(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::PUT);
+               DI::apiResponse()->unsupported(Router::PUT);
        }
 
        /**
@@ -72,6 +72,6 @@ class Unimplemented extends BaseApi
         */
        public static function rawContent(array $parameters = [])
        {
-               ApiResponse::unsupported(Router::GET);
+               DI::apiResponse()->unsupported(Router::GET);
        }
 }