Make $_REQUEST processing independent of sub-calls

- Move HTTPInputData::process() into App::runFrontend()
- Pass $_REQUEST (including processed Input) to every Module method
- Delete $_POST parameters at Module post() calls because of $_REQUEST

diff --git a/src/App.php b/src/App.php
index c80518c1922b66770975d3b51c7e20a326d8fa2f..b8b7fb99fe94762374b13a610114de9b53222087 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -40,6 +40,7 @@ use Friendica\Model\Profile;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\HTTPInputData;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Profiler;
 use Friendica\Util\Strings;
@@ -702,8 +703,12 @@ class App
                                $module = $router->getModule();
                        }
 
+                       // Processes data from GET requests
+                       $httpinput = HTTPInputData::process();
+                       $input = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
+
                        // Let the module run it's internal process (init, get, post, ...)
-                       $response = $module->run($_POST, $_REQUEST);
+                       $response = $module->run($input);
                        if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
                                $page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig);
                        } else {

diff --git a/src/BaseModule.php b/src/BaseModule.php
index a74c02713114242f97881994863421d6f0875df6..7dcd821e49510c33c68669d51816bb45e747effe 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -128,8 +128,10 @@ abstract class BaseModule implements ICanHandleRequests
         *
         * Extend this method if the module is supposed to process DELETE requests.
         * Doesn't display any content
+        *
+        * @param string[] $request The $_REQUEST content
         */
-       protected function delete()
+       protected function delete(array $request = [])
        {
        }
 
@@ -138,8 +140,10 @@ abstract class BaseModule implements ICanHandleRequests
         *
         * Extend this method if the module is supposed to process PATCH requests.
         * Doesn't display any content
+        *
+        * @param string[] $request The $_REQUEST content
         */
-       protected function patch()
+       protected function patch(array $request = [])
        {
        }
 
@@ -150,10 +154,9 @@ abstract class BaseModule implements ICanHandleRequests
         * Doesn't display any content
         *
         * @param string[] $request The $_REQUEST content
-        * @param string[] $post    The $_POST content
         *
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                // $this->baseUrl->redirect('module');
        }
@@ -163,15 +166,17 @@ abstract class BaseModule implements ICanHandleRequests
         *
         * Extend this method if the module is supposed to process PUT requests.
         * Doesn't display any content
+        *
+        * @param string[] $request The $_REQUEST content
         */
-       protected function put()
+       protected function put(array $request = [])
        {
        }
 
        /**
         * {@inheritDoc}
         */
