bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Alphabetic sort DI-container per namespace

Browse source
This commit is contained in:
Philipp Holzer 2019-12-22 20:49:42 +01:00
parent 04d1827eae
commit 987b29d963
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
1 changed files with 34 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/DI.php
View file

@ -3,22 +3,6 @@
namespace Friendica; namespace Friendica;
use Dice\Dice; use Dice\Dice;
use Friendica\Core\Cache\ICache;
use Friendica\Core\Config\IConfiguration;
use Friendica\Core\Config\IPConfiguration;
use Friendica\Core\L10n\L10n;
use Friendica\Core\Lock\ILock;
use Friendica\Core\Process;
use Friendica\Core\Session\ISession;
use Friendica\Database\Database;
use Friendica\Model\Notify;
use Friendica\Protocol\Activity;
use Friendica\Util\ACLFormatter;
use Friendica\Content;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\FileSystem;
use Friendica\Util\Logger\WorkerLogger;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
/** /**
@ -27,22 +11,6 @@ use Psr\Log\LoggerInterface;
* There has to be a "method" phpDoc for each new class, containing result class for a proper matching * There has to be a "method" phpDoc for each new class, containing result class for a proper matching
* *
* @method static App app() * @method static App app()
* @method static ACLFormatter aclFormatter()
* @method static Notify notify()
* @method static Activity activity()
* @method static Content\Item contentItem()
* @method static Content\Text\BBCode\Video bbCodeVideo()
* @method static DateTimeFormat dtFormat()
* @method static ICache cache()
* @method static IConfiguration config()
* @method static IPConfiguration pConfig()
* @method static ILock lock()
* @method static L10n l10n()
* @method static LoggerInterface logger()
* @method static LoggerInterface devLogger()
* @method static LoggerInterface workerLogger()
* @method static Profiler profiler()
* @method static ISession session()
* @method static App\Authentication auth() * @method static App\Authentication auth()
* @method static App\Arguments args() * @method static App\Arguments args()
* @method static App\BaseURL baseUrl() * @method static App\BaseURL baseUrl()
@ -50,16 +18,31 @@ use Psr\Log\LoggerInterface;
* @method static App\Module module() * @method static App\Module module()
* @method static App\Page page() * @method static App\Page page()
* @method static App\Router router() * @method static App\Router router()
* @method static Database dba() * @method static Content\Item contentItem()
* @method static FileSystem fs() * @method static Content\Text\BBCode\Video bbCodeVideo()
* @method static Process process() * @method static Core\Cache\ICache cache()
* @method static Core\Config\IConfiguration config()
* @method static Core\Config\IPConfiguration pConfig()
* @method static Core\Lock\ILock lock()
* @method static Core\L10n\L10n l10n()
* @method static Core\Process process()
* @method static Core\Session\ISession session()
* @method static Database\Database dba()
* @method static Model\Notify notify()
* @method static Protocol\Activity activity()
* @method static Util\ACLFormatter aclFormatter()
* @method static Util\DateTimeFormat dtFormat()
* @method static Util\FileSystem fs()
* @method static Util\Profiler profiler()
* @method static LoggerInterface logger()
* @method static LoggerInterface devLogger()
* @method static LoggerInterface workerLogger()
* *
*/ */
class DI class DI
{ {
const CLASS_MAPPING = [ const CLASS_MAPPING = [
'app' => App::class, 'app' => App::class,
'aclFormatter' => ACLFormatter::class,
'auth' => App\Authentication::class, 'auth' => App\Authentication::class,
'args' => App\Arguments::class, 'args' => App\Arguments::class,
'baseUrl' => App\BaseURL::class, 'baseUrl' => App\BaseURL::class,
@ -67,24 +50,25 @@ class DI
'module' => App\Module::class, 'module' => App\Module::class,
'page' => App\Page::class, 'page' => App\Page::class,
'router' => App\Router::class, 'router' => App\Router::class,
'notify' => Notify::class,
'activity' => Activity::class,
'contentItem' => Content\Item::class, 'contentItem' => Content\Item::class,
'bbCodeVideo' => Content\Text\BBCode\Video::class, 'bbCodeVideo' => Content\Text\BBCode\Video::class,
'dtFormat' => DateTimeFormat::class, 'cache' => Core\Cache\ICache::class,
'cache' => ICache::class, 'config' => Core\Config\IConfiguration::class,
'config' => IConfiguration::class, 'pConfig' => Core\Config\IPConfiguration::class,
'pConfig' => IPConfiguration::class, 'l10n' => Core\L10n\L10n::class,
'l10n' => L10n::class, 'lock' => Core\Lock\ILock::class,
'lock' => ILock::class, 'process' => Core\Process::class,
'session' => Core\Session\ISession::class,
'dba' => Database\Database::class,
'notify' => Model\Notify::class,
'activity' => Protocol\Activity::class,
'aclFormatter' => Util\ACLFormatter::class,
'dtFormat' => Util\DateTimeFormat::class,
'fs' => Util\FileSystem::class,
'workerLogger' => Util\Logger\WorkerLogger::class,
'profiler' => Util\Profiler::class,
'logger' => LoggerInterface::class, 'logger' => LoggerInterface::class,
'workerLogger' => WorkerLogger::class,
'devLogger' => '$devLogger', 'devLogger' => '$devLogger',
'session' => ISession::class,
'dba' => Database::class,
'fs' => FileSystem::class,
'profiler' => Profiler::class,
'process' => Process::class,
]; ];
/** @var Dice */ /** @var Dice */