Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 07:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Introduce new DI container

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Admin/Addons/Details.php
View file

@ -6,6 +6,7 @@ use Friendica\Content\Text\Markdown;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -15,7 +16,7 @@ class Details extends BaseAdminModule
{
parent::post($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
@ -39,7 +40,7 @@ class Details extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$addons_admin = Addon::getAdminList();

3
src/Module/Admin/Addons/Index.php
View file

@ -5,6 +5,7 @@ namespace Friendica\Module\Admin\Addons;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Index extends BaseAdminModule
@ -13,7 +14,7 @@ class Index extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
// reload active themes
if (!empty($_GET['action'])) {

5
src/Module/Admin/Blocklist/Contact.php
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];

5
src/Module/Admin/Blocklist/Server.php
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 = [];

3
src/Module/Admin/DBSync.php
View file

@ -8,6 +8,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Update;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class DBSync extends BaseAdminModule
@ -16,7 +17,7 @@ class DBSync extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$o = '';

3
src/Module/Admin/Features.php
View file

@ -6,6 +6,7 @@ use Friendica\Content\Feature;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Features extends BaseAdminModule
@ -39,7 +40,7 @@ class Features extends BaseAdminModule
}
}
self::getApp()->internalRedirect('admin/features');
DI::app()->internalRedirect('admin/features');
}
public static function content(array $parameters = [])

3
src/Module/Admin/Item/Delete.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Module\Admin\Item;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -33,7 +34,7 @@ class Delete extends BaseAdminModule
}
info(L10n::t('Item marked for deletion.') . EOL);
self::getApp()->internalRedirect('admin/item/delete');
DI::app()->internalRedirect('admin/item/delete');
}
public static function content(array $parameters = [])

3
src/Module/Admin/Item/Source.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Module\Admin\Item;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model;
use Friendica\Module\BaseAdminModule;
@ -17,7 +18,7 @@ class Source extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$guid = null;
// @TODO: Replace with parameter from router

5
src/Module/Admin/Logs/Settings.php
View file

@ -5,6 +5,7 @@ namespace Friendica\Module\Admin\Logs;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
use Psr\Log\LogLevel;
@ -34,14 +35,14 @@ class Settings extends BaseAdminModule
}
info(L10n::t("Log settings updated."));
self::getApp()->internalRedirect('admin/logs');
DI::app()->internalRedirect('admin/logs');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$log_choices = [
LogLevel::ERROR => 'Error',

3
src/Module/Admin/Queue.php
View file

@ -5,6 +5,7 @@ namespace Friendica\Module\Admin;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Arrays;
use Friendica\Util\DateTimeFormat;
@ -23,7 +24,7 @@ class Queue extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
// @TODO: Replace with parameter from router
$deferred = $a->argc > 2 && $a->argv[2] == 'deferred';

5
src/Module/Admin/Site.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\StorageManager;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Module\Register;
use Friendica\Protocol\PortableContact;
@ -27,7 +28,7 @@ class Site extends BaseAdminModule
self::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site');
$a = self::getApp();
$a = DI::app();
if (!empty($_POST['republish_directory'])) {
Worker::add(PRIORITY_LOW, 'Directory');
@ -416,7 +417,7 @@ class Site extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
/* Installed langs */
$lang_choices = L10n::getAvailableLanguages();

5
src/Module/Admin/Summary.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Update;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Model\Register;
use Friendica\Module\BaseAdminModule;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -24,7 +25,7 @@ class Summary extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
// are there MyISAM tables in the DB? If so, trigger a warning message
$warningtext = [];
@ -208,7 +209,7 @@ class Summary extends BaseAdminModule
private static function checkSelfHostMeta()
{
// Fetch the host-meta to check if this really is a vital server
return Network::curl(self::getApp()->getBaseURL() . '/.well-known/host-meta')->isSuccess();
return Network::curl(DI::app()->getBaseURL() . '/.well-known/host-meta')->isSuccess();
}
}

5
src/Module/Admin/Themes/Details.php
View file

@ -6,6 +6,7 @@ use Friendica\Content\Text\Markdown;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -15,7 +16,7 @@ class Details extends BaseAdminModule
{
parent::post($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
@ -43,7 +44,7 @@ class Details extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router

7
src/Module/Admin/Themes/Embed.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Module\Admin\Themes;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -11,7 +12,7 @@ class Embed extends BaseAdminModule
{
public static function init(array $parameters = [])
{
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
@ -27,7 +28,7 @@ class Embed extends BaseAdminModule
{
parent::post($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
@ -57,7 +58,7 @@ class Embed extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router

3
src/Module/Admin/Themes/Index.php
View file

@ -6,6 +6,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
@ -15,7 +16,7 @@ class Index extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
$allowed_themes = Theme::getAllowedList();

3
src/Module/Admin/Tos.php
View file

@ -5,6 +5,7 @@ namespace Friendica\Module\Admin;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Tos extends BaseAdminModule
@ -29,7 +30,7 @@ class Tos extends BaseAdminModule
info(L10n::t('The Terms of Service settings have been updated.'));
self::getApp()->internalRedirect('admin/tos');
DI::app()->internalRedirect('admin/tos');
}
public static function content(array $parameters = [])

5
src/Module/Admin/Users.php
View file

@ -7,6 +7,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Register;
use Friendica\Model\User;
use Friendica\Module\BaseAdminModule;
@ -19,7 +20,7 @@ class Users extends BaseAdminModule
{
parent::post($parameters);
$a = self::getApp();
$a = DI::app();
$pending = $_POST['pending'] ?? [];
$users = $_POST['user'] ?? [];
@ -135,7 +136,7 @@ class Users extends BaseAdminModule
{
parent::content($parameters);
$a = self::getApp();
$a = DI::app();
if ($a->argc > 3) {
// @TODO: Replace with parameter from router