Replace typehint App with AppHelper in all classes

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 807fb6c0b1f2f5f4bfdff79218a7f7a07f374e03..a31132cc74de9c5522cc07ff4fbb65701f54cfdb 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -7,9 +7,11 @@
 
 namespace Friendica\Content;
 
-use Friendica\App;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
+use Friendica\App\Mode;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\ACL;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -32,8 +34,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Object\Post as PostObject;
 use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
-use Friendica\User\Settings\Entity\UserGServer;
-use Friendica\User\Settings\Repository;
+use Friendica\User\Settings\Repository\UserGServer;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
@@ -64,7 +65,7 @@ class Conversation
        private $logger;
        /** @var Item */
        private $item;
-       /** @var App\Arguments */
+       /** @var Arguments */
        private $args;
        /** @var IManagePersonalConfigValues */
        private $pConfig;
@@ -72,18 +73,18 @@ class Conversation
        private $baseURL;
        /** @var IManageConfigValues */
        private $config;
-       /** @var App */
-       private $app;
-       /** @var App\Page */
+       /** @var AppHelper */
+       private $appHelper;
+       /** @var Page */
        private $page;
-       /** @var App\Mode */
+       /** @var Mode */
        private $mode;
        /** @var IHandleUserSessions */
        private $session;
-       /** @var Repository\UserGServer */
+       /** @var UserGServer */
        private $userGServer;
 
-       public function __construct(Repository\UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\Page $page, App\Mode $mode, App $app, IHandleUserSessions $session)
+       public function __construct(UserGServer $userGServer, LoggerInterface $logger, Profiler $profiler, Activity $activity, L10n $l10n, Item $item, Arguments $args, BaseURL $baseURL, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, Page $page, Mode $mode, AppHelper $appHelper, IHandleUserSessions $session)
        {
                $this->activity    = $activity;
                $this->item        = $item;
@@ -96,7 +97,7 @@ class Conversation
                $this->args        = $args;
                $this->pConfig     = $pConfig;
                $this->page        = $page;
-               $this->app         = $app;
+               $this->appHelper   = $appHelper;
                $this->session     = $session;
                $this->userGServer = $userGServer;
        }
@@ -1017,7 +1018,7 @@ class Conversation
                        $emojis[$count['uri-id']][$count['reaction']]['title'] = [];
                }
 
-               // @todo The following code should be removed, once that we display activity authors on demand 
+               // @todo The following code should be removed, once that we display activity authors on demand
                $activity_verbs = [
                        Activity::LIKE,
                        Activity::DISLIKE,

diff --git a/src/Content/Item.php b/src/Content/Item.php
index 3082a3ff4c93ca99f74ba821eb16941e0db2349f..a5a1a17a19057369cc9be823ebe5e1f789f27e2d 100644 (file)
--- a/src/Content/Item.php
+++ b/src/Content/Item.php
@@ -7,8 +7,8 @@
 
 namespace Friendica\Content;
 
-use Friendica\App;
 use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\BBCode\Video;
 use Friendica\Content\Text\HTML;
@@ -66,10 +66,10 @@ class Item
        private $baseURL;
        /** @var Emailer */
        private $emailer;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
 
-       public function __construct(Profiler $profiler, Activity $activity, L10n $l10n, IHandleUserSessions $userSession, Video $bbCodeVideo, ACLFormatter $aclFormatter, IManagePersonalConfigValues $pConfig, BaseURL $baseURL, Emailer $emailer, App $app)
+       public function __construct(Profiler $profiler, Activity $activity, L10n $l10n, IHandleUserSessions $userSession, Video $bbCodeVideo, ACLFormatter $aclFormatter, IManagePersonalConfigValues $pConfig, BaseURL $baseURL, Emailer $emailer, AppHelper $appHelper)
        {
                $this->profiler     = $profiler;
                $this->activity     = $activity;
@@ -80,7 +80,7 @@ class Item
                $this->baseURL      = $baseURL;
                $this->pConfig      = $pConfig;
                $this->emailer      = $emailer;
-               $this->app          = $app;
+               $this->appHelper    = $appHelper;
        }
 
        /**

diff --git a/src/Module/Api/Friendica/DirectMessages/Search.php b/src/Module/Api/Friendica/DirectMessages/Search.php
index 0aacdf9b369ec6a711e43d6dd8d6894b6fc40e6c..18eee80af8fb2d275cc2ac301690127b8994be75 100644 (file)
--- a/src/Module/Api/Friendica/DirectMessages/Search.php
+++ b/src/Module/Api/Friendica/DirectMessages/Search.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Friendica\DirectMessages;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -30,9 +32,9 @@ class Search extends BaseApi
        /** @var DirectMessage */
        private $directMessage;
 
-       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba           = $dba;
                $this->directMessage = $directMessage;

diff --git a/src/Module/Api/Friendica/Photo.php b/src/Module/Api/Friendica/Photo.php
index 31c54b7639000d58aadf666ffe1107d558ebcbe7..a54c41b3c5c574aacffb6e8be0159a600c548e5c 100644 (file)
--- a/src/Module/Api/Friendica/Photo.php
+++ b/src/Module/Api/Friendica/Photo.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Friendica;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Friendica\Photo as FriendicaPhoto;
 use Friendica\Module\BaseApi;
@@ -23,9 +25,9 @@ class Photo extends BaseApi
        private $friendicaPhoto;
 
 
-       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->friendicaPhoto = $friendicaPhoto;
        }

diff --git a/src/Module/Api/Friendica/Photo/Create.php b/src/Module/Api/Friendica/Photo/Create.php
index 49b943f188608480be611ede0853e6134cc6cde5..4a50083f35d488d330faaea6701f0134184b42b9 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Create.php
+++ b/src/Module/Api/Friendica/Photo/Create.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Friendica\Photo;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Friendica\Photo as FriendicaPhoto;
@@ -27,9 +29,9 @@ class Create extends BaseApi
        private $friendicaPhoto;
 
 
-       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->friendicaPhoto = $friendicaPhoto;
        }

