Introduce FixtureTest::useHttpMethod for manually overwrite the HTTP Method argument

diff --git a/tests/FixtureTest.php b/tests/FixtureTest.php
index 17760c85d4b5c41c3929d263e85b0c7ca80132b0..bbf8cfd53994113362c0109b8a086a0ddf243964 100644 (file)
--- a/tests/FixtureTest.php
+++ b/tests/FixtureTest.php
@@ -6,6 +6,8 @@
 namespace Friendica\Test;
 
 use Dice\Dice;
+use Friendica\App\Arguments;
+use Friendica\App\Router;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Session;
@@ -50,4 +52,20 @@ abstract class FixtureTest extends DatabaseTest
                // Load the API dataset for the whole API
                $this->loadFixture(__DIR__ . '/datasets/api.fixture.php', $dba);
        }
+
+       protected function useHttpMethod(string $method = Router::GET)
+       {
+               $server                   = $_SERVER;
+               $server['REQUEST_METHOD'] = $method;
+
+               $this->dice = $this->dice
+                       ->addRule(Arguments::class, [
+                               'instanceOf' => Arguments::class,
+                               'call'       => [
+                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
+                               ],
+                       ]);
+
+               DI::init($this->dice);
+       }
 }

diff --git a/tests/src/Module/Api/ApiTest.php b/tests/src/Module/Api/ApiTest.php
index 890bba19b65e367657dc0e05577282556b5eb75d..6bddf35f35a6a39d7a46dc0342ba3c45fe34d596 100644 (file)
--- a/tests/src/Module/Api/ApiTest.php
+++ b/tests/src/Module/Api/ApiTest.php
@@ -21,7 +21,9 @@
 
 namespace Friendica\Test\src\Module\Api;
 
+use Dice\Dice;
 use Friendica\App;
+use Friendica\App\Arguments;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
@@ -167,9 +169,18 @@ abstract class ApiTest extends FixtureTest
        {
                parent::setUp(); // TODO: Change the autogenerated stub
 
+               $server                   = $_SERVER;
+               $server['REQUEST_METHOD'] = App\Router::GET;
+
                $this->dice = $this->dice
                        ->addRule(Authentication::class, ['instanceOf' => AuthenticationDouble::class, 'shared' => true])
-                       ->addRule(App::class, ['instanceOf' => AppDouble::class, 'shared' => true]);
+                       ->addRule(App::class, ['instanceOf' => AppDouble::class, 'shared' => true])
+                       ->addRule(Arguments::class, [
+                               'instanceOf' => App\Arguments::class,
+                               'call'       => [
+                                       ['determine', [$server, $_GET], Dice::CHAIN_CALL],
+                               ],
+                       ]);
                DI::init($this->dice);
 
                // Manual override to bypass API authentication

diff --git a/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php b/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
index af12be2c1b1993d7b69d493d9d5159bdcca4aa9f..346697eb5fb34cf998b0f400936ca06cba8e1e34 100644 (file)
--- a/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
+++ b/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
@@ -34,7 +34,7 @@ class SearchTest extends ApiTest
        {
                $directMessage = new DirectMessage(new NullLogger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);
@@ -52,7 +52,7 @@ class SearchTest extends ApiTest
 
                $directMessage = new DirectMessage(new NullLogger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'searchstring' => 'item_body'
                        ]);
@@ -73,7 +73,7 @@ class SearchTest extends ApiTest
        {
                $directMessage = new DirectMessage(new NullLogger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Search($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'searchstring' => 'test'
                        ]);

diff --git a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index e80b863a228c48a93f5fbfb21fdbff506288773d..e3e208ff02363e1a0eb526d914ff3d45bbf9a2f1 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@ -29,10 +29,17 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class DeleteTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))->run();
+               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run();
        }
 
        public function testWithoutAuthenticatedUser()
@@ -43,14 +50,14 @@ class DeleteTest extends ApiTest
        public function testWrong()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))->run(['photo_id' => 1]);
+               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run(['photo_id' => 1]);
        }
 
        public function testValidWithPost()
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
-               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'photo_id' => '709057080661a283a6aa598501504178'
                        ]);
@@ -65,7 +72,7 @@ class DeleteTest extends ApiTest
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
-               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'photo_id' => '709057080661a283a6aa598501504178'
                        ]);

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index 24c223ef80a41f8e5cc66abc77388878a014c3d2..6ce77f63aad483186f4ad15b2fa76b4fc5fbb0a9 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@ -29,10 +29,17 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class DeleteTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
        }
