Introduce new DI container

- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class
This commit is contained in:
nupplaPhil 2019-12-15 22:34:11 +01:00
parent a9220aa83b
commit 1de3f186d7
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
132 changed files with 377 additions and 270 deletions

View file

@ -6,6 +6,7 @@ use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Model;
@ -38,14 +39,14 @@ class Contact extends BaseAdminModule
notice(L10n::tt('%s contact unblocked', '%s contacts unblocked', count($contacts)));
}
self::getApp()->internalRedirect('admin/blocklist/contact');
DI::app()->internalRedirect('admin/blocklist/contact');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$condition = ['uid' => 0, 'blocked' => true];

View file

@ -5,6 +5,7 @@ namespace Friendica\Module\Admin\Blocklist;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -47,14 +48,14 @@ class Server extends BaseAdminModule
info(L10n::t('Site blocklist updated.') . EOL);
}
self::getApp()->internalRedirect('admin/blocklist/server');
DI::app()->internalRedirect('admin/blocklist/server');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$blocklist = Config::get('system', 'blocklist');
$blocklistform = [];