diff --git a/src/Module/Api/Friendica/Photo/Lists.php b/src/Module/Api/Friendica/Photo/Lists.php
index c493c3e9229d22fee400eb32e636349f7e6fb837..174bd06ce75200e8cdd7c50e765c841cdde25ade 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Lists.php
+++ b/src/Module/Api/Friendica/Photo/Lists.php
@@ -7,9 +7,11 @@
 
 namespace Friendica\Module\Api\Friendica\Photo;
 
-use Friendica\Database\DBA;
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
+use Friendica\Database\DBA;
 use Friendica\Factory\Api\Friendica\Photo as FriendicaPhoto;
 use Friendica\Module\BaseApi;
 use Friendica\Model\Contact;
@@ -29,9 +31,9 @@ class Lists extends BaseApi
        private $friendicaPhoto;
 
 
-       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->friendicaPhoto = $friendicaPhoto;
        }

diff --git a/src/Module/Api/Friendica/Photo/Update.php b/src/Module/Api/Friendica/Photo/Update.php
index 8c072541d3d1d29de557b47f8c7b4615f39d22cd..2a3929189fd08dff0cf0720040ea32764ad39a4a 100644 (file)
--- a/src/Module/Api/Friendica/Photo/Update.php
+++ b/src/Module/Api/Friendica/Photo/Update.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Friendica\Photo;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Friendica\Photo as FriendicaPhoto;
@@ -27,9 +29,9 @@ class Update extends BaseApi
        private $friendicaPhoto;
 
 
-       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->friendicaPhoto = $friendicaPhoto;
        }

diff --git a/src/Module/Api/Friendica/Photoalbum/Show.php b/src/Module/Api/Friendica/Photoalbum/Show.php
index 8542ea1ba7efa963fce552cc8466a704bc2909ce..48b10195c928be31133ff4293a6fa7e36111c25d 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Show.php
+++ b/src/Module/Api/Friendica/Photoalbum/Show.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Friendica\Photoalbum;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Friendica\Photo as FriendicaPhoto;
 use Friendica\Model\Contact;
@@ -29,9 +31,9 @@ class Show extends BaseApi
        private $friendicaPhoto;
 
 
-       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(FriendicaPhoto $friendicaPhoto, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->friendicaPhoto = $friendicaPhoto;
        }

diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index 6b7ddfb3e142c09b0a4245b28c7633170ae6f72f..2b50613290ae66eb09dbcf2a63f57d67c6f97781 100644 (file)
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
@@ -37,9 +39,9 @@ class Instance extends BaseApi
        /** @var AccountFactory */
        private $accountFactory;
 