@@ -40,7 +47,7 @@ class DeleteTest extends ApiTest
        public function testWrong()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'album' => 'album_name'
                        ]);
@@ -50,7 +57,7 @@ class DeleteTest extends ApiTest
        {
                $this->loadFixture(__DIR__ . '/../../../../../datasets/photo/photo.fixture.php', DI::dba());
 
-               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'album' => 'test_album']
                        );

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
index 49197cbeccaccbdd20aa0bb9beef40eb923b5714..5f25a62ac0e8d38607e17704151316088a8ca3f2 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
@@ -29,17 +29,24 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class UpdateTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
        public function testTooFewArgs()
        {
                $this->expectException(BadRequestException::class);
-               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'album' => 'album_name'
                        ]);
@@ -48,7 +55,7 @@ class UpdateTest extends ApiTest
        public function testWrongUpdate()
        {
                $this->expectException(BadRequestException::class);
-               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'album'     => 'album_name',
                                'album_new' => 'album_name'
@@ -64,7 +71,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]))
+               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'album'     => 'test_album',
                                'album_new' => 'test_album_2'

diff --git a/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php b/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
index 07e43479d25562080e4b92b343967074b394d8b4..e45c702089e9ad99f0f69c45aef033f6da17781a 100644 (file)
--- a/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
+++ b/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
@@ -17,9 +17,8 @@ class ConfigTest extends ApiTest
        {
                DI::config()->set('system', 'ssl_policy', BaseURL::SSL_POLICY_FULL);
 
-               $response = (new Config(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Config(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
-
                $json = $this->toJson($response);
 
                self::assertEquals('localhost', $json->site->server);

diff --git a/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php b/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
index 5942aa1d273c016f76dadb9afa4a200855c47fff..c7c3dabec35fe8b232f327f773171ab3fd6d883f 100644 (file)
--- a/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
+++ b/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
@@ -16,7 +16,7 @@ class VerifyCredentialsTest extends ApiTest
         */
        public function testApiAccountVerifyCredentials()
        {
-               $response = (new VerifyCredentials(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new VerifyCredentials(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php b/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
index 9b29d314be113efc12b4edf72b5a97074807ffb6..3552179e1eb617e73afd8a18400e10e013ee0ce2 100644 (file)
--- a/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
+++ b/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
@@ -12,7 +12,7 @@ class RateLimitStatusTest extends ApiTest
 {
        public function testWithJson()
        {
-               $response = (new RateLimitStatus(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new RateLimitStatus(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run();
 
                $result = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php b/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
index 76cb27c9197637e2eb50551c73505ece26a104fb..bdcd54f0cf3f8252bea7a50b7b9cb53ca5b4eb86 100644 (file)
--- a/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
+++ b/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
@@ -14,7 +14,9 @@ class UpdateProfileTest extends ApiTest
         */
        public function testApiAccountUpdateProfile()
        {
-               $response = (new UpdateProfile(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST], ['extension' => 'json']))
+               $this->useHttpMethod(Router::POST);
+
+               $response = (new UpdateProfile(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'name'        => 'new_name',
                                'description' => 'new_description'

diff --git a/tests/src/Module/Api/Twitter/Blocks/ListsTest.php b/tests/src/Module/Api/Twitter/Blocks/ListsTest.php
index 77c45ada83ba12caf9e824fa7ac56b5c1f79fd61..be7d48ab5dc5240dbb993c1608205e801244b84a 100644 (file)
--- a/tests/src/Module/Api/Twitter/Blocks/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Blocks/ListsTest.php
@@ -14,7 +14,7 @@ class ListsTest extends ApiTest
         */
        public function testApiStatusesFWithBlocks()
        {
-               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php b/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php
index 63290368aadb9f44c5c0b7b64d9bd723f8972ab2..a721fdb5c41add20c58f0aa0a1392da65722ca04 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php
@@ -21,7 +21,7 @@ class AllTest extends ApiTest
 
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new All($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new All($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php b/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php
index 5667b72768bd70ddfd0e5928cd9be62b857a3a3a..c10fdde03ece9201eba495118ceb122065d6ec41 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php
@@ -19,7 +19,7 @@ class ConversationTest extends ApiTest
        {
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Conversation($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Conversation($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'friendica_verbose' => true,
                        ]);

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php b/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
index b743227789f32aac1244dad0940a4c8907c34b46..dadd556e499294f5673d81668b60cf6599252b15 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
@@ -18,7 +18,7 @@ class DestroyTest extends ApiTest
        public function testApiDirectMessagesDestroy()
        {
                $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run();
        }
 
@@ -29,7 +29,7 @@ class DestroyTest extends ApiTest
         */
        public function testApiDirectMessagesDestroyWithVerbose()
        {
-               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'friendica_verbose' => true,
                        ]);
@@ -65,7 +65,7 @@ class DestroyTest extends ApiTest
        public function testApiDirectMessagesDestroyWithId()
        {
                $this->expectException(\Friendica\Network\HTTPException\BadRequestException::class);
-               (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'id' => 1
                        ]);
@@ -78,7 +78,7 @@ class DestroyTest extends ApiTest
         */
        public function testApiDirectMessagesDestroyWithIdAndVerbose()
        {
-               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'id'                  => 1,
                                'friendica_parenturi' => 'parent_uri',
@@ -102,7 +102,7 @@ class DestroyTest extends ApiTest
                $ids = DBA::selectToArray('mail', ['id']);
                $id  = $ids[0]['id'];
 
-               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'id'                => $id,
                                'friendica_verbose' => true,

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php b/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php
index beb61ee968f11202ed93c0f422aba83da4a25043..9219bd6a82c87d82035e1c8e78acf2561d9efc3c 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php
@@ -21,7 +21,7 @@ class InboxTest extends ApiTest
 
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Inbox($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Inbox($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php b/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php
index 3cae992fa2099e3805afa912ce862efa31491c14..9d7ab8ce742f0836545e88352144dfc72b3d3d4d 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php
@@ -19,7 +19,7 @@ class NewDMTest extends ApiTest
        {
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run();
 
                self::assertEmpty((string)$response->getBody());
@@ -51,7 +51,7 @@ class NewDMTest extends ApiTest
        {
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'text'    => 'message_text',
                                'user_id' => 43
@@ -73,7 +73,7 @@ class NewDMTest extends ApiTest
 
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'text'    => 'message_text',
                                'user_id' => 44
@@ -97,7 +97,7 @@ class NewDMTest extends ApiTest
 
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'text'    => 'message_text',
                                'user_id' => 44,
@@ -123,7 +123,7 @@ class NewDMTest extends ApiTest
 
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'rss']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run([
                                'text'    => 'message_text',
                                'user_id' => 44,

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php b/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php
index ccea4fd539b9bca8ecfa5900de74f38d0cc96986..2d02d37d50017216499fcdeb356045674b2207ff 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php
@@ -19,7 +19,7 @@ class SentTest extends ApiTest
        {
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Sent($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'json']))
+               $response = (new Sent($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run([
                                'friendica_verbose' => true,
                        ]);
@@ -39,7 +39,7 @@ class SentTest extends ApiTest
        {
                $directMessage = new DirectMessage(DI::logger(), DI::dba(), DI::twitterUser());
 
-               $response = (new Sent($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'rss']))
+               $response = (new Sent($directMessage, DI::dba(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run();
 
                self::assertXml((string)$response->getBody(), 'direct-messages');

diff --git a/tests/src/Module/Api/Twitter/Favorites/CreateTest.php b/tests/src/Module/Api/Twitter/Favorites/CreateTest.php
index 1055dd9d1acc7193777f9e363dff2dfe042cd747..640023883f619d2c60fcd0bfae94a5b54261e323 100644 (file)
--- a/tests/src/Module/Api/Twitter/Favorites/CreateTest.php
+++ b/tests/src/Module/Api/Twitter/Favorites/CreateTest.php
@@ -11,6 +11,13 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class CreateTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the api_favorites_create_destroy() function with an invalid ID.
         *
@@ -20,7 +27,7 @@ class CreateTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -31,7 +38,7 @@ class CreateTest extends ApiTest
         */
        public function testApiFavoritesCreateDestroyWithCreateAction()
        {
-               $response = (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 3
                        ]);
@@ -48,7 +55,7 @@ class CreateTest extends ApiTest
         */
        public function testApiFavoritesCreateDestroyWithCreateActionAndRss()
        {
-               $response = (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST], ['extension' => ICanCreateResponses::TYPE_RSS]))
+               $response = (new Create(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
                        ->run([
                                'id' => 3
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php b/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
index 65113f556870a78ce1efbf12931d4dbf72e4d568..9b61e095df604e53e7be6ed0f9d2ed6b1efdc7c1 100644 (file)
--- a/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
@@ -10,6 +10,13 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class DestroyTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the api_favorites_create_destroy() function with an invalid ID.
         *
@@ -19,7 +26,7 @@ class DestroyTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -30,7 +37,7 @@ class DestroyTest extends ApiTest
         */
        public function testApiFavoritesCreateDestroyWithDestroyAction()
        {
-               $response = (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 3
                        ]);

diff --git a/tests/src/Module/Api/Twitter/FavoritesTest.php b/tests/src/Module/Api/Twitter/FavoritesTest.php
index 1f0faa971a6b1af62a5e7596d47278bc896e9395..34ba77e8c480b026ad625cc6b899facc9644bfce 100644 (file)
--- a/tests/src/Module/Api/Twitter/FavoritesTest.php
+++ b/tests/src/Module/Api/Twitter/FavoritesTest.php
@@ -17,7 +17,7 @@ class FavoritesTest extends ApiTest
         */
        public function testApiFavorites()
        {
-               $response = (new Favorites(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Favorites(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'page'   => -1,
                                'max_id' => 10,
@@ -37,7 +37,7 @@ class FavoritesTest extends ApiTest
         */
        public function testApiFavoritesWithRss()
        {
-               $response = (new Favorites(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], [
+               $response = (new Favorites(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run();
 

diff --git a/tests/src/Module/Api/Twitter/Followers/ListsTest.php b/tests/src/Module/Api/Twitter/Followers/ListsTest.php
index e9946bb7354f2046c6b9a9764b94c5b918db65c3..9c8110dfef28762b7c0e7d0ccd585869f7ede35a 100644 (file)
--- a/tests/src/Module/Api/Twitter/Followers/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Followers/ListsTest.php
@@ -14,7 +14,7 @@ class ListsTest extends ApiTest
         */
        public function testApiStatusesFWithFollowers()
        {
-               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Friends/ListsTest.php b/tests/src/Module/Api/Twitter/Friends/ListsTest.php
index 3628f5c963c52c627de073a29620f84c41471d1a..2088f489387d7d3e42a6a146830cca75a9fee343 100644 (file)
--- a/tests/src/Module/Api/Twitter/Friends/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Friends/ListsTest.php
@@ -16,7 +16,7 @@ class ListsTest extends ApiTest
         */
        public function testApiStatusesFWithFriends()
        {
-               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Lists(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php b/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php
index d8e5cc3da0b4b315bd5e9e44f8f0a4baac5dddc3..d0bf1ef211bf05d7b0a401c3097fd78db0a189ea 100644 (file)
--- a/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php
+++ b/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php
@@ -16,7 +16,7 @@ class IncomingTest extends ApiTest
         */
        public function testApiFriendshipsIncoming()
        {
-               $response = (new Incoming(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Incoming(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Lists/StatusesTest.php b/tests/src/Module/Api/Twitter/Lists/StatusesTest.php
index 66ebf8bbd7bbd9f1bab262d3c860124d3d98d363..e2fc826488c9256b155d5b5ffdf2a28b2ab28d1a 100644 (file)
--- a/tests/src/Module/Api/Twitter/Lists/StatusesTest.php
+++ b/tests/src/Module/Api/Twitter/Lists/StatusesTest.php
@@ -19,7 +19,7 @@ class StatusesTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -28,7 +28,7 @@ class StatusesTest extends ApiTest
         */
        public function testApiListsStatusesWithListId()
        {
-               $response = (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'list_id' => 1,
                                'page'    => -1,
@@ -48,7 +48,7 @@ class StatusesTest extends ApiTest
         */
        public function testApiListsStatusesWithListIdAndRss()
        {
-               $response = (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => 'rss']))
+               $response = (new Statuses(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run([
                                'list_id' => 1
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Media/UploadTest.php b/tests/src/Module/Api/Twitter/Media/UploadTest.php
index b3516c307914639e27bc545f74ac8262bd327381..74be1b993b2689cc8d88c31351994461bdc0c057 100644 (file)
--- a/tests/src/Module/Api/Twitter/Media/UploadTest.php
+++ b/tests/src/Module/Api/Twitter/Media/UploadTest.php
@@ -13,6 +13,13 @@ use Friendica\Test\Util\AuthTestConfig;
 
 class UploadTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the \Friendica\Module\Api\Twitter\Media\Upload module.
         */
@@ -20,7 +27,7 @@ class UploadTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -34,7 +41,7 @@ class UploadTest extends ApiTest
                $this->expectException(UnauthorizedException::class);
                AuthTestConfig::$authenticated = false;
 
-               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -53,7 +60,7 @@ class UploadTest extends ApiTest
                        ]
                ];
 
-               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -76,7 +83,7 @@ class UploadTest extends ApiTest
                        ]
                ];
 
-               $response = (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $media = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
index 0480ba8c2b72f17483d8a9e6afc25054bd9440c8..be37ddf402b527ae14452bdea28bec009b1d6c7e 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
@@ -10,6 +10,13 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class DestroyTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the api_statuses_destroy() function.
         *
@@ -19,7 +26,7 @@ class DestroyTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -45,7 +52,7 @@ class DestroyTest extends ApiTest
         */
        public function testApiStatusesDestroyWithId()
        {
-               $response = (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Destroy(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 1
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php b/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
index d92f26f72bad58511bf2eeb1127d114392bd65f5..5c72f4e132902c3046115126d30e076f6116f9a8 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
@@ -17,7 +17,7 @@ class MentionsTest extends ApiTest
         */
        public function testApiStatusesMentions()
        {
-               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'max_id' => 10
                        ]);
@@ -35,7 +35,7 @@ class MentionsTest extends ApiTest
         */
        public function testApiStatusesMentionsWithNegativePage()
        {
-               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'page' => -2
                        ]);
@@ -67,7 +67,7 @@ class MentionsTest extends ApiTest
         */
        public function testApiStatusesMentionsWithRss()
        {
-               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], ['extension' => ICanCreateResponses::TYPE_RSS]))
+               $response = (new Mentions(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
                        ->run([
                                'page' => -2
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php b/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
index a5217fb715c43aa866537e19b4c5d9a80c2a74a9..d5c5fb739696bce9885a22b72c919296f8ac7f5e 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
@@ -17,7 +17,7 @@ class NetworkPublicTimelineTest extends ApiTest
         */
        public function testApiStatusesNetworkpublicTimeline()
        {
-               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'max_id' => 10
                        ]);
@@ -39,7 +39,7 @@ class NetworkPublicTimelineTest extends ApiTest
         */
        public function testApiStatusesNetworkpublicTimelineWithNegativePage()
        {
-               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'page' => -2
                        ]);
@@ -75,7 +75,7 @@ class NetworkPublicTimelineTest extends ApiTest
         */
        public function testApiStatusesNetworkpublicTimelineWithRss()
        {
-               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], [
+               $response = (new NetworkPublicTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run([
                        'page' => -2

diff --git a/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php b/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
index 1d93c02969e6648a1175640fad4a6504f0c3a952..2f9944aabf514980146f958e76c77ff4a0ac0e17 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
@@ -10,6 +10,13 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class RetweetTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the api_statuses_repeat() function.
         *
@@ -19,7 +26,7 @@ class RetweetTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -45,7 +52,7 @@ class RetweetTest extends ApiTest
         */
        public function testApiStatusesRepeatWithId()
        {
-               $response = (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 1
                        ]);
@@ -62,7 +69,7 @@ class RetweetTest extends ApiTest
         */
        public function testApiStatusesRepeatWithSharedId()
        {
-               $response = (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Retweet(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 5
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/ShowTest.php b/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
index f9d302f0efeb1f2b6d85d9eadf94b147f6518e13..e114c09553aa25d64bedc76897ed84f9485b2728 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
@@ -20,7 +20,7 @@ class ShowTest extends ApiTest
                $this->expectException(BadRequestException::class);
 
 
-               (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -31,7 +31,7 @@ class ShowTest extends ApiTest
         */
        public function testApiStatusesShowWithId()
        {
-               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id' => 1
                        ]);
@@ -49,7 +49,7 @@ class ShowTest extends ApiTest
         */
        public function testApiStatusesShowWithConversation()
        {
-               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'id'           => 1,
                                'conversation' => 1

diff --git a/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php b/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php
index f3f6b5a929c27938d6386aa75323d70432a9e429..a42862731d858f98195bc44b0a20fd57c61a46df 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php
@@ -9,6 +9,13 @@ use Friendica\Test\src\Module\Api\ApiTest;
 
 class UpdateTest extends ApiTest
 {
+       protected function setUp(): void
+       {
+               parent::setUp();
+
+               $this->useHttpMethod(Router::POST);
+       }
+
        /**
         * Test the api_statuses_update() function.
         *
@@ -28,7 +35,7 @@ class UpdateTest extends ApiTest
                        ]
                ];
 
-               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'status'                => 'Status content #friendica',
                                'in_reply_to_status_id' => 0,
@@ -50,7 +57,7 @@ class UpdateTest extends ApiTest
         */
        public function testApiStatusesUpdateWithHtml()
        {
-               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::POST]))
+               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'htmlstatus' => '<b>Status content</b>',
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php b/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
index eb06133f36046dbabfd102394e03bc672ecf67cd..416bbe65798ac5e8657e6b1852d89440b4b2d353 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
@@ -17,7 +17,7 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimeline()
        {
-               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'user_id'         => 42,
                                'max_id'          => 10,
@@ -42,7 +42,7 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimelineWithNegativePage()
        {
-               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'user_id' => 42,
                                'page'    => -2,
@@ -65,7 +65,7 @@ class UserTimelineTest extends ApiTest
         */
        public function testApiStatusesUserTimelineWithRss()
        {
-               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], [
+               $response = (new UserTimeline(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run();
 

diff --git a/tests/src/Module/Api/Twitter/Users/LookupTest.php b/tests/src/Module/Api/Twitter/Users/LookupTest.php
index 2c5739e828392c83fa76576d75ffb0edc14b141c..fcff8b00ead2af982b3860e99dbdb747db56a3f1 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/LookupTest.php
+++ b/tests/src/Module/Api/Twitter/Users/LookupTest.php
@@ -19,7 +19,7 @@ class LookupTest extends ApiTest
        {
                $this->expectException(NotFoundException::class);
 
-               (new Lookup(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               (new Lookup(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 
@@ -30,7 +30,7 @@ class LookupTest extends ApiTest
         */
        public function testApiUsersLookupWithUserId()
        {
-               $respone = (new Lookup(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $respone = (new Lookup(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'user_id' => static::OTHER_USER['id']
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Users/SearchTest.php b/tests/src/Module/Api/Twitter/Users/SearchTest.php
index c88999e4594a97916a4ae4258040c4bbd8aaab9d..2260aba43e12b6bd564af500880ce2479a2a3bcf 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/SearchTest.php
+++ b/tests/src/Module/Api/Twitter/Users/SearchTest.php
@@ -18,7 +18,7 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearch()
        {
-               $respone = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $respone = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run([
                                'q' => static::OTHER_USER['name']
                        ]);
@@ -35,7 +35,7 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearchWithXml()
        {
-               $respone = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], [
+               $respone = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_XML
                ]))->run([
                        'q' => static::OTHER_USER['name']
@@ -53,7 +53,7 @@ class SearchTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
        }
 }

diff --git a/tests/src/Module/Api/Twitter/Users/ShowTest.php b/tests/src/Module/Api/Twitter/Users/ShowTest.php
index dd63c3e519cc2b9ffc92aa9262f0446600b492e2..5e1812dd0781e12962ad7ce667bc2d6470c95e31 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/ShowTest.php
+++ b/tests/src/Module/Api/Twitter/Users/ShowTest.php
@@ -17,7 +17,7 @@ class ShowTest extends ApiTest
         */
        public function testApiUsersShow()
        {
-               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET]))
+               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run();
 
                $json = $this->toJson($response);
@@ -37,7 +37,7 @@ class ShowTest extends ApiTest
         */
        public function testApiUsersShowWithXml()
        {
-               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::GET], [
+               $response = (new Show(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_XML
                ]))->run();
 

diff --git a/tests/src/Module/Special/OptionsTest.php b/tests/src/Module/Special/OptionsTest.php
index ea5982e655427bd4e9d8ad7a5ce74cb6bacc9e31..e6f798de173245c8aabd0cbbbe368887ab028eb8 100644 (file)
--- a/tests/src/Module/Special/OptionsTest.php
+++ b/tests/src/Module/Special/OptionsTest.php
@@ -2,8 +2,6 @@
 
 namespace Friendica\Test\src\Module\Special;
 
-use Friendica\App\Arguments;
-use Friendica\App\Page;
 use Friendica\App\Router;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\DI;
@@ -14,7 +12,9 @@ class OptionsTest extends FixtureTest
 {
        public function testOptions()
        {
-               $response = (new Options(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), ['REQUEST_METHOD' => Router::OPTIONS]))->run();
+               $this->useHttpMethod(Router::OPTIONS);
+
+               $response = (new Options(DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run();
 
                self::assertEmpty((string)$response->getBody());
                self::assertEquals(204, $response->getStatusCode());