-       public function run(array $post = [], array $request = []): ResponseInterface
+       public function run(array $request = []): ResponseInterface
        {
                // @see https://github.com/tootsuite/mastodon/blob/c3aef491d66aec743a3a53e934a494f653745b61/config/initializers/cors.rb
                if (substr($request['pagename'] ?? '', 0, 12) == '.well-known/') {
@@ -208,17 +213,17 @@ abstract class BaseModule implements ICanHandleRequests
 
                switch ($this->server['REQUEST_METHOD'] ?? Router::GET) {
                        case Router::DELETE:
-                               $this->delete();
+                               $this->delete($request);
                                break;
                        case Router::PATCH:
-                               $this->patch();
+                               $this->patch($request);
                                break;
                        case Router::POST:
-                               Core\Hook::callAll($this->args->getModuleName() . '_mod_post', $post);
-                               $this->post($request, $post);
+                               Core\Hook::callAll($this->args->getModuleName() . '_mod_post', $request);
+                               $this->post($request);
                                break;
                        case Router::PUT:
-                               $this->put();
+                               $this->put($request);
                                break;
                }
 
@@ -231,7 +236,7 @@ abstract class BaseModule implements ICanHandleRequests
                        $arr = ['content' => ''];
                        Hook::callAll(static::class . '_mod_content', $arr);
                        $this->response->addContent($arr['content']);
-                       $this->response->addContent($this->content($_REQUEST));
+                       $this->response->addContent($this->content($request));
                } catch (HTTPException $e) {
                        $this->response->addContent((new ModuleHTTPException())->content($e));
                } finally {

diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php
index dc608ebbb712b0cb099f9f6e70d41c7d2e008a66..b30be1a1d26e53343779d98fbb891b99372b5bf5 100644 (file)
--- a/src/Capabilities/ICanHandleRequests.php
+++ b/src/Capabilities/ICanHandleRequests.php
@@ -11,12 +11,11 @@ use Psr\Http\Message\ResponseInterface;
 interface ICanHandleRequests
 {
        /**
-        * @param array $post    The $_POST content (in case of POST)
-        * @param array $request The $_REQUEST content (in case of GET, POST)
+        * @param array $request The $_REQUEST content (including content from the PHP input stream)
         *
         * @return ResponseInterface responding to the request handling
         *
         * @throws HTTPException\InternalServerErrorException
         */
-       public function run(array $post = [], array $request = []): ResponseInterface;
+       public function run(array $request = []): ResponseInterface;
 }

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 8c24617c8325e2ef0de0cf41f1d2c697e72f7418..17853015e611500c1b5b2cbe7204b172fc03c90d 100644 (file)
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -73,9 +73,9 @@ class LegacyModule extends BaseModule
                return $this->runModuleFunction('content');
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
-               parent::post($post);
+               parent::post($request);
 
                $this->runModuleFunction('post');
        }

diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 90abc54b57ee56298448b59a8a09713af2106ed3..7a84409fa56efdcb433d8d3015dd2f12ad11eac4 100644 (file)
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -30,7 +30,7 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdmin
 {
-       public function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index 1263b7c3f8473240663ec4eb04b6f5feffcd5d9c..71a0739976fac23330ee01b553cf922a009f72c7 100644 (file)
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -32,7 +32,7 @@ use Friendica\Util\Network;
 
 class Contact extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Blocklist/Server/Add.php b/src/Module/Admin/Blocklist/Server/Add.php
index b7397d22b1cd256d714d556f7935619ad4548e2d..ad8f148a119d55f28eab6ef84682e1f8939dcf2a 100644 (file)
--- a/src/Module/Admin/Blocklist/Server/Add.php
+++ b/src/Module/Admin/Blocklist/Server/Add.php
@@ -32,7 +32,7 @@ use GuzzleHttp\Psr7\Uri;
 
 class Add extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Blocklist/Server/Index.php b/src/Module/Admin/Blocklist/Server/Index.php
index 3be131fac307c47b56b63dff181a16f80d6c2209..c7e82f7668d8337be1b4b1a5d1f2f810842f51fe 100644 (file)
--- a/src/Module/Admin/Blocklist/Server/Index.php
+++ b/src/Module/Admin/Blocklist/Server/Index.php
@@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin;
 
 class Index extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index f5fea300fc80c8cb901b30bf2c001744cccd09f6..546b1d6c69ff62b263a802b2658c42a255a010b1 100644 (file)
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin;
 
 class Features extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 4ae0563e56fb6c0d4984241beea1e6205cfbe416..f3415a2621d93c424b507add69e2ea5a1d4f1139 100644 (file)
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -25,11 +25,10 @@ use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Module\BaseAdmin;
-use Friendica\Util\Strings;
 
 class Delete extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index 6f09b2957bed5dc15612bdd6d4e94e380cc145e0..aeec02d591c67a0bfeddaf40a5aa34b3889e08d0 100644 (file)
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -24,12 +24,11 @@ namespace Friendica\Module\Admin\Logs;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdmin;
-use Friendica\Util\Strings;
 use Psr\Log\LogLevel;
 
 class Settings extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 71f042f8d7ebf99047011e63666700de3a6dc0dc..ceeee8da15eafe762172e36c20bfa36bc1d43614 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -43,7 +43,7 @@ require_once __DIR__ . '/../../../boot.php';
 
 class Site extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php
index 796f88bb32b4af972f7b0c64081d9309f6935bf1..33457d452d80c11d853ee5a383be09e322314b38 100644 (file)
--- a/src/Module/Admin/Storage.php
+++ b/src/Module/Admin/Storage.php
@@ -31,7 +31,7 @@ use Friendica\Util\Strings;
 
 class Storage extends BaseAdmin
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index 1eb3018d56235e4ae98021a9025975724c561b80..faa8061c57d4f52ef40ed1d8265cdc3c1c0561e6 100644 (file)
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -50,7 +50,7 @@ class Embed extends BaseAdmin
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index 684eb4f7634922b0c6ac39a9d813bbaed2826ad1..d064093e63735b42c3f2b0540a99e982f383fc1b 100644 (file)
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -45,7 +45,7 @@ class Tos extends BaseAdmin
                $this->config  = $config;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php
index fa8847d0ffc61d0704a38c133bca3193377a0f69..b5596c65fb8211dca09bb8adf73796c1d2eaeb4f 100644 (file)
--- a/src/Module/Admin/Users/Active.php
+++ b/src/Module/Admin/Users/Active.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Active extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php
index 8a8c105fa8b6ae07e5ede5c39a51afebe7d2b505..5f8f61f6093561be4a95d9ae198a9b1ec3589d49 100644 (file)
--- a/src/Module/Admin/Users/Blocked.php
+++ b/src/Module/Admin/Users/Blocked.php
@@ -31,7 +31,7 @@ use Friendica\Util\Temporal;
 
 class Blocked extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Create.php b/src/Module/Admin/Users/Create.php
index 644b9343427fbfc4640d1606d669ad1ec3eb6efa..8c3fa30767aa712afff1f0ab5c6e060d0f770643 100644 (file)
--- a/src/Module/Admin/Users/Create.php
+++ b/src/Module/Admin/Users/Create.php
@@ -28,7 +28,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Create extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Deleted.php b/src/Module/Admin/Users/Deleted.php
index 4ebe153b874b3d7f12a1f706106c4d0dc518ae4e..61c681e3082380bf54a4fb681012113a72f590f9 100644 (file)
--- a/src/Module/Admin/Users/Deleted.php
+++ b/src/Module/Admin/Users/Deleted.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Deleted extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php
index d0f29ee398a286e370c6e4290a489e78f5edc7d4..c74071562d764e7013ac9d8ee1e5175ecbea56b5 100644 (file)
--- a/src/Module/Admin/Users/Index.php
+++ b/src/Module/Admin/Users/Index.php
@@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers;
 
 class Index extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Admin/Users/Pending.php b/src/Module/Admin/Users/Pending.php
index 2917bc260739dcbec48a7011ee6a33d75bd39c88..0d8fd25ce6b5570e86932055e512c897d2a1af43 100644 (file)
--- a/src/Module/Admin/Users/Pending.php
+++ b/src/Module/Admin/Users/Pending.php
@@ -33,7 +33,7 @@ use Friendica\Util\Temporal;
 
 class Pending extends BaseUsers
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAdminAccess();
 

diff --git a/src/Module/Api/ApiResponse.php b/src/Module/Api/ApiResponse.php
index 863e1d21d2591a7c042017eb2138ae3492f670bc..8f493138390ec3299c308c8eba44f36511628d37 100644 (file)
--- a/src/Module/Api/ApiResponse.php
+++ b/src/Module/Api/ApiResponse.php
@@ -8,7 +8,6 @@ use Friendica\Core\L10n;
 use Friendica\Module\Response;
 use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\HTTPInputData;
 use Friendica\Util\XML;
 use Psr\Log\LoggerInterface;
 use Friendica\Factory\Api\Twitter\User as TwitterUser;
@@ -226,11 +225,12 @@ class ApiResponse extends Response
         * Quit execution with the message that the endpoint isn't implemented
         *
         * @param string $method
+        * @param array  $request (optional) The request content of the current call for later analysis
         *
         * @return void
         * @throws \Exception
         */
-       public function unsupported(string $method = 'all')
+       public function unsupported(string $method = 'all', array $request = [])
        {
                $path = $this->args->getQueryString();
                $this->logger->info('Unimplemented API call',
@@ -238,7 +238,7 @@ class ApiResponse extends Response
                                'method'  => $method,
                                'path'    => $path,
                                'agent'   => $_SERVER['HTTP_USER_AGENT'] ?? '',
-                               'request' => HTTPInputData::process()
+                               'request' => $request,
                        ]);
                $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.');

diff --git a/src/Module/Api/Friendica/Index.php b/src/Module/Api/Friendica/Index.php
index 53229b98e73a99b7b5059c6db357e571bc11d976..e48d719c5d9bc6f5f84afa490ccef2db4b8fd663 100644 (file)
--- a/src/Module/Api/Friendica/Index.php
+++ b/src/Module/Api/Friendica/Index.php
@@ -32,12 +32,12 @@ require_once __DIR__ . '/../../../../include/api.php';
  */
 class Index extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);             
        }
 
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
        }

diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php
index a4e0bb88b7a14db7f6517ec734466a249200b775..9b237cde88bd400e73876a8d196d6e5ab95d2fa7 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Block.php
+++ b/src/Module/Api/Mastodon/Accounts/Block.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Block extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php
index 443ac25402dc89a6e90fee5cc149f177088bdcb0..03162652ef706696fcf333216393f822f45c2d2d 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Follow.php
+++ b/src/Module/Api/Mastodon/Accounts/Follow.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Follow extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php
index 824277348f8d63c5fe94dc72796ee20a1a352e76..858dc8d84d30e72485ee3426b919938be0a1c1d6 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Mute.php
+++ b/src/Module/Api/Mastodon/Accounts/Mute.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php
index eb97a8856d2a5817068728606f175137139144b5..429581ccce6b783084b59bbfdcb39c4242aaa7e0 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Note.php
+++ b/src/Module/Api/Mastodon/Accounts/Note.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Note extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php
index 23d78e739b66d99d0d93f1021b0e35ae1fce38a8..fd1fdb38a92459698883930cb4be5731401707c9 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unblock.php
+++ b/src/Module/Api/Mastodon/Accounts/Unblock.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unblock extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php
index 81f919a6949b0ba94402db5d4e8d08dac7060c05..67193f8d83e591fa0436c32852739126047d8af2 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unfollow.php
+++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unfollow extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php
index c9673b98c357722ccf23c12f375cd1e3ebe1a886..a21f55dee051281b6920b2b3579e949c8679862e 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/Unmute.php
+++ b/src/Module/Api/Mastodon/Accounts/Unmute.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
index 8d9fb48695f1736631e2233ac7a24941e1058002..e560d4c4f409a2301f04b7277527e0ae3ae9997c 100644 (file)
--- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
+++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
@@ -24,22 +24,19 @@ namespace Friendica\Module\Api\Mastodon\Accounts;
 use Friendica\App\Router;
 use Friendica\Core\Logger;
 use Friendica\Module\BaseApi;
-use Friendica\Util\HTTPInputData;
 
 /**
  * @see https://docs.joinmastodon.org/methods/accounts/
  */
 class UpdateCredentials extends BaseApi
 {
-       protected function patch()
+       protected function patch(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               $data = HTTPInputData::process();
+               Logger::info('Patch data', ['data' => $request]);
 
-               Logger::info('Patch data', ['data' => $data]);
-
-               $this->response->unsupported(Router::PATCH);
+               $this->response->unsupported(Router::PATCH, $request);
        }
 }

diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php
index 3f24810bbf8fa18a0d08a3f0e17184eb8c6a8861..30ea29ac3086fa9fac6a17067d071df4282195c6 100644 (file)
--- a/src/Module/Api/Mastodon/Apps.php
+++ b/src/Module/Api/Mastodon/Apps.php
@@ -35,7 +35,7 @@ class Apps extends BaseApi
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $request = $this->getRequest([
                        'client_name'   => '',

diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php
index 125e13e609b5e58dedd7f5f5f38062b4a0715fce..6cc364c9cbd0064f186ff4d50e729cd533aad5ab 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations.php
+++ b/src/Module/Api/Mastodon/Conversations.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Conversations extends BaseApi
 {
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php
index a70cdfb00f3279eeef82b50159a04ffb28ff70d1..d5e87a6c9f1e80705903b75957589fb84befd455 100644 (file)
--- a/src/Module/Api/Mastodon/Conversations/Read.php
+++ b/src/Module/Api/Mastodon/Conversations/Read.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Read extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php
index b48b38b6e44dd083e788023c9550b259d11ccf0b..781e0341a3b89bb784f72c09fd08613625c61881 100644 (file)
--- a/src/Module/Api/Mastodon/Filters.php
+++ b/src/Module/Api/Mastodon/Filters.php
@@ -31,11 +31,11 @@ use Friendica\Module\BaseApi;
  */
 class Filters extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
-               $this->response->unsupported(Router::POST);
+               $this->response->unsupported(Router::POST, $request);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php
index eead8f96c14ee9d640b70918ad7afb227415b25a..b131debd60c77eaa8ea4cd35cb90958366ad7bc2 100644 (file)
--- a/src/Module/Api/Mastodon/FollowRequests.php
+++ b/src/Module/Api/Mastodon/FollowRequests.php
@@ -42,7 +42,7 @@ class FollowRequests extends BaseApi
         * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow
         * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_FOLLOW);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 3ab41329cd70bd655d8790487a035a17af0efddd..12f6ea011e964d64d88c8ed79dc0b9c7ac3e9b04 100644 (file)
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -31,7 +31,7 @@ use Friendica\Model\Group;
  */
 class Lists extends BaseApi
 {
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
@@ -51,7 +51,7 @@ class Lists extends BaseApi
                System::jsonExit([]);
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
@@ -74,7 +74,7 @@ class Lists extends BaseApi
                System::jsonExit(DI::mstdnList()->createFromGroupId($id));
        }
 
-       public function put()
+       public function put(array $request = [])
        {
                $request = $this->getRequest([
                        'title'          => '', // The title of the list to be updated.

diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php
index 9ab676af02a8220501af38c4cbd6ce891598838b..96b6f5bc93201f1a205da02febfe93e2c0fd9efa 100644 (file)
--- a/src/Module/Api/Mastodon/Lists/Accounts.php
+++ b/src/Module/Api/Mastodon/Lists/Accounts.php
@@ -34,14 +34,14 @@ use Friendica\Module\BaseApi;
  */
 class Accounts extends BaseApi
 {
-       protected function delete()
+       protected function delete(array $request = [])
        {
-               $this->response->unsupported(Router::DELETE);
+               $this->response->unsupported(Router::DELETE, $request);
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
-               $this->response->unsupported(Router::POST);
+               $this->response->unsupported(Router::POST, $request);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php
index 9f208e92624a7d409d493b69f01d97d190619ae9..2f74c2d1036c257295f55c4599daf30703f6233a 100644 (file)
--- a/src/Module/Api/Mastodon/Markers.php
+++ b/src/Module/Api/Mastodon/Markers.php
@@ -31,11 +31,11 @@ use Friendica\Module\BaseApi;
  */
 class Markers extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
-               $this->response->unsupported(Router::POST);
+               $this->response->unsupported(Router::POST, $request);
        }
 
        /**

diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php
index 24d2a3bf8c0d676163ee4b904b8f33ef829b9e61..b6ba366613ad1937f5e08645a14d1708ebda27f3 100644 (file)
--- a/src/Module/Api/Mastodon/Media.php
+++ b/src/Module/Api/Mastodon/Media.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Media extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
@@ -53,7 +53,7 @@ class Media extends BaseApi
                System::jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id']));
        }
 
-       public function put()
+       public function put(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php
index d910fe07dfed1647b17dcfe793e0725239c4eb6b..d997a7fd445636a5482e747f9db7bd8fdf8a7e11 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Clear.php
+++ b/src/Module/Api/Mastodon/Notifications/Clear.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Clear extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php
index 98861a2753fcd14333ebf273121b24f590e37792..277a34d5cb931d5e68bbf60b769b5ee2a83cb89d 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications/Dismiss.php
+++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\ForbiddenException;
  */
 class Dismiss extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index 4978e980a8dde019f39f0de46e3a61888638d1e6..3e90aebd9d295a4f329412703bb9dd7a26fae5cc 100644 (file)
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -33,7 +33,7 @@ use Friendica\Object\Api\Mastodon\Notification;
  */
 class PushSubscription extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
@@ -66,7 +66,7 @@ class PushSubscription extends BaseApi
                return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
        }
 
-       public function put()
+       public function put(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();
@@ -99,7 +99,7 @@ class PushSubscription extends BaseApi
                return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray();
        }
 
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_PUSH);
                $uid         = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php
index f6da23aa1a2a9d2fe095de7cdd4ab8f43355dafe..a40406e8dc57768b5f88496e84bc07067d087c73 100644 (file)
--- a/src/Module/Api/Mastodon/ScheduledStatuses.php
+++ b/src/Module/Api/Mastodon/ScheduledStatuses.php
@@ -33,15 +33,15 @@ use Friendica\Module\BaseApi;
  */
 class ScheduledStatuses extends BaseApi
 {
-       public function put()
+       public function put(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
-               $this->response->unsupported(Router::PUT);
+               $this->response->unsupported(Router::PUT, $request);
        }
 
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php
index 05851a983a51bc89d74744b413da3ac81701197f..ad76e3ad7e29b87cd8e7e1d07b483a2785e927b9 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses.php
+++ b/src/Module/Api/Mastodon/Statuses.php
@@ -41,7 +41,7 @@ use Friendica\Util\Images;
  */
 class Statuses extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
@@ -207,7 +207,7 @@ class Statuses extends BaseApi
                DI::mstdnError()->InternalError();
        }
 
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php
index 0ff561189efefc2f805d5f39c3ff175e47c13a11..8092d824aa78946ca8dffc286241b48ef749ee8f 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Bookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Bookmark extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php
index fc070548b9e08ada84c1e44f8ef1b6d8e2b806c8..c644d3df00ee68ed89d0c765021ee4d196ba025d 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Favourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Favourite.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Favourite extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php
index 7b7a6705174cc78c7e2737b2b49259eb9eec5f5f..9f8e5ae1eefbeff38ccb086e52b8da254ace992a 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Mute.php
+++ b/src/Module/Api/Mastodon/Statuses/Mute.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Mute extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php
index 9697d795b9c5be4e750aa65298b74e9447f78da6..778aa87883466b7de25cf885936a244681b86044 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Pin.php
+++ b/src/Module/Api/Mastodon/Statuses/Pin.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Pin extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php
index 64d30e66dd5948598827cc26a30f822e3c0e0e15..9ac18a8ef5f8686c870782043bbf56a5cd033923 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Reblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Reblog.php
@@ -35,7 +35,7 @@ use Friendica\Module\BaseApi;
  */
 class Reblog extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
index 3232e129818d4fdc966f2fea9886c1963b6bc5df..ea5693af2b26d68d6e9017de4fd889c19cf71a8b 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php
+++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Unbookmark extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
index 7e5081656d50da378b952ac44fba8ce93aeb8b6e..3e580b2cc9831965422fb5637cc7f28fe88c491a 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php
+++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php
@@ -33,7 +33,7 @@ use Friendica\Module\BaseApi;
  */
 class Unfavourite extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php
index c380f05d0fe6db4e8a59c7ff3b7f1499d9730691..c01bbf52e7ede2dc4ade27d5e234c2ba4781cf3e 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unmute.php
+++ b/src/Module/Api/Mastodon/Statuses/Unmute.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Unmute extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php
index 9af2fe28d2c7d1cd317b7b9a71a17dfb0c5e365e..7a8da4f2f29e9434c2b206b356641cd9a019bf55 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unpin.php
+++ b/src/Module/Api/Mastodon/Statuses/Unpin.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Unpin extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php
index 27708acad2c01209fd03ae9504976c4d22cafef9..ff5ab2ff0b86914d7803f154937ec3964a7446f4 100644 (file)
--- a/src/Module/Api/Mastodon/Statuses/Unreblog.php
+++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php
@@ -35,7 +35,7 @@ use Friendica\Module\BaseApi;
  */
 class Unreblog extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();

diff --git a/src/Module/Api/Mastodon/Unimplemented.php b/src/Module/Api/Mastodon/Unimplemented.php
index 22111781bbafc9df25ba3272b999147c402ed1b5..c5d0eef122d9e333c3cf8e432058881e01fc4226 100644 (file)
--- a/src/Module/Api/Mastodon/Unimplemented.php
+++ b/src/Module/Api/Mastodon/Unimplemented.php
@@ -32,33 +32,33 @@ class Unimplemented extends BaseApi
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       protected function delete()
+       protected function delete(array $request = [])
        {
-               $this->response->unsupported(Router::DELETE);
+               $this->response->unsupported(Router::DELETE, $request);
        }
 
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       protected function patch()
+       protected function patch(array $request = [])
        {
-               $this->response->unsupported(Router::PATCH);
+               $this->response->unsupported(Router::PATCH, $request);
        }
 
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
-               $this->response->unsupported(Router::POST);
+               $this->response->unsupported(Router::POST, $request);
        }
 
        /**
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public function put()
+       public function put(array $request = [])
        {
-               $this->response->unsupported(Router::PUT);
+               $this->response->unsupported(Router::PUT, $request);
        }
 
        /**
@@ -66,6 +66,6 @@ class Unimplemented extends BaseApi
         */
        protected function rawContent(array $request = [])
        {
-               $this->response->unsupported(Router::GET);
+               $this->response->unsupported(Router::GET, $request);
        }
 }

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 7c0c77372e46cc9b2ca7ad26298a51436d9f7194..cd9cfb8f5cd06948713d0a7e17d6d1bc4e662559 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -35,7 +35,6 @@ use Friendica\Network\HTTPException;
 use Friendica\Security\BasicAuth;
 use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\HTTPInputData;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -71,7 +70,7 @@ class BaseApi extends BaseModule
                $this->app = $app;
        }
 
-       protected function delete()
+       protected function delete(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -80,7 +79,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       protected function patch()
+       protected function patch(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -89,7 +88,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -98,7 +97,7 @@ class BaseApi extends BaseModule
                }
        }
 
-       public function put()
+       public function put(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
 
@@ -112,21 +111,18 @@ class BaseApi extends BaseModule
         *
         * @param array      $defaults Associative array of expected request keys and their default typed value. A null
         *                             value will remove the request key from the resulting value array.
-        * @param array|null $request  Custom REQUEST array, superglobal instead
+        * @param array $request       Custom REQUEST array, superglobal instead
         * @return array request data
         * @throws \Exception
         */
-       public function getRequest(array $defaults, array $request = null): array
+       public function getRequest(array $defaults, array $request): array
        {
-               $httpinput = HTTPInputData::process();
-               $input = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
-
-               self::$request    = $input;
+               self::$request    = $request;
                self::$boundaries = [];
 
                unset(self::$request['pagename']);
 
-               return $this->checkDefaults($defaults, $input);
+               return $this->checkDefaults($defaults, $request);
        }
 
        /**

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 9ffd1762673532efa8ab684dfff82d111f9ad334..d89e556fcba6eaa540be0c40bfc92eabad5d1960 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -91,7 +91,7 @@ class Contact extends BaseModule
                DI::baseUrl()->redirect($redirectUrl);
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php
index 2d99abf72da6612c3ab9d2957cf1ff598b113ea3..3daafe94e68f3792d77bcaad4bd001b9f8aa2758 100644 (file)
--- a/src/Module/Contact/Advanced.php
+++ b/src/Module/Contact/Advanced.php
@@ -61,7 +61,7 @@ class Advanced extends BaseModule
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $cid = $this->parameters['id'];
 

diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php
index 718095c506f39fd2ce41bd5bf1c84844ce6bdbf0..12ab757f3bb1dc1971b0c95cab7384f4e6bd672e 100644 (file)
--- a/src/Module/Contact/Poke.php
+++ b/src/Module/Contact/Poke.php
@@ -18,7 +18,7 @@ use Friendica\Util\XML;
 
 class Poke extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user() || empty($this->parameters['id'])) {
                        return self::postReturn(false);

diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php
index 0431bd8961df1f7abbff5b3ebb61ee3617d999ff..88f927c40f6c7d9087de0d355b06e364fad35287 100644 (file)
--- a/src/Module/Contact/Profile.php
+++ b/src/Module/Contact/Profile.php
@@ -71,7 +71,7 @@ class Profile extends BaseModule
                $this->config            = $config;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php
index 4c3a6dade58abcdd8836c2a9eb0e0ebf8ec078d2..5d4e7c3e39d77b5b485a93d73d8421939aa39270 100644 (file)
--- a/src/Module/Contact/Revoke.php
+++ b/src/Module/Contact/Revoke.php
@@ -74,7 +74,7 @@ class Revoke extends BaseModule
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException();

diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index de03992da380f52f27ecf49c7856d2b7d90a271d..e1a2f19d487897c9528e28b802ee439d626ff32d 100644 (file)
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException;
  */
 class Notify extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $postdata = Network::postdata();
 

diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index 97a645485081ad1508c21e4878033b3e721d3274..b686e5a565563dd09f80386258d416b48446516d 100644 (file)
--- a/src/Module/Debug/Localtime.php
+++ b/src/Module/Debug/Localtime.php
@@ -31,7 +31,7 @@ class Localtime extends BaseModule
 {
        static $mod_localtime = '';
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $time = ($_REQUEST['time'] ?? '') ?: 'now';
 

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index b242f5faa37387557dd0692e3d6316084f351deb..bc3c72e8d008c8b9d248fe9ed4868219930a5dcb 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -37,7 +37,7 @@ use Friendica\Util\Proxy;
  */
 class Delegation extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index 242b774b33a450190d9c5ae677545a0dc997675d..2dd0d4dd88e2f3bb069dc9702c7d05c455b9091a 100644 (file)
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -49,7 +49,7 @@ class Receive extends BaseModule
                $this->config = $config;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $enabled = $this->config->get('system', 'diaspora_enabled', false);
                if (!$enabled) {

diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index 388c07a3794f4b6b4d4071427fc606ca534c6d8e..12055d7901b752236410786b40f0148b5a9de38a 100644 (file)
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -10,9 +10,9 @@ use Friendica\Model\Contact;
  */
 class FollowConfirm extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
-               parent::post($post);
+               parent::post($request);
                $uid = local_user();
                if (!$uid) {
                        notice(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index 153f86d60765b1975489bb3c547c42a685df3eb3..1bbae8042a91974db196b63886ca4d912838405f 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -61,7 +61,7 @@ class FriendSuggest extends BaseModule
                $this->friendSuggestFac  = $friendSuggestFac;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $cid = intval($this->parameters['contact']);
 

diff --git a/src/Module/Group.php b/src/Module/Group.php
index 883f09cb55a46746fcc43a2642734a58ba292731..ada1b82f694fc05158dd55f226408460d8d9b3da 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -32,7 +32,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (DI::mode()->isAjax()) {
                        $this->ajaxPost();
@@ -47,7 +47,7 @@ class Group extends BaseModule
                if ((DI::args()->getArgc() == 2) && (DI::args()->getArgv()[1] === 'new')) {
                        BaseModule::checkFormSecurityTokenRedirectOnError('/group/new', 'group_edit');
 
-                       $name = trim($_POST['groupname']);
+                       $name = trim($request['groupname']);
                        $r = Model\Group::create(local_user(), $name);
                        if ($r) {
                                $r = Model\Group::getIdByName(local_user(), $name);

diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php
index ae156f05c81e53deba5552ad9766acc16100a6b7..9b88e463a0831d34b56485ea0295c8d30f0b1033 100644 (file)
--- a/src/Module/HTTPException/PageNotFound.php
+++ b/src/Module/HTTPException/PageNotFound.php
@@ -33,7 +33,7 @@ class PageNotFound extends BaseModule
                throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.'));
        }
 
-       public function run(array $post = [], array $request = []): ResponseInterface
+       public function run(array $request = []): ResponseInterface
        {
                /* The URL provided does not resolve to a valid module.
                 *
@@ -61,6 +61,6 @@ class PageNotFound extends BaseModule
                        'query'       => $this->server['QUERY_STRING']
                ]);
 
-               return parent::run($post, $request); // TODO: Change the autogenerated stub
+               return parent::run($request); // TODO: Change the autogenerated stub
        }
 }

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 2b287d96beaaf720e540826311ec4b4e9341f984..3e27a7d335a05d40a90b86db6e11d7a5ba55bd75 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -104,7 +104,7 @@ class Install extends BaseModule
                $this->currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $configCache = $this->app->getConfigCache();
 

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 8c9c59d304660cdcd7c24fbaf46137c0a8579766..acd5778e3e8a6bca2ae1213867b8ee6140b47b95 100644 (file)
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -35,7 +35,7 @@ use Friendica\Util\Strings;
  */
 class Invite extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 0564e2f9885f22fd305085e3d2a73775ca7c3e50..d0c6b6afb1a6983b686ed3d82125dfe3c1fa68fc 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -40,7 +40,7 @@ use Friendica\Util\Temporal;
 
 class Compose extends BaseModule
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!empty($_REQUEST['body'])) {
                        $_REQUEST['return'] = 'network';

diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php
index 525159840f35d9e95225a53308bf5a499916a1ad..653c229d289aebab8218fc04dec71eb81cf3db02 100644 (file)
--- a/src/Module/Notifications/Notification.php
+++ b/src/Module/Notifications/Notification.php
@@ -42,7 +42,7 @@ class Notification extends BaseModule
         * @throws \ImagickException
         * @throws \Exception
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/OAuth/Acknowledge.php b/src/Module/OAuth/Acknowledge.php
index f19837364d91eb246c65cf72eccfec248f51318c..477d3dfcf39ce609473b4cbd2e9e75ec467c3261 100644 (file)
--- a/src/Module/OAuth/Acknowledge.php
+++ b/src/Module/OAuth/Acknowledge.php
@@ -30,7 +30,7 @@ use Friendica\Module\BaseApi;
  */
 class Acknowledge extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                DI::session()->set('oauth_acknowledge', true);
                DI::app()->redirect(DI::session()->get('return_path'));

diff --git a/src/Module/OAuth/Revoke.php b/src/Module/OAuth/Revoke.php
index 745ab0673c5e69296826830e061dd38900ace79e..86bc01ced48a328275986c3f230317662dfbbdef 100644 (file)
--- a/src/Module/OAuth/Revoke.php
+++ b/src/Module/OAuth/Revoke.php
@@ -32,7 +32,7 @@ use Friendica\Module\BaseApi;
  */
 class Revoke extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $request = $this->getRequest([
                        'client_id'     => '', // Client ID, obtained during app registration

diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php
index c8ef9ee14d0f5f3ab7fea775a00b78a07520b821..d41708a092c4f8ab224a278e7dec5ba46cbe50a0 100644 (file)
--- a/src/Module/OAuth/Token.php
+++ b/src/Module/OAuth/Token.php
@@ -34,7 +34,7 @@ use Friendica\Security\OAuth;
  */
 class Token extends BaseApi
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $request = $this->getRequest([
                        'client_id'     => '', // Client ID, obtained during app registration

diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php
index c14c19b9b27b6e0f06c3991ec3f56bc1c40c855a..6149e0237a99e63ffc9c1c81975fcdc765c66f61 100644 (file)
--- a/src/Module/Profile/Schedule.php
+++ b/src/Module/Profile/Schedule.php
@@ -33,7 +33,7 @@ use Friendica\Util\DateTimeFormat;
 
 class Schedule extends BaseProfile
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 3c92c0062a6c8bce53facce872819e1670b23dcb..fbb30220e83a5ad38589f6be6af48c88f5022053 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -193,7 +193,7 @@ class Register extends BaseModule
         * Extend this method if the module is supposed to process POST requests.
         * Doesn't display any content
         */
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 

diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php
index ee2dcfe4dcf7b816b9f181844d4939bff14ac172..6737398e44b76c69bd9641d6da47e707072e72e8 100644 (file)
--- a/src/Module/RemoteFollow.php
+++ b/src/Module/RemoteFollow.php
@@ -61,7 +61,7 @@ class RemoteFollow extends BaseModule
                $this->page    = $page;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) {
                        $this->baseUrl->redirect();

diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 90f2d663a7db98d601eb3c92df2d21854ae72564..3ba0eb714ec1c39018d85ce2137ae6dc03be8c0e 100644 (file)
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -46,7 +46,7 @@ class Login extends BaseModule
                return self::form(Session::get('return_path'), intval(DI::config()->get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                $return_path = Session::get('return_path');
                Session::clear();

diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index 6556e07c233c8aba025ded0b42895846bccd53cc..cd635c394ab2529716dcc5d0df6fe4f30f1a0c28 100644 (file)
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -56,7 +56,7 @@ class Recovery extends BaseModule
                $this->session = $session;
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index 454cc9f7cf1366e29e4b770c069d421a05d4b61f..4afe7ff31021f8eeca670cfe041f7c903d04f8cd 100644 (file)
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -38,7 +38,7 @@ class Verify extends BaseModule
 {
        private static $errors = [];
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index d385544afd6bdaf40a4e46d8eb9d110204b861aa..88750ed6268fdbe26d54838aea71ad0ebc92845d 100644 (file)
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -36,7 +36,7 @@ use Friendica\Util\Strings;
  */
 class Delegation extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!DI::app()->isLoggedIn()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index 2155391a958ef8c5bbcf6819783b5bd0ae098282..f8cd3e9d40815b0fc250a07d43626f34fe6cac44 100644 (file)
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -36,7 +36,7 @@ use Friendica\Network\HTTPException;
  */
 class Display extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!DI::app()->isLoggedIn()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));

diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php
index 9f25db524550cc887b1eaccff943a8fac8572e74..4ea8f72bda92cb62af02dc75284ecb56f000fa7f 100644 (file)
--- a/src/Module/Settings/Profile/Index.php
+++ b/src/Module/Settings/Profile/Index.php
@@ -41,7 +41,7 @@ use Friendica\Util\Temporal;
 
 class Index extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index a77057e1abe81ad633532ad307ea6f93da9baac7..ec4863a48f163fa9f117de2ce21b2df871a971fe 100644 (file)
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -33,7 +33,7 @@ use Friendica\Network\HTTPException;
 
 class Crop extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!Session::isAuthenticated()) {
                        return;

diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index 309a893e666b618cea848f5c8aab6e8095e2fd06..3ba46e00719ee1fb61861463af92d49fc1fd2c7f 100644 (file)
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -34,7 +34,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!Session::isAuthenticated()) {
                        return;

diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 94dfc6d4121df6ada787f62fc069c996c3021c15..a7d426b2e17591a67f3e5f6a9f12b64827d5c994 100644 (file)
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -66,7 +66,7 @@ class AppSpecific extends BaseSettings
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index ec57a8d147c8cd76ee625520e026d96dbc3dac18..de6cae5a125a252d5cdbaa4aa099d655b57eaff6 100644 (file)
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -33,7 +33,7 @@ use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettings
 {
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index fb13b8b60d65d11819ea2e63b5181279f14406b6..7a77943838c5fde59b2a9e7e4260020cae0d43dd 100644 (file)
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -64,7 +64,7 @@ class Recovery extends BaseSettings
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php
index 1507d5fc5ea1ccf776c3e4c89c8248dbfee7ff4c..97fb1660d575e6aa5e91f62fdc7379ef912cc1c0 100644 (file)
--- a/src/Module/Settings/TwoFactor/Trusted.php
+++ b/src/Module/Settings/TwoFactor/Trusted.php
@@ -48,7 +48,7 @@ class Trusted extends BaseSettings
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 3c1853d7f3deae237c2a404fce6601ba5cbb459d..8b2f1e54fe02846ba20f35c96c2b93c864ef335b 100644 (file)
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -70,7 +70,7 @@ class Verify extends BaseSettings
                }
        }
 
-       protected function post(array $request = [], array $post = [])
+       protected function post(array $request = [])
        {
                if (!local_user()) {
                        return;

diff --git a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index f248d0a9c2d8a976db8be9b4de2b227c9dabe24e..6dd8efff81a59aae91454cb4479bb8087fa54067 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@ -51,7 +51,7 @@ class DeleteTest extends ApiTest
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
                $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]);
-               $response = $delete->run([], ['photo_id' => '709057080661a283a6aa598501504178']);
+               $response = $delete->run(['photo_id' => '709057080661a283a6aa598501504178']);
 
                $responseText = (string)$response->getBody();
 
@@ -68,7 +68,7 @@ class DeleteTest extends ApiTest
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
                $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
-               $response = $delete->run([], ['photo_id' => '709057080661a283a6aa598501504178']);
+               $response = $delete->run(['photo_id' => '709057080661a283a6aa598501504178']);
 
                $responseText = (string)$response->getBody();
 

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index 58f20ee3b394b4b26cabbf4d3b911859aa3bcd95..df8b720a829f3bdf430bb2112706cc2c87571cec 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@ -47,7 +47,7 @@ class DeleteTest extends ApiTest
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
                $delete   = new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::DELETE]);
-               $response = $delete->run([], ['album' => 'test_album']);
+               $response = $delete->run(['album' => 'test_album']);
 
                $responseText = (string)$response->getBody();
 

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
index 93856fd971030d68b306958a195ac41b751d6dac..22ca155cbb82390fcfad15cd2ac9cf6339a61d0c 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
@@ -56,7 +56,7 @@ class UpdateTest extends ApiTest
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
-               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))->run([], ['album' => 'test_album', 'album_new' => 'test_album_2']);
+               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))->run(['album' => 'test_album', 'album_new' => 'test_album_2']);
 
                $responseBody = (string)$response->getBody();