Fix Contact modules

diff --git a/src/Module/Contact/Conversations.php b/src/Module/Contact/Conversations.php
index 2c1cf91d6bc997f20f722d9fd057e5f8116f91f0..5dd21bd12d240cff9506dd53c702058762ae5ebc 100644 (file)
--- a/src/Module/Contact/Conversations.php
+++ b/src/Module/Contact/Conversations.php
@@ -32,8 +32,11 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Theme;
 use Friendica\Model;
 use Friendica\Module\Contact;
+use Friendica\Module\Response;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  *  Manages and show Contacts and their content
@@ -48,26 +51,21 @@ class Conversations extends BaseModule
         * @var Conversation
         */
        private $conversation;
-       /**
-        * @var App\BaseURL
-        */
-       private $baseUrl;
        /**
         * @var LocalRelationship
         */
        private $localRelationship;
 
-       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Page $page, Conversation $conversation, array $parameters = [])
+       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, Conversation $conversation, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->page              = $page;
                $this->conversation      = $conversation;
-               $this->baseUrl           = $baseUrl;
                $this->localRelationship = $localRelationship;
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Login::form($_SERVER['REQUEST_URI']);

diff --git a/src/Module/Contact/Posts.php b/src/Module/Contact/Posts.php
index 3409d9169bc9f947ff751f7c4c00a531b7b11f9c..8823b7b40ef2401ba5fde5f495d69c83532e0cda 100644 (file)
--- a/src/Module/Contact/Posts.php
+++ b/src/Module/Contact/Posts.php
@@ -31,8 +31,11 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module\Contact;
+use Friendica\Module\Response;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  *  Show a contact posts and comments
@@ -43,25 +46,20 @@ class Posts extends BaseModule
         * @var LocalRelationship
         */
        private $localRelationship;
-       /**
-        * @var App\BaseURL
-        */
-       private $baseUrl;
        /**
         * @var App\Page
         */
        private $page;
 
-       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Page $page, array $parameters = [])
+       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->localRelationship = $localRelationship;
-               $this->baseUrl           = $baseUrl;
                $this->page              = $page;
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Login::form($_SERVER['REQUEST_URI']);

diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php
index 1af171872a8c0bb14e28ec1fa2ca5ddad714c626..660feaea93db8429b2f15fb2fb8970b3f1dfd691 100644 (file)
--- a/src/Module/Contact/Profile.php
+++ b/src/Module/Contact/Profile.php
@@ -38,8 +38,11 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Module;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  *  Show a contact profile
@@ -50,35 +53,25 @@ class Profile extends BaseModule
         * @var Repository\LocalRelationship
         */
        private $localRelationship;
-       /**
-        * @var App\BaseURL
-        */
-       private $baseUrl;
        /**
         * @var App\Page
         */
        private $page;
-       /**
-        * @var App\Arguments
-        */
-       private $args;
        /**
         * @var IManageConfigValues
         */
        private $config;
 
-       public function __construct(L10n $l10n, Repository\LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Page $page, App\Arguments $args, IManageConfigValues $config, array $parameters = [])
+       public function __construct(L10n $l10n, Repository\LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->localRelationship = $localRelationship;
-               $this->baseUrl           = $baseUrl;
                $this->page              = $page;
-               $this->args              = $args;
                $this->config            = $config;
        }
 
-       public function post()
+       protected function post(array $request = [], array $post = [])
        {
                if (!local_user()) {
                        return;
@@ -135,7 +128,7 @@ class Profile extends BaseModule
                }
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Module\Security\Login::form($_SERVER['REQUEST_URI']);