Cleanup namespaces

diff --git a/src/App.php b/src/App.php
index 9c0699a182bbf86a0fa7893d315d3841edecd178..44a5eb40dfcd95430a988ff535f81700cb4c44c7 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -305,16 +305,16 @@ class App
        }
 
        /**
-        * @param Database                                                       $database The Friendica Database
-        * @param IManageConfigValues                                            $config   The Configuration
-        * @param App\Mode                                                       $mode     The mode of this Friendica app
-        * @param BaseURL                                                        $baseURL  The full base URL of this Friendica app
-        * @param LoggerInterface                                                $logger   The current app logger
-        * @param Profiler                                                       $profiler The profiler of this application
-        * @param L10n                                                           $l10n     The translator instance
-        * @param App\Arguments                                                  $args     The Friendica Arguments of the call
-        * @param Core\Process                                                   $process  The process methods
-        * @param \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues $pConfig  Personal configuration
+        * @param Database                    $database The Friendica Database
+        * @param IManageConfigValues         $config   The Configuration
+        * @param App\Mode                    $mode     The mode of this Friendica app
+        * @param BaseURL                     $baseURL  The full base URL of this Friendica app
+        * @param LoggerInterface             $logger   The current app logger
+        * @param Profiler                    $profiler The profiler of this application
+        * @param L10n                        $l10n     The translator instance
+        * @param App\Arguments               $args     The Friendica Arguments of the call
+        * @param Core\Process                $process  The process methods
+        * @param IManagePersonalConfigValues $pConfig  Personal configuration
         */
        public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IManagePersonalConfigValues $pConfig)
        {

diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php
index 40ed7941687a6f0cf22a15de3ee4f6c8af204875..71f51fe2eafc1487e086603814f2dba528567147 100644 (file)
--- a/src/App/BaseURL.php
+++ b/src/App/BaseURL.php
@@ -272,8 +272,8 @@ class BaseURL
        }
 
        /**
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config The Friendica IConfiguration
-        * @param array                                                 $server The $_SERVER array
+        * @param IManageConfigValues $config The Friendica IConfiguration
+        * @param array               $server The $_SERVER array
         */
        public function __construct(IManageConfigValues $config, array $server)
        {

diff --git a/src/App/Module.php b/src/App/Module.php
index ce7cc98f06f7b734bcd46502af2da9e076de7049..cea2788edd87748d420637e41f3616538d0924eb 100644 (file)
--- a/src/App/Module.php
+++ b/src/App/Module.php
@@ -24,6 +24,7 @@ namespace Friendica\App;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\LegacyModule;
 use Friendica\Module\Home;
 use Friendica\Module\HTTPException\MethodNotAllowed;
@@ -170,13 +171,13 @@ class Module
         *
         * @param Arguments                                             $args   The Friendica execution arguments
         * @param Router                                                $router The Friendica routing instance
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config The Friendica Configuration
+        * @param IManageConfigValues $config The Friendica Configuration
         *
         * @return Module The determined module of this call
         *
         * @throws \Exception
         */
-       public function determineClass(Arguments $args, Router $router, Core\Config\Capability\IManageConfigValues $config)
+       public function determineClass(Arguments $args, Router $router, IManageConfigValues $config)
        {
                $printNotAllowedAddon = false;
 

diff --git a/src/App/Page.php b/src/App/Page.php
index abc84b0e99f77f8c70cc0ac1c88627cf346d09ba..578f9ab3e3a4209f7772650ccc541ce4efd222e0 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -190,11 +190,11 @@ class Page implements ArrayAccess
         * - Infinite scroll data
         * - head.tpl template
         *
-        * @param App                                                            $app     The Friendica App instance
-        * @param Module                                                         $module  The loaded Friendica module
-        * @param L10n                                                           $l10n    The l10n language instance
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues          $config  The Friendica configuration
-        * @param \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
+        * @param App                         $app     The Friendica App instance
+        * @param Module                      $module  The loaded Friendica module
+        * @param L10n                        $l10n    The l10n language instance
+        * @param IManageConfigValues         $config  The Friendica configuration
+        * @param IManagePersonalConfigValues $pConfig The Friendica personal configuration (for user)
         *
         * @throws HTTPException\InternalServerErrorException
         */

diff --git a/src/Console/Lock.php b/src/Console/Lock.php
index 3b73837b6e41e7cbd8d1bb87f8c087a499681866..c43213fba8f1bdb6513286b602631c2b2eeb2591 100644 (file)
--- a/src/Console/Lock.php
+++ b/src/Console/Lock.php
@@ -42,7 +42,7 @@ class Lock extends \Asika\SimpleConsole\Console
        private $appMode;
 
        /**
-        * @var \Friendica\Core\Lock\Capability\ICanLock
+        * @var ICanLock
         */
        private $lock;
 

diff --git a/src/Console/PostUpdate.php b/src/Console/PostUpdate.php
index 4c047e502469c33a1a91d1377a3d3d65709cb7fe..d0f1da08ebcd8d276a8f5340f0d8b2f4ebadc24f 100644 (file)
--- a/src/Console/PostUpdate.php
+++ b/src/Console/PostUpdate.php
@@ -38,7 +38,7 @@ class PostUpdate extends \Asika\SimpleConsole\Console
         */
        private $appMode;
        /**
-        * @var \Friendica\Core\Config\Capability\IManageConfigValues
+        * @var IManageConfigValues
         */
        private $config;
        /**

diff --git a/src/Core/StorageManager.php b/src/Core/StorageManager.php
index ee6b959ff0e5802b882f7155083f3a30c69b35b8..e27b59edb0dd8cf0741e3cd1c3e49cf4f416cf68 100644 (file)
--- a/src/Core/StorageManager.php
+++ b/src/Core/StorageManager.php
@@ -56,7 +56,7 @@ class StorageManager
 
        /** @var Database */
        private $dba;
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var IManageConfigValues */
        private $config;
        /** @var LoggerInterface */
        private $logger;

diff --git a/src/DI.php b/src/DI.php
index 570d680dfead1498c7c3c80a46f46f42b0b1631c..d45801a9f69780bf59c54db0cac38b2f594b2af4 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -155,7 +155,7 @@ abstract class DI
        //
 
        /**
-        * @return \Friendica\Core\Cache\Capability\ICanCache
+        * @return Core\Cache\Capability\ICanCache
         */
        public static function cache()
        {
@@ -163,7 +163,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\Config\Capability\IManageConfigValues
+        * @return Core\Config\Capability\IManageConfigValues
         */
        public static function config()
        {
@@ -171,7 +171,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues
+        * @return Core\PConfig\Capability\IManagePersonalConfigValues
         */
        public static function pConfig()
        {
@@ -179,7 +179,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\Lock\Capability\ICanLock
+        * @return Core\Lock\Capability\ICanLock
         */
        public static function lock()
        {
@@ -203,7 +203,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\Session\Capability\IHandleSessions
+        * @return Core\Session\Capability\IHandleSessions
         */
        public static function session()
        {

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index 6467bf38d1406ddfc28283f8e83f09de794f1965..d01b477e1e57b91da79e858697d1a8bbc05674bd 100644 (file)
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -68,10 +68,10 @@ class LoggerFactory
        /**
         * Creates a new PSR-3 compliant logger instances
         *
-        * @param Database                                              $database   The Friendica Database instance
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config     The config
-        * @param Profiler                                              $profiler   The profiler of the app
-        * @param FileSystem                                            $fileSystem FileSystem utils
+        * @param Database            $database   The Friendica Database instance
+        * @param IManageConfigValues $config     The config
+        * @param Profiler            $profiler   The profiler of the app
+        * @param FileSystem          $fileSystem FileSystem utils
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
         */
@@ -156,9 +156,9 @@ class LoggerFactory
         *
         * It should never get filled during normal usage of Friendica
         *
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config     The config
-        * @param Profiler                                              $profiler   The profiler of the app
-        * @param FileSystem                                            $fileSystem FileSystem utils
+        * @param IManageConfigValues $config     The config
+        * @param Profiler            $profiler   The profiler of the app
+        * @param FileSystem          $fileSystem FileSystem utils
         *
         * @return LoggerInterface The PSR-3 compliant logger instance
         *

diff --git a/src/Model/Storage/FilesystemConfig.php b/src/Model/Storage/FilesystemConfig.php
index 4c71d6cfdd4137dadbb0e0e1a7b92f4ac18cc7b7..1aa1c3817376093232293523d8d0b46b692659d9 100644 (file)
--- a/src/Model/Storage/FilesystemConfig.php
+++ b/src/Model/Storage/FilesystemConfig.php
@@ -54,8 +54,8 @@ class FilesystemConfig implements IStorageConfiguration
        /**
         * Filesystem constructor.
         *
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config
-        * @param L10n                                                  $l10n
+        * @param IManageConfigValues $config
+        * @param L10n                $l10n
         */
        public function __construct(IManageConfigValues $config, L10n $l10n)
        {

diff --git a/src/Model/User/Cookie.php b/src/Model/User/Cookie.php
index d0db091cb9c8c24f7335bb6823cdd5b6bc5f654c..164a527a37075358b827b0e755254ca2b2e7cd47 100644 (file)
--- a/src/Model/User/Cookie.php
+++ b/src/Model/User/Cookie.php
@@ -52,10 +52,10 @@ class Cookie
        private $data;
 
        /**
-        * @param \Friendica\Core\Config\Capability\IManageConfigValues $config
-        * @param App\BaseURL                                           $baseURL
-        * @param array                                                 $SERVER The $_SERVER array
-        * @param array                                                 $COOKIE The $_COOKIE array
+        * @param IManageConfigValues $config
+        * @param App\BaseURL         $baseURL
+        * @param array               $SERVER The $_SERVER array
+        * @param array               $COOKIE The $_COOKIE array
         */
        public function __construct(IManageConfigValues $config, App\BaseURL $baseURL, array $SERVER = [], array $COOKIE = [])
        {

diff --git a/src/Navigation/Notifications/Factory/Introduction.php b/src/Navigation/Notifications/Factory/Introduction.php
index c3a3cd46dc402a7a4f3dc13a966e0383b74acade..9f5198b181279d7d26babcae4ee274222ea9f3c2 100644 (file)
--- a/src/Navigation/Notifications/Factory/Introduction.php
+++ b/src/Navigation/Notifications/Factory/Introduction.php
@@ -51,9 +51,9 @@ class Introduction extends BaseFactory
        private $baseUrl;
        /** @var L10n */
        private $l10n;
-       /** @var \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues */
+       /** @var IManagePersonalConfigValues */
        private $pConfig;
-       /** @var \Friendica\Core\Session\Capability\IHandleSessions */
+       /** @var IHandleSessions */
        private $session;
        /** @var string */
        private $nick;

diff --git a/src/Navigation/Notifications/Repository/Notify.php b/src/Navigation/Notifications/Repository/Notify.php
index a259150cf8f432c200cf125e683e2884a8ae37a1..bfef9bd207648217f9d636d372a354b0209cdd44 100644 (file)
--- a/src/Navigation/Notifications/Repository/Notify.php
+++ b/src/Navigation/Notifications/Repository/Notify.php
@@ -33,7 +33,7 @@ class Notify extends BaseRepository
        /** @var BaseURL  */
        protected $baseUrl;
 
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var IManageConfigValues */
        protected $config;
 
        /** @var Emailer */

diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index ce8bc3e3217e51b28658180d5da8d7457227cdd0..d8d8ba4b424330eea6c00a549d96940a19057d43 100644 (file)
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -27,6 +27,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
+use Friendica\Core\Session\Capability\IHandleSessions;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
@@ -60,7 +61,7 @@ class Authentication
        private $logger;
        /** @var User\Cookie */
        private $cookie;
-       /** @var \Friendica\Core\Session\Capability\IHandleSessions */
+       /** @var IHandleSessions */
        private $session;
        /** @var IManagePersonalConfigValues */
        private $pConfig;
@@ -75,10 +76,10 @@ class Authentication
         * @param Database                                           $dba
         * @param LoggerInterface                                    $logger
         * @param User\Cookie                                        $cookie
-        * @param \Friendica\Core\Session\Capability\IHandleSessions $session
+        * @param IHandleSessions $session
         * @param IManagePersonalConfigValues                        $pConfig
         */
-       public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, Session\Capability\IHandleSessions $session, IManagePersonalConfigValues $pConfig)
+       public function __construct(IManageConfigValues $config, App\Mode $mode, App\BaseURL $baseUrl, L10n $l10n, Database $dba, LoggerInterface $logger, User\Cookie $cookie, IHandleSessions $session, IManagePersonalConfigValues $pConfig)
        {
                $this->config  = $config;
                $this->mode    = $mode;

diff --git a/src/Security/ExAuth.php b/src/Security/ExAuth.php
index 0e1f4238477ca9f342695d518ea4629347282916..3b4e8c5b1a302a3eeb358f2dfe3c3b2f2bc43117 100644 (file)
--- a/src/Security/ExAuth.php
+++ b/src/Security/ExAuth.php
@@ -54,7 +54,7 @@ class ExAuth
         */
        private $appMode;
        /**
-        * @var \Friendica\Core\Config\Capability\IManageConfigValues
+        * @var IManageConfigValues
         */
        private $config;
        /**
@@ -71,11 +71,11 @@ class ExAuth
        private $baseURL;
 
        /**
-        * @param App\Mode                                                       $appMode
-        * @param IManageConfigValues                                            $config
-        * @param \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues $pConfig
-        * @param Database                                                       $dba
-        * @param App\BaseURL                                                    $baseURL
+        * @param App\Mode                    $appMode
+        * @param IManageConfigValues         $config
+        * @param IManagePersonalConfigValues $pConfig
+        * @param Database                    $dba
+        * @param App\BaseURL                 $baseURL
         *
         * @throws Exception
         */

diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 8e63b638fa51cdb96aa5b1a646440bad7342d019..626401b15c09dab32fb9cdce4f927435260ccce0 100644 (file)
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -38,9 +38,9 @@ use Psr\Log\LoggerInterface;
  */
 class Emailer
 {
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var IManageConfigValues */
        private $config;
-       /** @var \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues */
+       /** @var IManagePersonalConfigValues */
        private $pConfig;
        /** @var LoggerInterface */
        private $logger;

diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index 4e6e8640d63e9a21d4f95a360e76048172754be4..ed3a42b26410c1f8564dc3900c8d662982826cee 100644 (file)
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -42,7 +42,7 @@ trait AppMockTrait
        protected $app;
 
        /**
-        * @var MockInterface|\Friendica\Core\Config\Capability\IManageConfigValues The mocked Config Cache
+        * @var MockInterface|Config\Capability\IManageConfigValues The mocked Config Cache
         */
        protected $configMock;
 

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 90de2d64759d7a1d7bd419b74f3d1f851add28e4..e800f68c80e2c76e1ab2993f9694100f1b38b978 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -59,7 +59,7 @@ class ApiTest extends FixtureTest
 
                parent::setUp();
 
-               /** @var \Friendica\Core\Config\Capability\IManageConfigValues $config */
+               /** @var IManageConfigValues $config */
                $this->config = $this->dice->create(IManageConfigValues::class);
 
                $this->config->set('system', 'url', 'http://localhost');

diff --git a/tests/src/App/RouterTest.php b/tests/src/App/RouterTest.php
index 1e9e5d5eef83fb0d43684680c65e8cb688e9c518..f74ea423f04ce114605e6dee53482d683460b57c 100644 (file)
--- a/tests/src/App/RouterTest.php
+++ b/tests/src/App/RouterTest.php
@@ -41,7 +41,7 @@ class RouterTest extends TestCase
         */
        private $cache;
        /**
-        * @var \Friendica\Core\Lock\Capability\ICanLock
+        * @var ICanLock
         */
        private $lock;
 

diff --git a/tests/src/Core/Config/ConfigTest.php b/tests/src/Core/Config/ConfigTest.php
index 0c9788c9c3ab6c1953d6c84b6a7631883e3810ae..46dd400adb5c29b9bf737fad401d18874b0f39a4 100644 (file)
--- a/tests/src/Core/Config/ConfigTest.php
+++ b/tests/src/Core/Config/ConfigTest.php
@@ -36,7 +36,7 @@ abstract class ConfigTest extends MockedTest
        /** @var \Friendica\Core\Config\ValueObject\Cache */
        protected $configCache;
 
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var IManageConfigValues */
        protected $testedConfig;
 
        /**
@@ -65,7 +65,7 @@ abstract class ConfigTest extends MockedTest
        }
 
        /**
-        * @return \Friendica\Core\Config\Capability\IManageConfigValues
+        * @return IManageConfigValues
         */
        abstract public function getInstance();
 

diff --git a/tests/src/Model/User/CookieTest.php b/tests/src/Model/User/CookieTest.php
index b833ef558b4189158c8ba13ebe65bd85a1ef6cc5..eaf79f99e6a1bd6703932dca2329aa58cfb546ac 100644 (file)
--- a/tests/src/Model/User/CookieTest.php
+++ b/tests/src/Model/User/CookieTest.php
@@ -30,7 +30,7 @@ use Mockery\MockInterface;
 
 class CookieTest extends MockedTest
 {
-       /** @var MockInterface|\Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var MockInterface|IManageConfigValues */
        private $config;
        /** @var MockInterface|BaseURL */
        private $baseUrl;

diff --git a/tests/src/Util/EMailerTest.php b/tests/src/Util/EMailerTest.php
index 21a0ffa2dec766afb620bfb86344191eaf14cd37..ec10ee089e5e4d4222425085a54c6204dfa73e79 100644 (file)
--- a/tests/src/Util/EMailerTest.php
+++ b/tests/src/Util/EMailerTest.php
@@ -26,9 +26,9 @@ class EMailerTest extends MockedTest
        use VFSTrait;
        use HookMockTrait;
 
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues|MockInterface */
+       /** @var IManageConfigValues|MockInterface */
        private $config;
-       /** @var \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues|MockInterface */
+       /** @var IManagePersonalConfigValues|MockInterface */
        private $pConfig;
        /** @var L10n|MockInterface */
        private $l10n;

diff --git a/tests/src/Util/Emailer/SystemMailBuilderTest.php b/tests/src/Util/Emailer/SystemMailBuilderTest.php
index 6cb0708edda04c4b671ca7479f084294e98a0b3e..ce3702f96f13edfa57b6a69e34b8ea419ba37ec1 100644 (file)
--- a/tests/src/Util/Emailer/SystemMailBuilderTest.php
+++ b/tests/src/Util/Emailer/SystemMailBuilderTest.php
@@ -34,7 +34,7 @@ class SystemMailBuilderTest extends MockedTest
 {
        use VFSTrait;
 
-       /** @var \Friendica\Core\Config\Capability\IManageConfigValues */
+       /** @var IManageConfigValues */
        private $config;
        /** @var L10n */
        private $l10n;