refactor usage of Friendica\App namespace

diff --git a/bin/worker.php b/bin/worker.php
index 841ac3574afcc522eedfd43a68e507e216eea38f..29fd5a4fb7bd1e71d235d24d71e42cca475d93d3 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -15,7 +15,6 @@ if (php_sapi_name() !== 'cli') {
 }
 
 use Dice\Dice;
-use Friendica\App;
 use Friendica\App\Mode;
 use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\Update;
@@ -57,7 +56,7 @@ DI::mode()->setExecutor(Mode::WORKER);
 Update::check(DI::basePath(), true);
 
 // Quit when in maintenance
-if (!DI::mode()->has(App\Mode::MAINTENANCEDISABLED)) {
+if (!DI::mode()->has(Mode::MAINTENANCEDISABLED)) {
        return;
 }
 

diff --git a/src/Console/Addon.php b/src/Console/Addon.php
index 43ce7a6be3363dd892dd4494389a818f0422f2d7..80668532468fde99c75a7f6c289eb96703a107a7 100644 (file)
--- a/src/Console/Addon.php
+++ b/src/Console/Addon.php
@@ -8,8 +8,7 @@
 namespace Friendica\Console;
 
 use Console_Table;
-use Friendica\App;
-use Friendica\Content\Pager;
+use Friendica\App\Mode;
 use Friendica\Core\L10n;
 use Friendica\Core\Addon as AddonCore;
 use Friendica\Database\Database;
@@ -24,7 +23,7 @@ class Addon extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -57,7 +56,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, array $argv = null)
+       public function __construct(Mode $appMode, L10n $l10n, Database $dba, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/ArchiveContact.php b/src/Console/ArchiveContact.php
index 33e1de86007c240b54824ef859ab2257c8211e26..fef6065823f9ffcfae1573bd22a82a94154be986 100644 (file)
--- a/src/Console/ArchiveContact.php
+++ b/src/Console/ArchiveContact.php
@@ -7,7 +7,7 @@
 
 namespace Friendica\Console;
 
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Database\Database;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -28,7 +28,7 @@ class ArchiveContact extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -57,7 +57,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, Database $dba, \Friendica\Core\L10n $l10n, array $argv = null)
+       public function __construct(Mode $appMode, Database $dba, \Friendica\Core\L10n $l10n, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index cc932f51c47373a32219069498a76562215a4216..198317f7b4b2d73c853c30b07cf9090c4e56f9a0 100644 (file)
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -9,8 +9,7 @@ namespace Friendica\Console;
 
 use Asika\SimpleConsole\Console;
 use Exception;
-use Friendica\App;
-use Friendica\App\BaseURL;
+use Friendica\App\Mode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Installer;
@@ -21,7 +20,7 @@ use RuntimeException;
 
 class AutomaticInstallation extends Console
 {
-       /** @var App\Mode */
+       /** @var Mode */
        private $appMode;
        /** @var \Friendica\Core\Config\ValueObject\Cache */
        private $configCache;
@@ -87,7 +86,7 @@ Examples
 HELP;
        }
 
-       public function __construct(App\Mode $appMode, Cache $configCache, IManageConfigValues $config, Database $dba, array $argv = null)
+       public function __construct(Mode $appMode, Cache $configCache, IManageConfigValues $config, Database $dba, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/Cache.php b/src/Console/Cache.php
index 1eb400a7b5ae552489ff271d39ff0170adc15efd..c019c1842989396dbc9448fe76a656418da4fbfa 100644 (file)
--- a/src/Console/Cache.php
+++ b/src/Console/Cache.php
@@ -8,7 +8,7 @@
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Cache\Capability\ICanCache;
 use RuntimeException;
@@ -25,7 +25,7 @@ class Cache extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
 
@@ -68,7 +68,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, ICanCache $cache, array $argv = null)
+       public function __construct(Mode $appMode, ICanCache $cache, array $argv = null)
        {
                parent::__construct($argv);
 
@@ -85,7 +85,7 @@ HELP;
                        $this->out('Options: ' . var_export($this->options, true));
                }
 
-               if (!$this->appMode->has(App\Mode::DBAVAILABLE)) {
+               if (!$this->appMode->has(Mode::DBAVAILABLE)) {
                        $this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
                }
 

diff --git a/src/Console/Config.php b/src/Console/Config.php
index 578efe964bb0199ee62af95138df798353430e3f..7b222a4481ef8c7635d95f6f623f73d0a3b5dad8 100644 (file)
--- a/src/Console/Config.php
+++ b/src/Console/Config.php
@@ -8,7 +8,7 @@
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use RuntimeException;
 
@@ -38,7 +38,7 @@ class Config extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -80,7 +80,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, IManageConfigValues $config, array $argv = null)
+       public function __construct(Mode $appMode, IManageConfigValues $config, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/Contact.php b/src/Console/Contact.php
index 46a26c4a9d3ebac47041bb2264bb9c04d6a13092..b33baa6efa20c3f0e6dbb8b30c06c608f1876976 100644 (file)
--- a/src/Console/Contact.php
+++ b/src/Console/Contact.php
@@ -8,7 +8,7 @@
 namespace Friendica\Console;
 
 use Console_Table;
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\DI;
 use Friendica\Model\Contact as ContactModel;
 use Friendica\Model\User as UserModel;
@@ -25,7 +25,7 @@ class Contact extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -55,7 +55,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, array $argv = null)
+       public function __construct(Mode $appMode, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/GlobalCommunityBlock.php b/src/Console/GlobalCommunityBlock.php
index 946b0dbd43ee9ae5d67618315d686bd219970eff..2e8549145533a7a36f92ad8c8d28c4bc3d3ca113 100644 (file)
--- a/src/Console/GlobalCommunityBlock.php
+++ b/src/Console/GlobalCommunityBlock.php
@@ -7,7 +7,7 @@
 
 namespace Friendica\Console;
 
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;
 
@@ -22,7 +22,7 @@ class GlobalCommunityBlock extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -48,7 +48,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, L10n $l10n, $argv = null)
+       public function __construct(Mode $appMode, L10n $l10n, $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/Lock.php b/src/Console/Lock.php
index b5fca2e63fdb073a0ba7ff11b856d2290a280bb4..f883adfc6e217afed6d81dbaf76b8a6e36d41063 100644 (file)
--- a/src/Console/Lock.php
+++ b/src/Console/Lock.php
@@ -8,7 +8,7 @@
 namespace Friendica\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Core\Lock\Capability\ICanLock;
 use RuntimeException;
 
@@ -23,7 +23,7 @@ class Lock extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
 
@@ -62,7 +62,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, ICanLock $lock, array $argv = null)
+       public function __construct(Mode $appMode, ICanLock $lock, array $argv = null)
        {
                parent::__construct($argv);
 
@@ -79,7 +79,7 @@ HELP;
                        $this->out('Options: ' . var_export($this->options, true));
                }
 
-               if (!$this->appMode->has(App\Mode::DBAVAILABLE)) {
+               if (!$this->appMode->has(Mode::DBAVAILABLE)) {
                        $this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
                }
 

diff --git a/src/Console/Maintenance.php b/src/Console/Maintenance.php
index 27caa32190d0a1c430375b1c341ab281f73e03cc..168bccd1640d6727af1987860c9cff878375e147 100644 (file)
--- a/src/Console/Maintenance.php
+++ b/src/Console/Maintenance.php
@@ -7,7 +7,7 @@
 
 namespace Friendica\Console;
 
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
@@ -18,7 +18,7 @@ class Maintenance extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -55,7 +55,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, IManageConfigValues $config, $argv = null)
+       public function __construct(Mode $appMode, IManageConfigValues $config, $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Console/User.php b/src/Console/User.php
index 42e85f007d7e85acfc8e216b778a97f55f3c3576..89c217694d09fe0d68ba798be337d45b1f47aaf8 100644 (file)
--- a/src/Console/User.php
+++ b/src/Console/User.php
@@ -8,7 +8,7 @@
 namespace Friendica\Console;
 
 use Console_Table;
-use Friendica\App;
+use Friendica\App\Mode;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
@@ -26,7 +26,7 @@ class User extends \Asika\SimpleConsole\Console
        protected $helpOptions = ['h', 'help', '?'];
 
        /**
-        * @var App\Mode
+        * @var Mode
         */
        private $appMode;
        /**
@@ -74,7 +74,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, L10n $l10n, IManagePersonalConfigValues $pConfig, array $argv = null)
+       public function __construct(Mode $appMode, L10n $l10n, IManagePersonalConfigValues $pConfig, array $argv = null)
        {
                parent::__construct($argv);
 

diff --git a/src/Core/Hook.php b/src/Core/Hook.php
index c3c994a31437322271fb9d04de81fd0b45acae24..bbf634401a0755c978c869038b14b06eb7f9b5d6 100644 (file)
--- a/src/Core/Hook.php
+++ b/src/Core/Hook.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;

diff --git a/src/Core/Session/Factory/Session.php b/src/Core/Session/Factory/Session.php
index 735300b1d66eb6721472cfd3593893153788269c..7855cf35d64721c37a04bfc8b4c5f12fa92e1a9b 100644 (file)
--- a/src/Core/Session/Factory/Session.php
+++ b/src/Core/Session/Factory/Session.php
@@ -7,7 +7,8 @@
 
 namespace Friendica\Core\Session\Factory;
 
-use Friendica\App;
+use Friendica\App\BaseURL;
+use Friendica\App\Mode;
 use Friendica\Core\Cache\Factory\Cache;
 use Friendica\Core\Cache\Type\DatabaseCache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -33,8 +34,8 @@ class Session
        const HANDLER_DEFAULT = self::HANDLER_DATABASE;
 
        /**
-        * @param App\Mode            $mode
-        * @param App\BaseURL         $baseURL
+        * @param Mode                $mode
+        * @param BaseURL             $baseURL
         * @param IManageConfigValues $config
         * @param Database            $dba
         * @param Cache               $cacheFactory
@@ -43,7 +44,7 @@ class Session
         * @param array               $server
         * @return IHandleSessions
         */
-       public function create(App\Mode $mode, App\BaseURL $baseURL, IManageConfigValues $config, Database $dba, Cache $cacheFactory, LoggerInterface $logger, Profiler $profiler, array $server = []): IHandleSessions
+       public function create(Mode $mode, BaseURL $baseURL, IManageConfigValues $config, Database $dba, Cache $cacheFactory, LoggerInterface $logger, Profiler $profiler, array $server = []): IHandleSessions
        {
                $profiler->startRecording('session');
                $session_handler = $config->get('system', 'session_handler', self::HANDLER_DEFAULT);

diff --git a/src/Core/Session/Type/Native.php b/src/Core/Session/Type/Native.php
index fc6f41c466b4977ac7f87087ee2b257a5969744c..ebde0d4954b650ad782bebb32b952e736e37c6aa 100644 (file)
--- a/src/Core/Session/Type/Native.php
+++ b/src/Core/Session/Type/Native.php
@@ -7,7 +7,7 @@
 
 namespace Friendica\Core\Session\Type;
 
-use Friendica\App;
+use Friendica\App\BaseURL;
 use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Model\User\Cookie;
 use SessionHandlerInterface;
@@ -17,7 +17,7 @@ use SessionHandlerInterface;
  */
 class Native extends AbstractSession implements IHandleSessions
 {
-       public function __construct(App\BaseURL $baseURL, SessionHandlerInterface $handler = null)
+       public function __construct(BaseURL $baseURL, SessionHandlerInterface $handler = null)
        {
                ini_set('session.gc_probability', 50);
                ini_set('session.use_only_cookies', 1);

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 7c3f508037a3d5ddeb6bc69244096835bef08ab4..f19dfb0867741da55b9ef50b0090311cc068748e 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\App;
 use Friendica\App\Mode;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -29,7 +28,6 @@ class Update
         *
         * @param string   $basePath   The base path of this application
         * @param boolean  $via_worker Is the check run via the worker?
-        * @param App\Mode $mode       The current app mode
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */

diff --git a/src/Model/User/Cookie.php b/src/Model/User/Cookie.php
index d28767524ff75d4b41f72afaf52314faf58ef6bf..69270478f81be4de21eb851726d30e6909e14a3d 100644 (file)
--- a/src/Model/User/Cookie.php
+++ b/src/Model/User/Cookie.php
@@ -7,7 +7,8 @@
 
 namespace Friendica\Model\User;
 
-use Friendica\App;
+use Friendica\App\BaseURL;
+use Friendica\App\Request;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 
 /**
@@ -38,12 +39,12 @@ class Cookie
        private $data;
 
        /**
-        * @param App\Request         $request The current http request
+        * @param Request             $request The current http request
         * @param IManageConfigValues $config
-        * @param App\BaseURL         $baseURL
+        * @param BaseURL             $baseURL
         * @param array               $COOKIE The $_COOKIE array
         */
-       public function __construct(App\Request $request, IManageConfigValues $config, App\BaseURL $baseURL, array $COOKIE = [])
+       public function __construct(Request $request, IManageConfigValues $config, BaseURL $baseURL, array $COOKIE = [])
        {
                $this->sslEnabled     = $baseURL->getScheme() === 'https';
                $this->sitePrivateKey = $config->get('system', 'site_prvkey');

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index fe910d9367ec17486dee8f65ef0ea82a84e1e0dd..873eea237dd20f4ace47a369c197fff806470b2f 100644 (file)
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -7,7 +7,8 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -28,7 +29,7 @@ class Apps extends BaseModule
        /** @var SystemMessages */
        protected $systemMessages;
 
-       public function __construct(SystemMessages $systemMessages, Nav $nav, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(SystemMessages $systemMessages, Nav $nav, IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php
index 3b42b46c6d9fbde10548e916bb0d99e1aaaef97d..f9f47d4a2117b75fe6ddeb6eca23456f1c7e2419 100644 (file)
--- a/src/Module/BaseNotifications.php
+++ b/src/Module/BaseNotifications.php
@@ -8,14 +8,13 @@
 namespace Friendica\Module;
 
 use Exception;
-use Friendica\App;
 use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\Core\System;
 use Friendica\Navigation\Notifications\ValueObject\FormattedNotify;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Util\Profiler;
@@ -76,7 +75,7 @@ abstract class BaseNotifications extends BaseModule
         */
        abstract public function getNotifications();
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, array $server, array $parameters = [])
+       public function __construct(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);
 

diff --git a/src/Module/BaseProfile.php b/src/Module/BaseProfile.php
index a7b610e27611d52031e1486d0d76c7623a934dc4..2fab7931521640ecc025efed5fd3734ca998d670 100644 (file)
--- a/src/Module/BaseProfile.php
+++ b/src/Module/BaseProfile.php
@@ -7,7 +7,6 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\Hook;

diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index 693554f49308644913e63b35df0683ee5814a212..143360c1374bb4e7536a31711585bf73cdcf076c 100644 (file)
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -7,7 +7,9 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
+use Friendica\App\Page;
 use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -20,12 +22,12 @@ use Psr\Log\LoggerInterface;
 
 class BaseSettings extends BaseModule
 {
-       /** @var App\Page */
+       /** @var Page */
        protected $page;
        /** @var IHandleUserSessions */
        protected $session;
 
-       public function __construct(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(IHandleUserSessions $session, Page $page, 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);
 

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index 717e471460aa9a22b75ab1a25eaaee968d2e1150..4c9720a6d675e8e24d706d416844913643a3881a 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -7,7 +7,8 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
@@ -35,7 +36,7 @@ class FriendSuggest extends BaseModule
        /** @var \Friendica\Contact\FriendSuggest\Factory\FriendSuggest */
        protected $friendSuggestFac;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, \Friendica\Contact\FriendSuggest\Repository\FriendSuggest $friendSuggestRepo, \Friendica\Contact\FriendSuggest\Factory\FriendSuggest $friendSuggestFac, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, Database $dba, \Friendica\Contact\FriendSuggest\Repository\FriendSuggest $friendSuggestRepo, \Friendica\Contact\FriendSuggest\Factory\FriendSuggest $friendSuggestFac, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -97,14 +98,14 @@ class FriendSuggest extends BaseModule
                }
 
                $suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
-                       '`uid` = ? 
-                       AND `id` != ? 
-                       AND `network` = ? 
-                       AND NOT `self` 
-                       AND NOT `blocked` 
-                       AND NOT `pending` 
-                       AND NOT `archive` 
-                       AND NOT `deleted` 
+                       '`uid` = ?
+                       AND `id` != ?
+                       AND `network` = ?
+                       AND NOT `self`
+                       AND NOT `blocked`
+                       AND NOT `pending`
+                       AND NOT `archive`
+                       AND NOT `deleted`
                        AND `notify` != ""',
                        DI::userSession()->getLocalUserId(),
                        $cid,

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index c7e4ca983f3e5643d92afc5e3c8ce96796b8c862..cd1362b3af4e71bdd88fdabd77a137f533f7933b 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -36,7 +38,7 @@ class Friendica extends BaseModule
        /** @var IHandleUserSessions */
        private $session;
 
-       public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, IManageConfigValues $config, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(IHandleUserSessions $session, IManageKeyValuePairs $keyValue, 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);
 

diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php
index 2e58e6edd53379429a9ce4054d1ffa0a5c6e0a8c..969d4dd7db1a65d15f5c66915114a32a9774a4ca 100644 (file)
--- a/src/Module/NodeInfo110.php
+++ b/src/Module/NodeInfo110.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -25,7 +27,7 @@ class NodeInfo110 extends BaseModule
        /** @var IManageConfigValues */
        protected $config;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php
index fc1e48171a58b37c532a25051527274ad7f97e2f..a9fcecd6b953c24fe138f3b7d2bc48c6c0ac7d9a 100644 (file)
--- a/src/Module/NodeInfo120.php
+++ b/src/Module/NodeInfo120.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -25,7 +27,7 @@ class NodeInfo120 extends BaseModule
        /** @var IManageConfigValues */
        protected $config;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/NodeInfo121.php b/src/Module/NodeInfo121.php
index 6a343c1c9d2d0f1fdd5acf13fe6b10cd84081df8..903af265572caefcbff5c9aaf99ac7e349feffaf 100644 (file)
--- a/src/Module/NodeInfo121.php
+++ b/src/Module/NodeInfo121.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -25,7 +27,7 @@ class NodeInfo121 extends BaseModule
        /** @var IManageConfigValues */
        protected $config;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/NodeInfo122.php b/src/Module/NodeInfo122.php
index 0ad5b71ff8dd48151cb2a6eba8a322300d3808c5..7c3a6754693eaffe2cfeef70019110e03400247d 100644 (file)
--- a/src/Module/NodeInfo122.php
+++ b/src/Module/NodeInfo122.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -25,7 +27,7 @@ class NodeInfo122 extends BaseModule
        /** @var IManageConfigValues */
        protected $config;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php
index 04a1635d86caea6bcf81d2a1ccfee362c0eca0cb..bd1d1cdf3965d1866c7d7067bd1ec151aa4bdef2 100644 (file)
--- a/src/Module/NodeInfo210.php
+++ b/src/Module/NodeInfo210.php
@@ -8,6 +8,8 @@
 namespace Friendica\Module;
 
 use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -25,7 +27,7 @@ class NodeInfo210 extends BaseModule
        /** @var IManageConfigValues  */
        protected $config;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php
index ae5d5a3aebc36f944fe4c37d4f6984a2e4fc8a82..8da72c742c6c5963e71c5bdd658c8f790acd4f1b 100644 (file)
--- a/src/Module/ParseUrl.php
+++ b/src/Module/ParseUrl.php
@@ -7,13 +7,13 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
-use Friendica\Core\System;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Util;
 use Friendica\Util\Profiler;
@@ -24,7 +24,7 @@ class ParseUrl extends BaseModule
        /** @var IHandleUserSessions */
        protected $userSession;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, $server, array $parameters = [])
+       public function __construct(L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $userSession, $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 2cba4b97c81fd9bf7ce98c4182bb7c19d2e39904..927264e2a5854d70c78a0481ecf99195c12f88a2 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -7,7 +7,8 @@
 
 namespace Friendica\Module;
 
-use Friendica\App;
+use Friendica\App\Arguments;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
@@ -41,7 +42,7 @@ class Register extends BaseModule
        /** @var IHandleUserSessions */
        private $session;
 
-       public function __construct(IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
+       public function __construct(IHandleUserSessions $session, L10n $l10n, BaseURL $baseUrl, Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -277,7 +278,7 @@ class Register extends BaseModule
                        $regdata = ['email' => $arr['email'], 'nickname' => $arr['nickname'], 'username' => $arr['username']];
                        DI::baseUrl()->redirect('register?' . http_build_query($regdata));
                }
-               
+
                //Check if nickname contains only US-ASCII and do not start with a digit
                if (!preg_match('/^[a-zA-Z][a-zA-Z0-9]*$/', $arr['nickname'])) {
                        if (is_numeric(substr($arr['nickname'], 0, 1))) {
@@ -289,7 +290,7 @@ class Register extends BaseModule
                        DI::baseUrl()->redirect('register?' . http_build_query($regdata));
                        return;
                }
-               
+
                $arr['blocked'] = $blocked;
                $arr['verified'] = $verified;
                $arr['language'] = L10n::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language'));
@@ -433,6 +434,6 @@ class Register extends BaseModule
                                return intval(DI::config()->get('config', 'register_policy'));
                        }
                }
-               return self::CLOSED;            
+               return self::CLOSED;
        }
 }