-       public function __construct(AccountFactory $accountFactory, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, Database $database, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(AccountFactory $accountFactory, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, Database $database, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
                $this->config = $config;

diff --git a/src/Module/Api/Mastodon/Instance/ExtendedDescription.php b/src/Module/Api/Mastodon/Instance/ExtendedDescription.php
index 886aa64e0472c0d4e4267234cd40b7a36361b406..03e2ca17eab221281fbd3e7d701972fb1111fe45 100644 (file)
--- a/src/Module/Api/Mastodon/Instance/ExtendedDescription.php
+++ b/src/Module/Api/Mastodon/Instance/ExtendedDescription.php
@@ -8,7 +8,9 @@
 namespace Friendica\Module\Api\Mastodon\Instance;
 
 use DateTime;
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
@@ -26,9 +28,9 @@ class ExtendedDescription extends BaseApi
 {
        private IManageConfigValues $config;
 
-       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->config = $config;
        }

diff --git a/src/Module/Api/Mastodon/InstanceV2.php b/src/Module/Api/Mastodon/InstanceV2.php
index f33f60b2c61ecdcd88b55702f515660be137352c..4cb3af66b9e9b2d95ce5068200ceda59e6744f6b 100644 (file)
--- a/src/Module/Api/Mastodon/InstanceV2.php
+++ b/src/Module/Api/Mastodon/InstanceV2.php
@@ -9,6 +9,9 @@ namespace Friendica\Module\Api\Mastodon;
 
 use Exception;
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Contact\Header;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
@@ -41,10 +44,10 @@ class InstanceV2 extends BaseApi
 
        public function __construct(
                \Friendica\Factory\Api\Mastodon\Error $errorFactory,
-               App $app,
+               AppHelper $appHelper,
                L10n $l10n,
-               App\BaseURL $baseUrl,
-               App\Arguments $args,
+               BaseURL $baseUrl,
+               Arguments $args,
                LoggerInterface $logger,
                Profiler $profiler,
                ApiResponse $response,
@@ -53,7 +56,7 @@ class InstanceV2 extends BaseApi
                array $server,
                array $parameters = []
        ) {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database      = $database;
                $this->config        = $config;

diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php
index 5fcf926d02fbc4c7674cd660481c2397fc674078..b2f3292d9e133793c7b9e4893ab3914e89aaf8d1 100644 (file)
--- a/src/Module/Api/Mastodon/Lists.php
+++ b/src/Module/Api/Mastodon/Lists.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Content\Conversation\Factory\Channel as ChannelFactory;
@@ -29,9 +31,9 @@ class Lists extends BaseApi
        /** @var Repository\UserDefinedChannel */
        protected $userDefinedChannel;
 
-       public function __construct(Repository\UserDefinedChannel $userDefinedChannel, ChannelFactory $channel, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Repository\UserDefinedChannel $userDefinedChannel, ChannelFactory $channel, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->channel            = $channel;
                $this->userDefinedChannel = $userDefinedChannel;

diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php
index 9ddeb4eb232ef9edeb3949b960c28a7879ef7839..a83263bb2449812e8bb13517241c6ddd2fc63b36 100644 (file)
--- a/src/Module/Api/Mastodon/PushSubscription.php
+++ b/src/Module/Api/Mastodon/PushSubscription.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Factory\Api\Mastodon\Error;
 use Friendica\Factory\Api\Mastodon\Subscription as SubscriptionFactory;
@@ -26,9 +28,9 @@ class PushSubscription extends BaseApi
        /** @var SubscriptionFactory */
        protected $subscriptionFac;
 
-       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, SubscriptionFactory $subscriptionFac, array $server, array $parameters = [])
+       public function __construct(Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, SubscriptionFactory $subscriptionFac, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->subscriptionFac = $subscriptionFac;
        }

diff --git a/src/Module/Api/Mastodon/Reports.php b/src/Module/Api/Mastodon/Reports.php
index eff8bbe679ec446dafb4d72d69bb8b84969731f4..66c9b518a7fb6d52ac16a1d836badcacbc78471a 100644 (file)
--- a/src/Module/Api/Mastodon/Reports.php
+++ b/src/Module/Api/Mastodon/Reports.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
@@ -27,9 +29,9 @@ class Reports extends BaseApi
        /** @var \Friendica\Moderation\Repository\Report */
        private $reportRepo;
 
-       public function __construct(\Friendica\Moderation\Repository\Report $reportRepo, \Friendica\Moderation\Factory\Report $reportFactory, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(\Friendica\Moderation\Repository\Report $reportRepo, \Friendica\Moderation\Factory\Report $reportFactory, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->reportFactory = $reportFactory;
                $this->reportRepo    = $reportRepo;

diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
index ef777d64bb36530a6b8b1f82183c386ad6f17070..249955fdb30ee6226e3bcba4e77b80df02b62e55 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon\Timelines;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
@@ -34,9 +36,9 @@ class ListTimeline extends BaseApi
        /** @var Timeline */
        protected $timeline;
 
-       public function __construct(Timeline $timeline, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Timeline $timeline, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
                $this->timeline = $timeline;
        }
 

diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
index 16e6149df3c3aacb774fde829845531271053974..411a15903795865436637079b0d91e5692c1ce08 100644 (file)
--- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
+++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon\Timelines;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
@@ -34,9 +36,9 @@ class PublicTimeline extends BaseApi
         */
        private $config;
 
-       public function __construct(IManageConfigValues $config, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(IManageConfigValues $config, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
                $this->config = $config;
        }
        /**

diff --git a/src/Module/Api/Mastodon/Trends/Statuses.php b/src/Module/Api/Mastodon/Trends/Statuses.php
index b63d3f9ca40d73d4497cdf57095a051ff7a633c3..142766593d7436e5ba1b869ce99f6ad9e328a575 100644 (file)
--- a/src/Module/Api/Mastodon/Trends/Statuses.php
+++ b/src/Module/Api/Mastodon/Trends/Statuses.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Mastodon\Trends;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
@@ -32,9 +34,9 @@ class Statuses extends BaseApi
         */
        private $config;
 
-       public function __construct(IManageConfigValues $config, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(IManageConfigValues $config, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
                $this->config = $config;
        }
 

diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php
index 3896351ded76c0aa561234e41d24f8d8714cb386..1781a17ce237ab8b4ebcd33d4ef075b38fe26c55 100644 (file)
--- a/src/Module/Api/Twitter/ContactEndpoint.php
+++ b/src/Module/Api/Twitter/ContactEndpoint.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -24,9 +26,9 @@ abstract class ContactEndpoint extends BaseApi
        const DEFAULT_COUNT = 20;
        const MAX_COUNT = 200;
 
-       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->checkAllowedScope(self::SCOPE_READ);
        }

diff --git a/src/Module/Api/Twitter/DirectMessages/Destroy.php b/src/Module/Api/Twitter/DirectMessages/Destroy.php
index 8676e91fbab4c6d6e7a4793fc83b13431e389b85..36494b4a6612df69aed98ce1b295448f12548e5c 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/Destroy.php
+++ b/src/Module/Api/Twitter/DirectMessages/Destroy.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\DirectMessages;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -27,9 +29,9 @@ class Destroy extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba = $dba;
        }

diff --git a/src/Module/Api/Twitter/DirectMessages/NewDM.php b/src/Module/Api/Twitter/DirectMessages/NewDM.php
index 170c11fb9d25dfdd37b8b52165bd11b7c1e9f4cd..8dd98382974a5163e9d31aa676a2023bfb33d953 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessages/NewDM.php
+++ b/src/Module/Api/Twitter/DirectMessages/NewDM.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\DirectMessages;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Factory\Api\Twitter\DirectMessage;
@@ -32,9 +34,9 @@ class NewDM extends BaseApi
        /** @var DirectMessage */
        private $directMessage;
 
-       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba           = $dba;
                $this->directMessage = $directMessage;

diff --git a/src/Module/Api/Twitter/DirectMessagesEndpoint.php b/src/Module/Api/Twitter/DirectMessagesEndpoint.php
index 97f1de1828997f3118e5991aec04e4e6792a6a75..e4bf7b92fbe22cc1cf409d82bd46f7d0ecf93973 100644 (file)
--- a/src/Module/Api/Twitter/DirectMessagesEndpoint.php
+++ b/src/Module/Api/Twitter/DirectMessagesEndpoint.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -26,9 +28,9 @@ abstract class DirectMessagesEndpoint extends BaseApi
        /** @var DirectMessage */
        private $directMessage;
 
-       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(DirectMessage $directMessage, Database $dba, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba           = $dba;
                $this->directMessage = $directMessage;

diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php
index d7f65907be71defdd54f044f8a5697e941059924..cf014134c09af4aaa992e18c56233dfc75326044 100644 (file)
--- a/src/Module/Api/Twitter/Friendships/Destroy.php
+++ b/src/Module/Api/Twitter/Friendships/Destroy.php
@@ -8,7 +8,9 @@
 namespace Friendica\Module\Api\Twitter\Friendships;
 
 use Exception;
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Factory\Api\Twitter\User as TwitterUser;
@@ -31,9 +33,9 @@ class Destroy extends ContactEndpoint
        /** @var TwitterUser */
        private $twitterUser;
 
-       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, TwitterUser $twitterUser, array $server, array $parameters = [])
+       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, TwitterUser $twitterUser, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->twitterUser = $twitterUser;
        }

diff --git a/src/Module/Api/Twitter/Lists/Create.php b/src/Module/Api/Twitter/Lists/Create.php
index e641b22ac0704ced5338d618faa004930e89baab..4343a75eeadebc83bca5cbb69bc99e20f9e08778 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Create.php
+++ b/src/Module/Api/Twitter/Lists/Create.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\Lists;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle;
@@ -32,9 +34,9 @@ class Create extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba             = $dba;
                $this->friendicaCircle = $friendicaCircle;

diff --git a/src/Module/Api/Twitter/Lists/Destroy.php b/src/Module/Api/Twitter/Lists/Destroy.php
index 48b9a4e0266388759d846c1c43d8479e7b85c5ef..34a8d8a99d09b3bf42aca9e15e77e02036b52d2a 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Destroy.php
+++ b/src/Module/Api/Twitter/Lists/Destroy.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\Lists;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Factory\Api\Friendica\Circle as FriendicaCirle;
@@ -32,9 +34,9 @@ class Destroy extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, FriendicaCirle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, FriendicaCirle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba             = $dba;
                $this->friendicaCircle = $friendicaCircle;

diff --git a/src/Module/Api/Twitter/Lists/Ownership.php b/src/Module/Api/Twitter/Lists/Ownership.php
index 16d91efe8daa419b25d71fd40e95fb3d6cd1de42..bdf34ed28092dbe766f5b7f0552c4db0085220c7 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Ownership.php
+++ b/src/Module/Api/Twitter/Lists/Ownership.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\Lists;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle;
@@ -30,9 +32,9 @@ class Ownership extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba             = $dba;
                $this->friendicaCircle = $friendicaCircle;

diff --git a/src/Module/Api/Twitter/Lists/Statuses.php b/src/Module/Api/Twitter/Lists/Statuses.php
index 5d067a21f1e20f056fbb4d81973d3c2fd0a4e53f..5b501f3fa3843503e1b00d13878a158a7bf28396 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Statuses.php
+++ b/src/Module/Api/Twitter/Lists/Statuses.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\Lists;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -34,9 +36,9 @@ class Statuses extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, TwitterStatus $twitterStatus, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, TwitterStatus $twitterStatus, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba           = $dba;
                $this->twitterStatus = $twitterStatus;

diff --git a/src/Module/Api/Twitter/Lists/Update.php b/src/Module/Api/Twitter/Lists/Update.php
index f255080df4b9376e1d60778c7490254fb2572398..c5c368a7412eb3d85643e83e8d05f1b61dc255c4 100644 (file)
--- a/src/Module/Api/Twitter/Lists/Update.php
+++ b/src/Module/Api/Twitter/Lists/Update.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Api\Twitter\Lists;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Database\Database;
 use Friendica\Factory\Api\Friendica\Circle as FriendicaCircle;
@@ -32,9 +34,9 @@ class Update extends BaseApi
        /** @var Database */
        private $dba;
 
-       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(Database $dba, FriendicaCircle $friendicaCircle, \Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
-               parent::__construct($errorFactory, $app, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($errorFactory, $appHelper, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->dba             = $dba;
                $this->friendicaCircle = $friendicaCircle;

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 4b3b817816d0ecd6c8460a5e95471b2ead366e10..e5ec4db8dcb7dc98c5dbe511e0923ff3ebd8a8cf 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -8,8 +8,10 @@
 namespace Friendica\Module;
 
 use DateTime;
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\App\Router;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
@@ -51,8 +53,8 @@ class BaseApi extends BaseModule
         */
        protected static $request = [];
 
-       /** @var App */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
 
        /** @var ApiResponse */
        protected $response;
@@ -60,11 +62,11 @@ class BaseApi extends BaseModule
        /** @var \Friendica\Factory\Api\Mastodon\Error */
        protected $errorFactory;
 
-       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
+       public function __construct(\Friendica\Factory\Api\Mastodon\Error $errorFactory, AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, ApiResponse $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app          = $app;
+               $this->appHelper    = $appHelper;
                $this->errorFactory = $errorFactory;
        }
 

diff --git a/src/Module/BaseModeration.php b/src/Module/BaseModeration.php
index 797a73b2f8d7262b4797e639b483c6d1e87f264e..e72698f259e0a48d3394fa03d884c58769a25762 100644 (file)
--- a/src/Module/BaseModeration.php
+++ b/src/Module/BaseModeration.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -33,18 +36,18 @@ abstract class BaseModeration extends BaseModule
        protected $session;
        /** @var SystemMessages */
        protected $systemMessages;
-       /** @var App */
-       protected $app;
-       /** @var App\Page */
+       /** @var AppHelper */
+       protected $appHelper;
+       /** @var Page */
        protected $page;
 
-       public function __construct(App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->session        = $session;
                $this->systemMessages = $systemMessages;
-               $this->app            = $app;
+               $this->appHelper      = $appHelper;
                $this->page           = $page;
        }
 

diff --git a/src/Module/Calendar/Event/Show.php b/src/Module/Calendar/Event/Show.php
index 175bc18707ade2c80a4d77fc2564ee9385675a06..6cfe9b520848e50a8137c5563895cb4b17311cc8 100644 (file)
--- a/src/Module/Calendar/Event/Show.php
+++ b/src/Module/Calendar/Event/Show.php
@@ -7,15 +7,14 @@
 
 namespace Friendica\Module\Calendar\Event;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
-use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\Core\System;
 use Friendica\Model\Event;
-use Friendica\Model\User;
 use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Profiler;
@@ -28,15 +27,15 @@ class Show extends BaseModule
 {
        /** @var IHandleUserSessions */
        protected $session;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       protected $appHelper;
 
-       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->session = $session;
-               $this->app     = $app;
+               $this->session   = $session;
+               $this->appHelper = $appHelper;
        }
 
        protected function rawContent(array $request = [])

diff --git a/src/Module/Calendar/Export.php b/src/Module/Calendar/Export.php
index 9e8141ad4baf6bd3263ae9e16c7fa31cf8fb5643..ef1663640682963659c800ad5ce874622fe85570 100644 (file)
--- a/src/Module/Calendar/Export.php
+++ b/src/Module/Calendar/Export.php
@@ -7,16 +7,16 @@
 
 namespace Friendica\Module\Calendar;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Model\Event;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\Response;
-use Friendica\Module\Security\Login;
 use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Profiler;
@@ -36,16 +36,16 @@ class Export extends BaseModule
        protected $session;
        /** @var SystemMessages */
        protected $sysMessages;
-       /** @var App */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
 
-       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->session     = $session;
                $this->sysMessages = $sysMessages;
-               $this->app         = $app;
+               $this->appHelper   = $appHelper;
        }
 
        protected function rawContent(array $request = [])
@@ -55,7 +55,7 @@ class Export extends BaseModule
                        throw new HTTPException\BadRequestException();
                }
 
-               $owner = Profile::load($this->app, $nickname, false);
+               $owner = Profile::load($this->appHelper, $nickname, false);
                if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }

diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php
index 571d0172a10c9f6c676cf3dcb409ce7937fff356..82f6e55d56d2991695e7c608c9ac06c0a3b2d644 100644 (file)
--- a/src/Module/Calendar/Show.php
+++ b/src/Module/Calendar/Show.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Calendar;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -33,12 +36,12 @@ class Show extends BaseModule
        protected $session;
        /** @var SystemMessages */
        protected $sysMessages;
-       /** @var App\Page */
+       /** @var Page */
        protected $page;
-       /** @var App */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App\Page $page, App $app, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, Page $page, AppHelper $app, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -55,7 +58,7 @@ class Show extends BaseModule
                        throw new HTTPException\UnauthorizedException();
                }
 
-               $owner = Profile::load($this->app, $nickname, false);
+               $owner = Profile::load($this->appHelper, $nickname, false);
                if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }

diff --git a/src/Module/Moderation/BaseUsers.php b/src/Module/Moderation/BaseUsers.php
index 91c538c123d0dbbc846edda6e0f4c54070a80225..0123ce5bc84e53741f15c547abeee32b66ae6cd9 100644 (file)
--- a/src/Module/Moderation/BaseUsers.php
+++ b/src/Module/Moderation/BaseUsers.php
@@ -7,13 +7,15 @@
 
 namespace Friendica\Module\Moderation;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Database\Database;
-use Friendica\DI;
 use Friendica\Model\Register;
 use Friendica\Model\User;
 use Friendica\Module\BaseModeration;
@@ -29,9 +31,9 @@ abstract class BaseUsers extends BaseModeration
        /** @var Database */
        protected $database;
 
-       public function __construct(Database $database, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
        }

diff --git a/src/Module/Moderation/Blocklist/Contact.php b/src/Module/Moderation/Blocklist/Contact.php
index d19fd749037b81b9abe813f23b97d6860e7695bc..02bb451213a032b2c82a5de297823aa901326e26 100644 (file)
--- a/src/Module/Moderation/Blocklist/Contact.php
+++ b/src/Module/Moderation/Blocklist/Contact.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation\Blocklist;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -18,7 +21,6 @@ use Friendica\Model;
 use Friendica\Module\BaseModeration;
 use Friendica\Module\Response;
 use Friendica\Navigation\SystemMessages;
-use Friendica\Util\Network;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -27,9 +29,9 @@ class Contact extends BaseModeration
        /** @var Database */
        private $database;
 
-       public function __construct(Database $database, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
        }

diff --git a/src/Module/Moderation/Blocklist/Server/Add.php b/src/Module/Moderation/Blocklist/Server/Add.php
index f98a3ec7162cbbea74fad84ff20e377d00a504d1..95f638f088eac31d5606c45dd4a5ca806353826c 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Add.php
+++ b/src/Module/Moderation/Blocklist/Server/Add.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation\Blocklist\Server;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -29,7 +32,7 @@ class Add extends BaseModeration
        /** @var DomainPatternBlocklist */
        private $blocklist;
 
-       public function __construct(DomainPatternBlocklist $blocklist, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(DomainPatternBlocklist $blocklist, Page $page, AppHelper $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/Moderation/Blocklist/Server/Import.php b/src/Module/Moderation/Blocklist/Server/Import.php
index d42101857eadd0c838f2a091de397363e904e870..52f2a1ccc1d60c0e476b7ee58ca12ea8b6df768e 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Import.php
+++ b/src/Module/Moderation/Blocklist/Server/Import.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation\Blocklist\Server;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -27,9 +30,9 @@ class Import extends \Friendica\Module\BaseModeration
        /** @var array of blocked server domain patterns */
        private $blocklist = [];
 
-       public function __construct(DomainPatternBlocklist $localBlocklist, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(DomainPatternBlocklist $localBlocklist, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->localBlocklist = $localBlocklist;
        }

diff --git a/src/Module/Moderation/Blocklist/Server/Index.php b/src/Module/Moderation/Blocklist/Server/Index.php
index fd9fbdec877041e1e8b1dd4e7513fc4e4b2850f8..20d95a218dfaac91806000412e08dfebcaa98f43 100644 (file)
--- a/src/Module/Moderation/Blocklist/Server/Index.php
+++ b/src/Module/Moderation/Blocklist/Server/Index.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation\Blocklist\Server;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -24,9 +27,9 @@ class Index extends BaseModeration
        /** @var DomainPatternBlocklist */
        private $blocklist;
 
-       public function __construct(DomainPatternBlocklist $blocklist, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(DomainPatternBlocklist $blocklist, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->blocklist = $blocklist;
        }

diff --git a/src/Module/Moderation/Item/Source.php b/src/Module/Moderation/Item/Source.php
index 80edbe04b94f83449638e447ac3eef0c3976cbcf..10f70e5fd44380e1bc2e8f7759456e3cc5ea49cc 100644 (file)
--- a/src/Module/Moderation/Item/Source.php
+++ b/src/Module/Moderation/Item/Source.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation\Item;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -24,9 +27,9 @@ class Source extends BaseModeration
        /** @var IManageConfigValues */
        private $config;
 
-       public function __construct(IManageConfigValues $config, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(IManageConfigValues $config, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->config = $config;
        }

diff --git a/src/Module/Moderation/Reports.php b/src/Module/Moderation/Reports.php
index 7951dda59b7e12b60804296954e0368322d1ae71..1b713abb66867b7236ad449489fd1c24bd52a879 100644 (file)
--- a/src/Module/Moderation/Reports.php
+++ b/src/Module/Moderation/Reports.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
@@ -27,9 +30,9 @@ class Reports extends BaseModeration
        /** @var Database */
        private $database;
 
-       public function __construct(Database $database, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
        }

diff --git a/src/Module/Moderation/Summary.php b/src/Module/Moderation/Summary.php
index b9f4144df3bcd21a40a6d5b35c6606dd293d1a3b..99ab2ee296c4a4b8a0292ea0deca64533bb1ca68 100644 (file)
--- a/src/Module/Moderation/Summary.php
+++ b/src/Module/Moderation/Summary.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Moderation;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -24,9 +27,9 @@ class Summary extends BaseModeration
        /** @var Database */
        private $database;
 
-       public function __construct(Database $database, App\Page $page, App $app, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, Page $page, AppHelper $appHelper, SystemMessages $systemMessages, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($page, $app, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($page, $appHelper, $systemMessages, $session, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
        }
@@ -34,7 +37,7 @@ class Summary extends BaseModeration
        protected function content(array $request = []): string
        {
                parent::content();
-       
+
                $accounts = [
                        [$this->t('Personal Page'), 0],
                        [$this->t('Organisation Page'), 0],

diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index 59836d8f91ab13fe4755532b911801f9c2143319..8e280ef0cbe359e1e9ab6d47fb9ff3da5802bb60 100644 (file)
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Notifications;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Contact\Introduction\Repository\Introduction;
 use Friendica\Content\GroupManager;
@@ -60,10 +62,10 @@ class Ping extends BaseModule
        private $cache;
        /** @var Repository\Notify */
        private $notify;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
 
-       public function __construct(App $app, Repository\Notify $notify, ICanCache $cache, Database $database, IManagePersonalConfigValues $pconfig, IManageConfigValues $config, IHandleUserSessions $session, SystemMessages $systemMessages, Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, Repository\Notify $notify, ICanCache $cache, Database $database, IManagePersonalConfigValues $pconfig, IManageConfigValues $config, IHandleUserSessions $session, SystemMessages $systemMessages, Repository\Notification $notificationRepo, Introduction $introductionRepo, Factory\FormattedNavNotification $formattedNavNotification, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -77,7 +79,7 @@ class Ping extends BaseModule
                $this->database                 = $database;
                $this->cache                    = $cache;
                $this->notify                   = $notify;
-               $this->app                      = $app;
+               $this->appHelper                = $appHelper;
        }
 
        protected function rawContent(array $request = [])

diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php
index f07639a18a4f8ebdb44685699a1a5dc707c003dc..c07ba9d78f723286c8444082caf24abafef88e69 100644 (file)
--- a/src/Module/Post/Edit.php
+++ b/src/Module/Post/Edit.php
@@ -8,6 +8,11 @@
 namespace Friendica\Module\Post;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Mode;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\Hook;
@@ -37,12 +42,12 @@ class Edit extends BaseModule
        protected $page;
        /** @var App\Mode */
        protected $mode;
-       /** @var App */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var bool */
        protected $isModal = false;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, App\Page $page, App\Mode $mode, App $app, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, Page $page, Mode $mode, AppHelper $appHelper, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -50,7 +55,7 @@ class Edit extends BaseModule
                $this->sysMessages = $sysMessages;
                $this->page        = $page;
                $this->mode        = $mode;
-               $this->app         = $app;
+               $this->appHelper   = $appHelper;
        }
 
 

diff --git a/src/Module/Profile/Common.php b/src/Module/Profile/Common.php
index 539b132c1eb0489609c1a36578a97f322513545e..ccd94844a2ec4eb423d3245107992d634f16c090 100644 (file)
--- a/src/Module/Profile/Common.php
+++ b/src/Module/Profile/Common.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -30,16 +32,16 @@ class Common extends BaseProfile
        private $config;
        /** @var IHandleUserSessions */
        private $userSession;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
 
-       public function __construct(App $app, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->config = $config;
                $this->userSession = $userSession;
-               $this->app = $app;
+               $this->appHelper = $appHelper;
        }
 
        protected function content(array $request = []): string
@@ -52,7 +54,7 @@ class Common extends BaseProfile
 
                $nickname = $this->parameters['nickname'];
 
-               $profile = Profile::load($this->app, $nickname);
+               $profile = Profile::load($this->appHelper, $nickname);
                if (empty($profile)) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 09bac2cee680c34f11f844d5e75d7c61231f4782..634a9f6bd82a1aacdbdbf0cdd18d95046dbed5a1 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -29,18 +31,18 @@ class Contacts extends Module\BaseProfile
        private $config;
        /** @var IHandleUserSessions */
        private $userSession;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
        /** @var Database */
        private $database;
 
-       public function __construct(Database $database, App $app, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, AppHelper $appHelper, IHandleUserSessions $userSession, IManageConfigValues $config, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->config      = $config;
                $this->userSession = $userSession;
-               $this->app         = $app;
+               $this->appHelper   = $appHelper;
                $this->database    = $database;
        }
 
@@ -53,7 +55,7 @@ class Contacts extends Module\BaseProfile
                $nickname = $this->parameters['nickname'];
                $type     = $this->parameters['type'] ?? 'all';
 
-               $profile = Model\Profile::load($this->app, $nickname);
+               $profile = Model\Profile::load($this->appHelper, $nickname);
                if (empty($profile)) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }

diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php
index 5558c879995db7f9277d2efe57f615d337e1a246..189153c6fb5c6b38c071083ccac7bf830745dbb9 100644 (file)
--- a/src/Module/Profile/Index.php
+++ b/src/Module/Profile/Index.php
@@ -7,7 +7,11 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Mode;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Content\Conversation;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -34,13 +38,13 @@ class Index extends BaseModule
 {
        /** @var Database */
        private $database;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var IHandleUserSessions */
        private $session;
        /** @var IManageConfigValues */
        private $config;
-       /** @var App\Page */
+       /** @var Page */
        private $page;
        /** @var ProfileField */
        private $profileField;
@@ -50,10 +54,10 @@ class Index extends BaseModule
        private $conversation;
        /** @var IManagePersonalConfigValues */
        private $pConfig;
-       /** @var App\Mode */
+       /** @var Mode */
        private $mode;
 
-       public function __construct(App\Mode $mode, IManagePersonalConfigValues $pConfig, Conversation $conversation, DateTimeFormat $dateTimeFormat, ProfileField $profileField, App\Page $page, IManageConfigValues $config, IHandleUserSessions $session, App $app, Database $database, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Mode $mode, IManagePersonalConfigValues $pConfig, Conversation $conversation, DateTimeFormat $dateTimeFormat, ProfileField $profileField, Page $page, IManageConfigValues $config, IHandleUserSessions $session, AppHelper $app, Database $database, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -71,11 +75,11 @@ class Index extends BaseModule
 
        protected function rawContent(array $request = [])
        {
-               (new Profile($this->profileField, $this->page, $this->config, $this->session, $this->app, $this->database, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->rawContent();
+               (new Profile($this->profileField, $this->page, $this->config, $this->session, $this->appHelper, $this->database, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->rawContent();
        }
 
        protected function content(array $request = []): string
        {
-               return (new Conversations($this->mode, $this->pConfig, $this->conversation, $this->session, $this->config, $this->dateTimeFormat, $this->page, $this->app, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content();
+               return (new Conversations($this->mode, $this->pConfig, $this->conversation, $this->session, $this->config, $this->dateTimeFormat, $this->page, $this->appHelper, $this->l10n, $this->baseUrl, $this->args, $this->logger, $this->profiler, $this->response, $this->server, $this->parameters))->content();
        }
 }

diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php
index fb89ac676dfbeb75808754e408654440ce23c15c..8620be736bdeb692c106c0b8f370905dee3bd850 100644 (file)
--- a/src/Module/Profile/Photos.php
+++ b/src/Module/Profile/Photos.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\Feature;
 use Friendica\Content\Pager;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -37,12 +40,12 @@ class Photos extends \Friendica\Module\BaseProfile
 {
        /** @var IHandleUserSessions */
        private $session;
-       /** @var App\Page */
+       /** @var Page */
        private $page;
        /** @var IManageConfigValues */
        private $config;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var Database */
        private $database;
        /** @var SystemMessages */
@@ -52,19 +55,19 @@ class Photos extends \Friendica\Module\BaseProfile
        /** @var array owner-view record */
        private $owner;
 
-       public function __construct(ACLFormatter $aclFormatter, SystemMessages $systemMessages, Database $database, App $app, IManageConfigValues $config, App\Page $page, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(ACLFormatter $aclFormatter, SystemMessages $systemMessages, Database $database, AppHelper $appHelper, IManageConfigValues $config, Page $page, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->session        = $session;
                $this->page           = $page;
                $this->config         = $config;
-               $this->app            = $app;
+               $this->appHelper      = $appHelper;
                $this->database       = $database;
                $this->systemMessages = $systemMessages;
                $this->aclFormatter   = $aclFormatter;
 
-               $owner = Profile::load($this->app, $this->parameters['nickname'] ?? '', false);
+               $owner = Profile::load($this->appHelper, $this->parameters['nickname'] ?? '', false);
                if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }

diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 5df1afc3c01e5151c688a77b2e2c0cfd5d442bea..c0b27f49e539eb8e06a8e05ed71043cfcde0c9a7 100644 (file)
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\Feature;
 use Friendica\Content\GroupManager;
 use Friendica\Content\Nav;
@@ -43,23 +46,23 @@ class Profile extends BaseProfile
 {
        /** @var Database */
        private $database;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var IHandleUserSessions */
        private $session;
        /** @var IManageConfigValues */
        private $config;
-       /** @var App\Page */
+       /** @var Page */
        private $page;
        /** @var ProfileField */
        private $profileField;
 
-       public function __construct(ProfileField $profileField, App\Page $page, IManageConfigValues $config, IHandleUserSessions $session, App $app, Database $database, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(ProfileField $profileField, Page $page, IManageConfigValues $config, IHandleUserSessions $session, AppHelper $appHelper, Database $database, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database     = $database;
-               $this->app          = $app;
+               $this->appHelper    = $appHelper;
                $this->session      = $session;
                $this->config       = $config;
                $this->page         = $page;
@@ -95,7 +98,7 @@ class Profile extends BaseProfile
 
        protected function content(array $request = []): string
        {
-               $profile = ProfileModel::load($this->app, $this->parameters['nickname'] ?? '');
+               $profile = ProfileModel::load($this->appHelper, $this->parameters['nickname'] ?? '');
                if (!$profile) {
                        throw new HTTPException\NotFoundException($this->t('Profile not found.'));
                }
@@ -374,10 +377,10 @@ class Profile extends BaseProfile
 
        /**
         * Clean the provided input to prevent XSS problems
-        * @param int $uri_id 
-        * @param string $input 
-        * @return string 
-        * @throws InternalServerErrorException 
+        * @param int $uri_id
+        * @param string $input
+        * @return string
+        * @throws InternalServerErrorException
         */
        private function cleanInput(int $uri_id, string $input): string
        {

diff --git a/src/Module/Profile/Restricted.php b/src/Module/Profile/Restricted.php
index 2fa55f3c98bcdf06288466cc00bc29004b214b1c..13de7b3c14e843f788a8547183631bffac528fd2 100644 (file)
--- a/src/Module/Profile/Restricted.php
+++ b/src/Module/Profile/Restricted.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Profile;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -19,19 +21,19 @@ use Psr\Log\LoggerInterface;
 
 class Restricted extends BaseModule
 {
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
 
-       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app = $app;
+               $this->appHelper = $appHelper;
        }
 
        protected function content(array $request = []): string
        {
-               $profile = Profile::load($this->app, $this->parameters['nickname'] ?? '', false);
+               $profile = Profile::load($this->appHelper, $this->parameters['nickname'] ?? '', false);
                if (!$profile) {
                        throw new HTTPException\NotFoundException($this->t('Profile not found.'));
                }

diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php
index e557068001eb09d39dc8a5071f97e87bfe8e3cd3..e93b446f1b2de89eacdc7f767969f8614f5efe7c 100644 (file)
--- a/src/Module/Security/TwoFactor/Recovery.php
+++ b/src/Module/Security/TwoFactor/Recovery.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Security\TwoFactor;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -29,18 +31,18 @@ class Recovery extends BaseModule
 {
        /** @var IHandleUserSessions */
        protected $session;
-       /** @var App */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var Authentication */
        protected $auth;
 
-       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Authentication $auth, IHandleUserSessions $session, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Authentication $auth, IHandleUserSessions $session, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app     = $app;
-               $this->auth    = $auth;
-               $this->session = $session;
+               $this->appHelper = $appHelper;
+               $this->auth      = $auth;
+               $this->session   = $session;
        }
 
        protected function post(array $request = [])

diff --git a/src/Module/Security/TwoFactor/Trust.php b/src/Module/Security/TwoFactor/Trust.php
index 153a615a5ef1fd833e5de98dcd89c03173e33f72..5620cb9b94ab27643b37c38a6e810346d7b99ee2 100644 (file)
--- a/src/Module/Security/TwoFactor/Trust.php
+++ b/src/Module/Security/TwoFactor/Trust.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\Security\TwoFactor;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
@@ -33,8 +35,8 @@ use Psr\Log\LoggerInterface;
  */
 class Trust extends BaseModule
 {
-       /** @var App  */
-       protected $app;
+       /** @var AppHelper */
+       protected $appHelper;
        /** @var Authentication  */
        protected $auth;
        /** @var IHandleUserSessions  */
@@ -46,11 +48,11 @@ class Trust extends BaseModule
        /** @var TwoFactor\Repository\TrustedBrowser  */
        protected $trustedBrowserRepository;
 
-       public function __construct(App $app, Authentication $auth, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IHandleUserSessions $session, Cookie $cookie, TwoFactor\Factory\TrustedBrowser $trustedBrowserFactory, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepository, Response $response, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, Authentication $auth, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, IHandleUserSessions $session, Cookie $cookie, TwoFactor\Factory\TrustedBrowser $trustedBrowserFactory, TwoFactor\Repository\TrustedBrowser $trustedBrowserRepository, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->app                      = $app;
+               $this->appHelper                = $appHelper;
                $this->auth                     = $auth;
                $this->session                  = $session;
                $this->cookie                   = $cookie;

diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index fd622304425a794abfd8686711b5ec7635d49e96..1c708134017a85680615b59c51b9db7b113c8b52 100644 (file)
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -7,7 +7,10 @@
 
 namespace Friendica\Module\Settings;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
+use Friendica\AppHelper;
 use Friendica\Content\Conversation\Collection\Timelines;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Conversation\Factory\Channel as ChannelFactory;
@@ -39,8 +42,8 @@ class Display extends BaseSettings
        private $config;
        /** @var IManagePersonalConfigValues */
        private $pConfig;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
        /** @var SystemMessages */
        private $systemMessages;
        /** @var ChannelFactory */
@@ -54,13 +57,13 @@ class Display extends BaseSettings
        /** @var TimelineFactory */
        protected $timeline;
 
-       public function __construct(Repository\UserDefinedChannel $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, App $app, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Repository\UserDefinedChannel $userDefinedChannel, NetworkFactory $network, CommunityFactory $community, ChannelFactory $channel, TimelineFactory $timeline, SystemMessages $systemMessages, AppHelper $appHelper, IManagePersonalConfigValues $pConfig, IManageConfigValues $config, IHandleUserSessions $session, Page $page, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->config             = $config;
                $this->pConfig            = $pConfig;
-               $this->app                = $app;
+               $this->appHelper          = $appHelper;
                $this->systemMessages     = $systemMessages;
                $this->timeline           = $timeline;
                $this->channel            = $channel;
@@ -160,7 +163,7 @@ class Display extends BaseSettings
                                // call theme_post only if theme has not been changed
                                if ($themeconfigfile = Theme::getConfigFile($theme)) {
                                        require_once $themeconfigfile;
-                                       theme_post($this->app);
+                                       theme_post($this->appHelper);
                                }
                        } else {
                                User::update(['theme' => $theme], $uid);
@@ -286,7 +289,7 @@ class Display extends BaseSettings
                $theme_config = '';
                if ($themeconfigfile = Theme::getConfigFile($theme_selected)) {
                        require_once $themeconfigfile;
-                       $theme_config = theme_content($this->app);
+                       $theme_config = theme_content($this->appHelper);
                }
 
                $tpl = Renderer::getMarkupTemplate('settings/display.tpl');

diff --git a/src/Module/User/Delegation.php b/src/Module/User/Delegation.php
index 71c5c6064420acddbd19d8abe3b72d1aed5066b4..2c138913482a3d4f4c0f8a70ceba208b9042b628 100644 (file)
--- a/src/Module/User/Delegation.php
+++ b/src/Module/User/Delegation.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module\User;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\AppHelper;
 use Friendica\BaseModule;
 use Friendica\Contact\Introduction\Repository\Introduction;
 use Friendica\Core\Hook;
@@ -42,10 +44,10 @@ class Delegation extends BaseModule
        private $notify;
        /** @var Introduction */
        private $intro;
-       /** @var App */
-       private $app;
+       /** @var AppHelper */
+       private $appHelper;
 
-       public function __construct(App $app, Introduction $intro, Notify $notify, SystemMessages $systemMessages, Authentication $auth, Database $db, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(AppHelper $appHelper, Introduction $intro, Notify $notify, SystemMessages $systemMessages, Authentication $auth, Database $db, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Util\Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -55,7 +57,7 @@ class Delegation extends BaseModule
                $this->systemMessages = $systemMessages;
                $this->notify         = $notify;
                $this->intro          = $intro;
-               $this->app            = $app;
+               $this->appHelper      = $appHelper;
        }
 
        protected function post(array $request = [])