Refactoring Core class structures ...

This commit is contained in:
Philipp 2021-10-26 21:44:28 +02:00
parent ae86b2e806
commit 63fca0af29
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
15 changed files with 20 additions and 20 deletions

View file

@ -11,7 +11,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\XML; use Friendica\Util\XML;
function geonames_install() function geonames_install()

View file

@ -13,7 +13,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Strings; use Friendica\Util\Strings;
/** /**

View file

@ -12,7 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings; use Friendica\Util\Strings;

View file

@ -59,7 +59,7 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
function ldapauth_install() function ldapauth_install()
{ {

View file

@ -12,7 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Strings; use Friendica\Util\Strings;
/** /**

View file

@ -23,7 +23,7 @@ namespace Friendica\Addon\notifyall;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Object\Email; use Friendica\Object\Email;
@ -32,7 +32,7 @@ use Friendica\Object\Email;
*/ */
class NotifyAllEmail extends Email class NotifyAllEmail extends Email
{ {
public function __construct(L10n $l10n, IConfig $config, BaseURL $baseUrl, string $text) public function __construct(L10n $l10n, IManageConfigValues $config, BaseURL $baseUrl, string $text)
{ {
$sitename = $config->get('config', 'sitename'); $sitename = $config->get('config', 'sitename');

View file

@ -14,7 +14,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Strings; use Friendica\Util\Strings;
const OSM_TMS = 'https://www.openstreetmap.org'; const OSM_TMS = 'https://www.openstreetmap.org';

View file

@ -11,7 +11,7 @@ use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
use Friendica\Object\EMail\IEmail; use Friendica\Object\EMail\IEmail;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\Exception; use PHPMailer\PHPMailer\Exception;

View file

@ -35,7 +35,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function piwik_install() { function piwik_install() {

View file

@ -15,7 +15,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notification; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;

View file

@ -24,7 +24,7 @@ use Friendica\Model\User;
use Friendica\Network\HTTPClientOptions; use Friendica\Network\HTTPClientOptions;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; use Friendica\Util\XML;

View file

@ -23,8 +23,8 @@ namespace Friendica\Addon\securemail;
use Friendica\App; use Friendica\App;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\PConfig\IPConfig; use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Object\Email; use Friendica\Object\Email;
@ -33,7 +33,7 @@ use Friendica\Object\Email;
*/ */
class SecureTestEmail extends Email class SecureTestEmail extends Email
{ {
public function __construct(App $a, IConfig $config, IPConfig $pConfig, BaseURL $baseUrl) public function __construct(App $a, IManageConfigValues $config, IManagePersonalConfigValues $pConfig, BaseURL $baseUrl)
{ {
$sitename = $config->get('config', 'sitename'); $sitename = $config->get('config', 'sitename');

View file

@ -13,7 +13,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notification; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
function testdrive_install() { function testdrive_install() {

View file

@ -84,7 +84,7 @@ use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Core\Config\Cache\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileLoader;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images; use Friendica\Util\Images;
use Friendica\Util\Strings; use Friendica\Util\Strings;

View file

@ -2,7 +2,7 @@
namespace Friendica\Addon\webdav_storage\src; namespace Friendica\Addon\webdav_storage\src;
use Friendica\Core\Config\IConfig; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Model\Storage\IStorageConfiguration; use Friendica\Model\Storage\IStorageConfiguration;
use Friendica\Network\HTTPClientOptions; use Friendica\Network\HTTPClientOptions;
@ -18,7 +18,7 @@ class WebDavConfig implements IStorageConfiguration
/** @var L10n */ /** @var L10n */
private $l10n; private $l10n;
/** @var IConfig */ /** @var IManageConfigValues */
private $config; private $config;
/** @var string */ /** @var string */
@ -46,7 +46,7 @@ class WebDavConfig implements IStorageConfiguration
return $this->authOptions; return $this->authOptions;
} }
public function __construct(L10n $l10n, IConfig $config, IHTTPClient $client) public function __construct(L10n $l10n, IManageConfigValues $config, IHTTPClient $client)
{ {
$this->l10n = $l10n; $this->l10n = $l10n;
$this->config = $config; $this->config = $config;