Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 09:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring Core class structures ...

Browse source
This commit is contained in:
Philipp 2021-10-26 21:44:29 +02:00
parent 57b4c008cb
commit b216317477
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
130 changed files with 1625 additions and 1397 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Util/EMailer/MailBuilder.php
View file

@ -23,7 +23,7 @@ namespace Friendica\Util\EMailer;
use Exception;
use Friendica\App\BaseURL;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Model\User;
@ -42,7 +42,7 @@ abstract class MailBuilder
/** @var L10n */
protected $l10n;
/** @var IConfig */
/** @var IManageConfigValues */
protected $config;
/** @var BaseURL */
protected $baseUrl;
@ -64,7 +64,7 @@ abstract class MailBuilder
/** @var int */
protected $recipientUid = null;
public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger)
public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger)
{
$this->l10n = $l10n;
$this->baseUrl = $baseUrl;

4
src/Util/EMailer/NotifyMailBuilder.php
View file

@ -24,7 +24,7 @@ namespace Friendica\Util\EMailer;
use Exception;
use Friendica\App\BaseURL;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -70,7 +70,7 @@ class NotifyMailBuilder extends MailBuilder
/** @var string The item link */
private $itemLink = '';
public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger, string $siteEmailAddress, string $siteName)
public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger, string $siteEmailAddress, string $siteName)
{
parent::__construct($l10n, $baseUrl, $config, $logger);

4
src/Util/EMailer/SystemMailBuilder.php
View file

@ -24,7 +24,7 @@ namespace Friendica\Util\EMailer;
use Exception;
use Friendica\App\BaseURL;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Network\HTTPException\InternalServerErrorException;
@ -45,7 +45,7 @@ class SystemMailBuilder extends MailBuilder
/** @var string */
protected $siteAdmin;
public function __construct(L10n $l10n, BaseURL $baseUrl, IConfig $config, LoggerInterface $logger,
public function __construct(L10n $l10n, BaseURL $baseUrl, IManageConfigValues $config, LoggerInterface $logger,
string $siteEmailAddress, string $siteName)
{
parent::__construct($l10n, $baseUrl, $config, $logger);

10
src/Util/Emailer.php
View file

@ -22,10 +22,10 @@
namespace Friendica\Util;
use Friendica\App;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\PConfig\IPConfig;
use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Object\EMail\IEmail;
use Friendica\Protocol\Email;
@ -38,9 +38,9 @@ use Psr\Log\LoggerInterface;
*/
class Emailer
{
/** @var IConfig */
/** @var \Friendica\Core\Config\Capability\IManageConfigValues */
private $config;
/** @var IPConfig */
/** @var \Friendica\Core\PConfig\Capability\IManagePersonalConfigValues */
private $pConfig;
/** @var LoggerInterface */
private $logger;
@ -54,7 +54,7 @@ class Emailer
/** @var string */
private $siteEmailName;
public function __construct(IConfig $config, IPConfig $pConfig, App\BaseURL $baseURL, LoggerInterface $logger,
public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, App\BaseURL $baseURL, LoggerInterface $logger,
L10n $defaultLang)
{
$this->config = $config;

10
src/Util/Profiler.php
View file

@ -21,8 +21,8 @@
namespace Friendica\Util;
use Friendica\Core\Config\Cache\Cache;
use Friendica\Core\Config\IConfig;
use Friendica\Core\Config\ValueObject\Cache;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\System;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
@ -69,16 +69,16 @@ class Profiler implements ContainerInterface
/**
* Updates the enabling of the current profiler
*
* @param IConfig $config
* @param IManageConfigValues $config
*/
public function update(IConfig $config)
public function update(IManageConfigValues $config)
{
$this->enabled = $config->get('system', 'profiler');
$this->rendertime = $config->get('rendertime', 'callstack');
}
/**
* @param \Friendica\Core\Config\Cache\Cache $configCache The configuration cache
* @param \Friendica\Core\Config\ValueObject\Cache $configCache The configuration cache
*/
public function __construct(Cache $configCache)
{