Fixing wrong inherited methodsyntax

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index f0dfe0e01522d9e68ab796f448e9d66e96c7b9e2..8c24617c8325e2ef0de0cf41f1d2c697e72f7418 100644 (file)
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -68,12 +68,12 @@ class LegacyModule extends BaseModule
                require_once $file_path;
        }
 
-       public function content(array $request = []): string
+       protected function content(array $request = []): string
        {
                return $this->runModuleFunction('content');
        }
 
-       public function post(array $request = [], array $post = [])
+       protected function post(array $request = [], array $post = [])
        {
                parent::post($post);
 

diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php
index bb6c5b7385df24a07db56d55cce65f481aae7ffe..92039be145050e3be473874f49a814522a65d92e 100644 (file)
--- a/src/Module/Api/Friendica/Notification/Seen.php
+++ b/src/Module/Api/Friendica/Notification/Seen.php
@@ -38,7 +38,7 @@ use Friendica\Network\HTTPException\NotFoundException;
  */
 class Seen extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
index e81cd3d1fedca11cbc428137c33e7dcc9457f85f..4b1760031da114a4dc1701ecd9f0d41bd35781ce 100644 (file)
--- a/src/Module/Api/GNUSocial/Statusnet/Conversation.php
+++ b/src/Module/Api/GNUSocial/Statusnet/Conversation.php
@@ -34,7 +34,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Conversation extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

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

diff --git a/src/Module/Api/Twitter/Account/UpdateProfile.php b/src/Module/Api/Twitter/Account/UpdateProfile.php
index 2f1e1efa2b12821eb4fbdc4f7d0a93551a6c3d97..9c8c901511e7825ce7312d2ce5afd9b4a10780ba 100644 (file)
--- a/src/Module/Api/Twitter/Account/UpdateProfile.php
+++ b/src/Module/Api/Twitter/Account/UpdateProfile.php
@@ -32,7 +32,7 @@ use Friendica\Model\Profile;
  */
 class UpdateProfile extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Account/VerifyCredentials.php b/src/Module/Api/Twitter/Account/VerifyCredentials.php
index f5c0e0201ff53827e33ed7caed46d1f85f974e5d..170da69c669ac488ce7ac8a8eb9e7b38e98d4867 100644 (file)
--- a/src/Module/Api/Twitter/Account/VerifyCredentials.php
+++ b/src/Module/Api/Twitter/Account/VerifyCredentials.php
@@ -32,7 +32,7 @@ use Friendica\DI;
  */
 class VerifyCredentials extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Blocks/Ids.php b/src/Module/Api/Twitter/Blocks/Ids.php
index c733d7d641f7775037125e91a6ce8bd02f05fbd8..ea8655a63fcff32862813a32be28af37158249d2 100644 (file)
--- a/src/Module/Api/Twitter/Blocks/Ids.php
+++ b/src/Module/Api/Twitter/Blocks/Ids.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Ids extends ContactEndpoint
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Blocks/Lists.php b/src/Module/Api/Twitter/Blocks/Lists.php
index 4eb03a920a4c3566ba64a849f53b4d118a1e1fab..c0322ed6eb11a09ba2833f3ef59c16896e535f8e 100644 (file)
--- a/src/Module/Api/Twitter/Blocks/Lists.php
+++ b/src/Module/Api/Twitter/Blocks/Lists.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Lists extends ContactEndpoint
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Favorites.php b/src/Module/Api/Twitter/Favorites.php
index 4376b5b086b2feada736eaab7be8b82ba3de6b4a..8c6f7082a4d807cf37dfa2ca2f5f1d99d4e83d1b 100644 (file)
--- a/src/Module/Api/Twitter/Favorites.php
+++ b/src/Module/Api/Twitter/Favorites.php
@@ -35,7 +35,7 @@ use Friendica\Model\Post;
  */
 class Favorites extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Friendships/Incoming.php b/src/Module/Api/Twitter/Friendships/Incoming.php
index 6cc811453c9115feb8deb9494c33175ff096fe21..8a4a99565f2c1e162a36dd5e19586d7cca6afd1d 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Incoming.php
+++ b/src/Module/Api/Twitter/Friendships/Incoming.php
@@ -31,7 +31,7 @@ use Friendica\Module\BaseApi;
  */
 class Incoming extends ContactEndpoint
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                self::checkAllowedScope(self::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php
index 41ef0a3019e5adcbbb08e5c54df93559136a7981..03bbce7bde668a7efae076ad16666a1ef36c911d 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Statuses.php
+++ b/src/Module/Api/Twitter/Lists/Statuses.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Statuses extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Search/Tweets.php b/src/Module/Api/Twitter/Search/Tweets.php
index a8a0aea3afc42c93dd3653fabc3adb617df4bd6d..4d1aec833ea357f1d6db28d9298cb1779f899b9e 100644 (file)
--- a/src/Module/Api/Twitter/Search/Tweets.php
+++ b/src/Module/Api/Twitter/Search/Tweets.php
@@ -36,7 +36,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Tweets extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/Destroy.php b/src/Module/Api/Twitter/Statuses/Destroy.php
index 193e6fa7e7e6fe35a9ed48d635c1ddd81dbb1b9e..ae493eb2a160b904c54afa07b97a87a63cfc66f6 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Destroy.php
+++ b/src/Module/Api/Twitter/Statuses/Destroy.php
@@ -34,7 +34,7 @@ use Friendica\Model\Item;
  */
 class Destroy extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/HomeTimeline.php b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
index c805c7d7c872411dc87105b64943a7ce569e142a..c98134807afd5eb4e8e229e1bd613d87fdc108cd 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/HomeTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/HomeTimeline.php
@@ -35,7 +35,7 @@ use Friendica\Model\Post;
  */
 class HomeTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/Mentions.php b/src/Module/Api/Twitter/Statuses/Mentions.php
index 14a7f0b3f16332833099faab1dfad8c4e6d03442..08970340fc7c984cb386bfbb4a078b1362900a85 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Mentions.php
+++ b/src/Module/Api/Twitter/Statuses/Mentions.php
@@ -34,7 +34,7 @@ use Friendica\Model\Post;
  */
 class Mentions extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
index 51aafef11d66045a997014c4a360fe06a63b8f1b..56f2f10d5093f5b7e4e6cd917289cc4e8f2f4efc 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/NetworkPublicTimeline.php
@@ -33,7 +33,7 @@ use Friendica\Model\Post;
  */
 class NetworkPublicTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/PublicTimeline.php b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
index 51e597ef32407fb383673a8654feef833a754a00..ad4380fe1cd70199c0424d4ce6ef8f2d33b1ffff 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/PublicTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/PublicTimeline.php
@@ -33,7 +33,7 @@ use Friendica\Model\Post;
  */
 class PublicTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/Show.php b/src/Module/Api/Twitter/Statuses/Show.php
index 28e5655a8e899897872845cf02a86a50b57a4531..681d4130b82267d0ab88c10453ff5278f5030e2a 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/Show.php
+++ b/src/Module/Api/Twitter/Statuses/Show.php
@@ -36,7 +36,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class Show extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php
index 29fbc4fef6b5badddf282d3bf4804f527f135142..2b014490993297ff5c249df1df8eb1e4438bc8d5 100644 (file)
--- a/src/Module/Api/Twitter/Statuses/UserTimeline.php
+++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php
@@ -35,7 +35,7 @@ use Friendica\Model\Post;
  */
 class UserTimeline extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Users/Lookup.php b/src/Module/Api/Twitter/Users/Lookup.php
index b8e28c3650c95e371eba10dd048ec63e60f05470..53bedd53a84250f709946ac099e10d1f2408557c 100644 (file)
--- a/src/Module/Api/Twitter/Users/Lookup.php
+++ b/src/Module/Api/Twitter/Users/Lookup.php
@@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\NotFoundException;
  */
 class Lookup extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Users/Search.php b/src/Module/Api/Twitter/Users/Search.php
index 7ec9bed373858736614930eaaa464dbde9f871ce..e30480e267353bc91cdac658c3bf60115d845daf 100644 (file)
--- a/src/Module/Api/Twitter/Users/Search.php
+++ b/src/Module/Api/Twitter/Users/Search.php
@@ -35,7 +35,7 @@ use Friendica\Network\HTTPException\NotFoundException;
  */
 class Search extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php
index 1ace54880a7a5ed89f465f362e35aa5527b9bc88..d0d8f17bbae12a53d9afe6884180535fc1bcaf18 100644 (file)
--- a/src/Module/Api/Twitter/Users/Show.php
+++ b/src/Module/Api/Twitter/Users/Show.php
@@ -32,7 +32,7 @@ use Friendica\DI;
  */
 class Show extends BaseApi
 {
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
                BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
                $uid = BaseApi::getCurrentUserID();

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 8d5e26a261ab9381aaba96f11cecc24dcc6053c3..9ffd1762673532efa8ab684dfff82d111f9ad334 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -157,7 +157,7 @@ class Contact extends BaseModule
                Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
        }
 
-       public function content($update = 0): string
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Login::form($_SERVER['REQUEST_URI']);

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