Browse Source

Cleanup namespaces

pull/10918/head
Philipp 3 months ago
parent
commit
58eea1adaa
No known key found for this signature in database GPG Key ID: 24A7501396EB5432
  1. 20
      src/App.php
  2. 4
      src/App/BaseURL.php
  3. 5
      src/App/Module.php
  4. 10
      src/App/Page.php
  5. 2
      src/Console/Lock.php
  6. 2
      src/Console/PostUpdate.php
  7. 2
      src/Core/StorageManager.php
  8. 10
      src/DI.php
  9. 14
      src/Factory/LoggerFactory.php
  10. 4
      src/Model/Storage/FilesystemConfig.php
  11. 8
      src/Model/User/Cookie.php
  12. 4
      src/Navigation/Notifications/Factory/Introduction.php
  13. 2
      src/Navigation/Notifications/Repository/Notify.php
  14. 7
      src/Security/Authentication.php
  15. 12
      src/Security/ExAuth.php
  16. 4
      src/Util/Emailer.php
  17. 2
      tests/Util/AppMockTrait.php
  18. 2
      tests/legacy/ApiTest.php
  19. 2
      tests/src/App/RouterTest.php
  20. 4
      tests/src/Core/Config/ConfigTest.php
  21. 2
      tests/src/Model/User/CookieTest.php
  22. 4
      tests/src/Util/EMailerTest.php
  23. 2
      tests/src/Util/Emailer/SystemMailBuilderTest.php

20
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)
{

4
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)
{

5
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;

10
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
*/

2
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;

2
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;
/**

2
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;

10
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()
{

14
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
*

4
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)
{

8
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 = [])
{

4
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;

2
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 */

7
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;

12
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
*/

4
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;

2
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;

2
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');

2
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;

4
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();

2
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;

4
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;

2
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;

Loading…
Cancel
Save