Add newly required constructor parameter to BaseApi-related tests

diff --git a/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php b/tests/src/Module/Api/Friendica/DirectMessages/SearchTest.php
index c9979844124b9269f2c75e8257ff697c946b37a0..e17afb9be3053dfaa75e56a8d727c1bd3e79fdbc 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(), []))
+               $response = (new Search($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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(), []))
+               $response = (new Search($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                '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(), []))
+               $response = (new Search($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'searchstring' => 'test'
                        ]);

diff --git a/tests/src/Module/Api/Friendica/NotificationTest.php b/tests/src/Module/Api/Friendica/NotificationTest.php
index aaf7022024899a75bb2cb1cd58cdfdef96b711f9..06191e3d3277b8bb1e05e66097820c742e9a5565 100644 (file)
--- a/tests/src/Module/Api/Friendica/NotificationTest.php
+++ b/tests/src/Module/Api/Friendica/NotificationTest.php
@@ -66,7 +66,7 @@ class NotificationTest extends ApiTest
 </notes>
 XML;
 
-               $response = (new Notification(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
+               $response = (new Notification(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
                        ->run($this->httpExceptionMock);
 
                self::assertXmlStringEqualsXmlString($assertXml, (string)$response->getBody());
@@ -78,7 +78,7 @@ XML;
 
        public function testWithJsonResult()
        {
-               $response = (new Notification(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
+               $response = (new Notification(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $json = $this->toJson($response);

diff --git a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
index 637ff95812b59f1057cfb819160f3a192fc69e7e..7e30095598bdf8cd893c8bc2bd7e4d31d4afb49a 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photo/DeleteTest.php
@@ -39,7 +39,7 @@ class DeleteTest extends ApiTest
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run($this->httpExceptionMock);
+               (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run($this->httpExceptionMock);
        }
 
        public function testWithoutAuthenticatedUser()
@@ -50,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(), []))->run($this->httpExceptionMock, ['photo_id' => 1]);
+               (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))->run($this->httpExceptionMock, ['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(), []))
+               $response = (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'photo_id' => '709057080661a283a6aa598501504178'
                        ]);
@@ -72,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(), []))
+               $response = (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'photo_id' => '709057080661a283a6aa598501504178'
                        ]);

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
index 1cc255c365f3d068696600b63072cb2995654126..7d483f1fd09ecbc6f0b801892ea106ee1951c956 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/DeleteTest.php
@@ -39,7 +39,7 @@ class DeleteTest extends ApiTest
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Delete(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
        }
@@ -47,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(), []))
+               (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'album' => 'album_name'
                        ]);
@@ -57,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(), []))
+               $response = (new Delete(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'album' => 'test_album']
                        );

diff --git a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
index 3812c7ffb7fd744e63d337ac0c1ca52d7b38632c..4d8c7ff7fa4c7f0de0e177d77790d9d7d8e4cb4f 100644 (file)
--- a/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
+++ b/tests/src/Module/Api/Friendica/Photoalbum/UpdateTest.php
@@ -39,14 +39,14 @@ class UpdateTest extends ApiTest
        public function testEmpty()
        {
                $this->expectException(BadRequestException::class);
-               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
        public function testTooFewArgs()
        {
                $this->expectException(BadRequestException::class);
-               (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'album' => 'album_name'
                        ]);
@@ -55,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(), []))
+               (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'album'     => 'album_name',
                                'album_new' => 'album_name'
@@ -71,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(), []))
+               $response = (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                '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 b6166fc400d48404148f864ae18642c87f128f26..db16070065eb660f9d0efb9e5c9bf2a3d0492481 100644 (file)
--- a/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
+++ b/tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
@@ -32,7 +32,7 @@ class ConfigTest extends ApiTest
         */
        public function testApiStatusnetConfig()
        {
-               $response = (new Config(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Config(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
                $json = $this->toJson($response);
 

diff --git a/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php b/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
index 2b636565aefaccc7ee80ad812010aa4d04f09ae9..11fa444efb9ea29169d1331ffd730bc3d47a2f5f 100644 (file)
--- a/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
+++ b/tests/src/Module/Api/GnuSocial/GnuSocial/VersionTest.php
@@ -30,7 +30,7 @@ class VersionTest extends ApiTest
 {
        public function test()
        {
-               $response = (new Version(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
+               $response = (new Version(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                self::assertEquals([

diff --git a/tests/src/Module/Api/GnuSocial/Help/TestTest.php b/tests/src/Module/Api/GnuSocial/Help/TestTest.php
index 1b7934a1969d7c0781944940eda9069f3fa6e9ec..452211bb0dfe25230855b4c70747590f28ed1a75 100644 (file)
--- a/tests/src/Module/Api/GnuSocial/Help/TestTest.php
+++ b/tests/src/Module/Api/GnuSocial/Help/TestTest.php
@@ -30,7 +30,7 @@ class TestTest extends ApiTest
 {
        public function testJson()
        {
-               $response = (new Test(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
+               $response = (new Test(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $json = $this->toJson($response);
@@ -44,13 +44,13 @@ class TestTest extends ApiTest
 
        public function testXml()
        {
-               $response = (new Test(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
+               $response = (new Test(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
                        ->run($this->httpExceptionMock);
 
                self::assertEquals([
                        'Content-type'                => ['text/xml'],
                        ICanCreateResponses::X_HEADER => ['xml']
                ], $response->getHeaders());
-               self::assertxml($response->getBody(), 'ok');
+               self::assertXml($response->getBody(), 'ok');
        }
 }

diff --git a/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php b/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
index 6afa44b8355b70d438251e974a028e0d751ff031..06a3b8614b1e3dd83e70cbdadff38ce68d4ed4b2 100644 (file)
--- a/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
+++ b/tests/src/Module/Api/Mastodon/Accounts/VerifyCredentialsTest.php
@@ -35,7 +35,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(), []))
+               $response = (new VerifyCredentials(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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 960599e07a1c9ad9c27cfa876ad30b6d7257dbbf..2a4cc0e40672b03f7af104bd4a43f765a149c6e0 100644 (file)
--- a/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
+++ b/tests/src/Module/Api/Twitter/Account/RateLimitStatusTest.php
@@ -31,7 +31,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(), [], ['extension' => 'json']))
+               $response = (new RateLimitStatus(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $result = $this->toJson($response);
@@ -47,7 +47,7 @@ class RateLimitStatusTest extends ApiTest
 
        public function testWithXml()
        {
-               $response = (new RateLimitStatus(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
+               $response = (new RateLimitStatus(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'xml']))
                        ->run($this->httpExceptionMock);
 
                self::assertEquals([

diff --git a/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php b/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
index 2e452e3d52c80ad4f9b9152aa5a42d2b10cb6590..71817022dcd72c1d1bf02f0dff618158f56787ff 100644 (file)
--- a/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
+++ b/tests/src/Module/Api/Twitter/Account/UpdateProfileTest.php
@@ -35,7 +35,7 @@ class UpdateProfileTest extends ApiTest
        {
                $this->useHttpMethod(Router::POST);
 
-               $response = (new UpdateProfile(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
+               $response = (new UpdateProfile(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                '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 8a61ad88fd73cc89d072045487e86348c605208b..2476315a074a1ca2ab2525325d50ac26bfff0e09 100644 (file)
--- a/tests/src/Module/Api/Twitter/Blocks/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Blocks/ListsTest.php
@@ -33,7 +33,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(), []))
+               $response = (new Lists(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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 6ed3e15dc3cb9e8f482e1062a91ffab153c204a0..c04097cd8bba3d39f46ef2b6f1f702fd8113dd3d 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/AllTest.php
@@ -39,7 +39,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(), [], ['extension' => 'json']))
+               $response = (new All($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $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 f194d2a36478d4c303435422d9bad102322e059e..0dc9ba8e8f429b918edb086a9700f460a9665259 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/ConversationTest.php
@@ -38,7 +38,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(), [], ['extension' => 'json']))
+               $response = (new Conversation($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'friendica_verbose' => true,
                        ]);

diff --git a/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php b/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
index 509a65a7ebf95dce8f997d0e04d7324dc6f41461..d699fb713117e9962d228912188e39b94d624241 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/DestroyTest.php
@@ -37,7 +37,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(), [], ['extension' => 'json']))
+               (new Destroy(DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
        }
 
@@ -48,7 +48,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(), [], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'friendica_verbose' => true,
                        ]);
@@ -84,7 +84,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(), [], ['extension' => 'json']))
+               (new Destroy(DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'id' => 1
                        ]);
@@ -97,7 +97,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(), [], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'id'                  => 1,
                                'friendica_parenturi' => 'parent_uri',
@@ -121,7 +121,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(), [], ['extension' => 'json']))
+               $response = (new Destroy(DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                '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 c73592261d902426bbf508da1e98214a97d1d68a..6aa9db5a44c75601a52285ecd1be8587f9d89641 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/InboxTest.php
@@ -40,7 +40,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(), [], ['extension' => 'json']))
+               $response = (new Inbox($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $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 d5df5e4adcf744e4d02319bce7f44a8e37b28894..e0c9b070d54aa85271cbac236483c7b5a39c3cf3 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/NewDMTest.php
@@ -38,7 +38,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(), [], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                self::assertEmpty((string)$response->getBody());
@@ -70,7 +70,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(), [], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'text'    => 'message_text',
                                'user_id' => 43
@@ -92,7 +92,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(), [], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'text'    => 'message_text',
                                'user_id' => 44
@@ -116,7 +116,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(), [], ['extension' => 'json']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'text'    => 'message_text',
                                'user_id' => 44,
@@ -142,7 +142,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(), [], ['extension' => 'rss']))
+               $response = (new NewDM($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run($this->httpExceptionMock, [
                                '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 7886c8cffd3d958a2c9efbb6cf20b349b28038a4..a2355bca99ad24322d0b2a0ab81cdc894ed426b5 100644 (file)
--- a/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php
+++ b/tests/src/Module/Api/Twitter/DirectMessages/SentTest.php
@@ -38,7 +38,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(), [], ['extension' => 'json']))
+               $response = (new Sent($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock, [
                                'friendica_verbose' => true,
                        ]);
@@ -58,7 +58,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(), [], ['extension' => 'rss']))
+               $response = (new Sent($directMessage, DI::dba(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run($this->httpExceptionMock);
 
                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 9ddffeef6fac41dd5bc766a7869da9ce2658b82d..74f64e65ea661c9e6c2895d0a2fb31bef8eaad12 100644 (file)
--- a/tests/src/Module/Api/Twitter/Favorites/CreateTest.php
+++ b/tests/src/Module/Api/Twitter/Favorites/CreateTest.php
@@ -46,7 +46,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(), []))
+               (new Create(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -57,7 +57,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(), []))
+               $response = (new Create(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 3
                        ]);
@@ -74,7 +74,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(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
+               $response = (new Create(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
                        ->run($this->httpExceptionMock, [
                                'id' => 3
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php b/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
index 8dd4435bcd73bff54abf224b2e45379e4a3b0611..94c363abc926faaa905f4fb99d4d4909ea7a0942 100644 (file)
--- a/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/Favorites/DestroyTest.php
@@ -45,7 +45,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(), []))
+               (new Destroy(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -56,7 +56,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(), []))
+               $response = (new Destroy(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 3
                        ]);

diff --git a/tests/src/Module/Api/Twitter/FavoritesTest.php b/tests/src/Module/Api/Twitter/FavoritesTest.php
index c25cb86094e06f23d4df87838825589d1413c3dc..34c344f5fc1f6bbeaccf342a57450f28e0aec26e 100644 (file)
--- a/tests/src/Module/Api/Twitter/FavoritesTest.php
+++ b/tests/src/Module/Api/Twitter/FavoritesTest.php
@@ -36,7 +36,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(), []))
+               $response = (new Favorites(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'page'   => -1,
                                'max_id' => 10,
@@ -56,7 +56,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(), [], [
+               $response = (new Favorites(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run($this->httpExceptionMock);
 

diff --git a/tests/src/Module/Api/Twitter/Followers/ListsTest.php b/tests/src/Module/Api/Twitter/Followers/ListsTest.php
index fdbfb55f259d45d06576bc09118680f33d6ceb26..e44c27005e8d973619e99ba89700c7f98d0f99dd 100644 (file)
--- a/tests/src/Module/Api/Twitter/Followers/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Followers/ListsTest.php
@@ -33,7 +33,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(), []))
+               $response = (new Lists(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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 70b28557d334fe1942d0ed3bfe0fdb47551784be..0b2f4cd4ee6222a5a027adec4a956c130db7d779 100644 (file)
--- a/tests/src/Module/Api/Twitter/Friends/ListsTest.php
+++ b/tests/src/Module/Api/Twitter/Friends/ListsTest.php
@@ -35,7 +35,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(), []))
+               $response = (new Lists(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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 076edd4f6776b5279fe130908fc5b380481f7a0f..0b8d06980346140df7a0d2447191dc9a6fd33b15 100644 (file)
--- a/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php
+++ b/tests/src/Module/Api/Twitter/Friendships/IncomingTest.php
@@ -35,7 +35,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(), []))
+               $response = (new Incoming(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $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 b393c3b7b909d4af38f6012bf36ee38c7de3f006..8b6b9ed756ab474732da0a432b5b3cb23044a57d 100644 (file)
--- a/tests/src/Module/Api/Twitter/Lists/StatusesTest.php
+++ b/tests/src/Module/Api/Twitter/Lists/StatusesTest.php
@@ -38,7 +38,7 @@ class StatusesTest extends ApiTest
        {
                $this->expectException(BadRequestException::class);
 
-               (new Statuses(DI::dba(), DI::twitterStatus(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               (new Statuses(DI::dba(), DI::twitterStatus(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -47,7 +47,7 @@ class StatusesTest extends ApiTest
         */
        public function testApiListsStatusesWithListId()
        {
-               $response = (new Statuses(DI::dba(), DI::twitterStatus(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Statuses(DI::dba(), DI::twitterStatus(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'list_id' => 1,
                                'page'    => -1,
@@ -67,7 +67,7 @@ class StatusesTest extends ApiTest
         */
        public function testApiListsStatusesWithListIdAndRss()
        {
-               $response = (new Statuses(DI::dba(), DI::twitterStatus(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
+               $response = (new Statuses(DI::dba(), DI::twitterStatus(), DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'rss']))
                        ->run($this->httpExceptionMock, [
                                'list_id' => 1
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Media/UploadTest.php b/tests/src/Module/Api/Twitter/Media/UploadTest.php
index c830260d1c798fe7e2a04eb4477b61b8eceab24c..7ab2bcc207b34f46be13e7433a83c5cbc397662d 100644 (file)
--- a/tests/src/Module/Api/Twitter/Media/UploadTest.php
+++ b/tests/src/Module/Api/Twitter/Media/UploadTest.php
@@ -46,7 +46,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(), []))
+               (new Upload(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -60,7 +60,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(), []))
+               (new Upload(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -79,7 +79,7 @@ class UploadTest extends ApiTest
                        ]
                ];
 
-               (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               (new Upload(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -102,7 +102,7 @@ class UploadTest extends ApiTest
                        ]
                ];
 
-               $response = (new Upload(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Upload(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $media = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/SavedSearchesTest.php b/tests/src/Module/Api/Twitter/SavedSearchesTest.php
index 2e9ba9990e788ac9a27b5495cdd180df4cb1ff8e..c92d949ea3334f55a7f706e402e6bed63c14bba7 100644 (file)
--- a/tests/src/Module/Api/Twitter/SavedSearchesTest.php
+++ b/tests/src/Module/Api/Twitter/SavedSearchesTest.php
@@ -30,7 +30,7 @@ class SavedSearchesTest extends ApiTest
 {
        public function test()
        {
-               $response = (new SavedSearches(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
+               $response = (new SavedSearches(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => 'json']))
                        ->run($this->httpExceptionMock);
 
                $result = $this->toJson($response);

diff --git a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
index b93cb327caa417bb7854db5cf24241d94ffb3639..a08e2e5d86ae4e5794d9a77049dbd254f5981aa0 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/DestroyTest.php
@@ -45,7 +45,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(), []))
+               (new Destroy(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -71,7 +71,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(), []))
+               $response = (new Destroy(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 1
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php b/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
index 2e2f3cc0ebef30b44977d3120c3cb3bb22035a29..41a1fcd4cca42a7a29542836409c9a5fb1d46fff 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/MentionsTest.php
@@ -36,7 +36,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(), []))
+               $response = (new Mentions(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'max_id' => 10
                        ]);
@@ -54,7 +54,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(), []))
+               $response = (new Mentions(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'page' => -2
                        ]);
@@ -86,7 +86,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(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
+               $response = (new Mentions(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], ['extension' => ICanCreateResponses::TYPE_RSS]))
                        ->run($this->httpExceptionMock, [
                                'page' => -2
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php b/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
index 8ae89455204971b986eca47ab54d407de3dc2425..7903ac4819672a6b2e629a47009e2b59b0ceda95 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/NetworkPublicTimelineTest.php
@@ -36,7 +36,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(), []))
+               $response = (new NetworkPublicTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'max_id' => 10
                        ]);
@@ -58,7 +58,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(), []))
+               $response = (new NetworkPublicTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'page' => -2
                        ]);
@@ -94,7 +94,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(), [], [
+               $response = (new NetworkPublicTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run($this->httpExceptionMock, [
                        'page' => -2

diff --git a/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php b/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
index ead1e607dbaf4a0d44c45dbfac905f67a668841b..3de93b096ef7685b6dc9b415f11ca4a7c766d5bd 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/RetweetTest.php
@@ -45,7 +45,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(), []))
+               (new Retweet(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -71,7 +71,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(), []))
+               $response = (new Retweet(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 1
                        ]);
@@ -88,7 +88,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(), []))
+               $response = (new Retweet(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 5
                        ]);

diff --git a/tests/src/Module/Api/Twitter/Statuses/ShowTest.php b/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
index 628859df24f26d1328a5a11faa7f2c67ca4195bb..a3ab3d30cc8ac31180dbaf4b8daf12cbe8257772 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/ShowTest.php
@@ -39,7 +39,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(), []))
+               (new Show(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -50,7 +50,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(), []))
+               $response = (new Show(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'id' => 1
                        ]);
@@ -68,7 +68,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(), []))
+               $response = (new Show(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                '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 206e610487e046fc69b69adb18aeae8009083c45..4f1cd37ed3a1e9e0dbc8e61354e1fa6598bea36c 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/UpdateTest.php
@@ -54,7 +54,7 @@ class UpdateTest extends ApiTest
                        ]
                ];
 
-               $response = (new Update(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'status'                => 'Status content #friendica',
                                'in_reply_to_status_id' => 0,
@@ -76,7 +76,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(), []))
+               $response = (new Update(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                '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 e9f40d030defe518a39a2a80d50629f812c4a7a6..77b51bb7e4870d2be4074d74c9c60c5b57abb7fb 100644 (file)
--- a/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
+++ b/tests/src/Module/Api/Twitter/Statuses/UserTimelineTest.php
@@ -36,7 +36,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(), []))
+               $response = (new UserTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'user_id'         => 42,
                                'max_id'          => 10,
@@ -61,7 +61,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(), []))
+               $response = (new UserTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'user_id' => 42,
                                'page'    => -2,
@@ -84,7 +84,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(), [], [
+               $response = (new UserTimeline(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_RSS
                ]))->run($this->httpExceptionMock);
 

diff --git a/tests/src/Module/Api/Twitter/Users/LookupTest.php b/tests/src/Module/Api/Twitter/Users/LookupTest.php
index c4f8d8568f04528408860f1b05700e96effaa008..1228d2cbc2962bd0e5e3cf2a3d678b4aed681e9c 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/LookupTest.php
+++ b/tests/src/Module/Api/Twitter/Users/LookupTest.php
@@ -38,7 +38,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(), []))
+               (new Lookup(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 
@@ -49,7 +49,7 @@ class LookupTest extends ApiTest
         */
        public function testApiUsersLookupWithUserId()
        {
-               $response = (new Lookup(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Lookup(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                '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 921d2a434abb3ad031253980ffaed770e316160b..71c4e1240de18ce91500b4ce6ef41e054e3aa081 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/SearchTest.php
+++ b/tests/src/Module/Api/Twitter/Users/SearchTest.php
@@ -37,7 +37,7 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearch()
        {
-               $response = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
+               $response = (new Search(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock, [
                                'q' => static::OTHER_USER['name']
                        ]);
@@ -54,7 +54,7 @@ class SearchTest extends ApiTest
         */
        public function testApiUsersSearchWithXml()
        {
-               $response = (new Search(DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
+               $response = (new Search(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_XML
                ]))->run($this->httpExceptionMock, [
                        'q' => static::OTHER_USER['name']
@@ -72,7 +72,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(), []))
+               (new Search(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
        }
 }

diff --git a/tests/src/Module/Api/Twitter/Users/ShowTest.php b/tests/src/Module/Api/Twitter/Users/ShowTest.php
index 3fec80181a2c46145317e9b567c0590ef964d095..e7fc678a8dbc1db23a6bf5caa971a7d997b7609c 100644 (file)
--- a/tests/src/Module/Api/Twitter/Users/ShowTest.php
+++ b/tests/src/Module/Api/Twitter/Users/ShowTest.php
@@ -36,7 +36,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(), []))
+               $response = (new Show(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), []))
                        ->run($this->httpExceptionMock);
 
                $json = $this->toJson($response);
@@ -56,7 +56,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(), [], [
+               $response = (new Show(DI::mstdnError(), DI::app(), DI::l10n(), DI::baseUrl(), DI::args(), DI::logger(), DI::profiler(), DI::apiResponse(), [], [
                        'extension' => ICanCreateResponses::TYPE_XML
                ]))->run($this->httpExceptionMock);