Make BaseModule a real entity

- Add all dependencies, necessary to run the content (baseUrl, Arguments)
- Encapsulate all POST/GET/DELETE/PATCH/PUT methods as protected methods inside the BaseModule
- Return Module content ONLY per `BaseModule::run()` (including the Hook logic there as well)
This commit is contained in:
Philipp 2021-11-20 15:38:03 +01:00
parent 238613fd01
commit 8bdd90066f
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
252 changed files with 615 additions and 623 deletions

View file

@ -38,7 +38,7 @@ use Friendica\Util\Strings;
*/
class Fetch extends BaseModule
{
public function rawContent()
protected function rawContent(array $request = [])
{
if (empty($this->parameters['guid'])) {
throw new HTTPException\NotFoundException();

View file

@ -21,6 +21,7 @@
namespace Friendica\Module\Diaspora;
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n;
@ -28,6 +29,7 @@ use Friendica\Model\User;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Diaspora;
use Friendica\Util\Network;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
@ -36,20 +38,17 @@ use Psr\Log\LoggerInterface;
*/
class Receive extends BaseModule
{
/** @var LoggerInterface */
protected $logger;
/** @var IManageConfigValues */
protected $config;
public function __construct(LoggerInterface $logger, IManageConfigValues $config, L10n $l10n, array $parameters = [])
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, array $server, array $parameters = [])
{
parent::__construct($l10n, $parameters);
$this->logger = $logger;
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $server, $parameters);
$this->config = $config;
}
public function post()
protected function post(array $request = [], array $post = [])
{
$enabled = $this->config->get('system', 'diaspora_enabled', false);
if (!$enabled) {