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

@ -34,7 +34,7 @@ use Friendica\Util\XML;
class ActivityPubConversion extends BaseModule
{
public function content(): string
protected function content(array $request = []): string
{
function visible_whitespace($s)
{

View file

@ -35,7 +35,7 @@ use Friendica\Util\XML;
*/
class Babel extends BaseModule
{
public function content(): string
protected function content(array $request = []): string
{
function visible_whitespace($s)
{

View file

@ -21,13 +21,15 @@
namespace Friendica\Module\Debug;
use Friendica\App\BaseURL;
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Model;
use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
use Friendica\Protocol;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
/**
* Tests a given feed of a contact
@ -37,9 +39,9 @@ class Feed extends BaseModule
/** @var ICanSendHttpRequests */
protected $httpClient;
public function __construct(BaseURL $baseUrl, ICanSendHttpRequests $httpClient, L10n $l10n, array $parameters = [])
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, ICanSendHttpRequests $httpClient, array $server, array $parameters = [])
{
parent::__construct($l10n, $parameters);
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $server, $parameters);
$this->httpClient = $httpClient;
@ -49,7 +51,7 @@ class Feed extends BaseModule
}
}
public function content(): string
protected function content(array $request = []): string
{
$result = [];
if (!empty($_REQUEST['url'])) {

View file

@ -31,7 +31,7 @@ use Friendica\Network\HTTPException;
*/
class ItemBody extends BaseModule
{
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('Access denied.'));

View file

@ -31,7 +31,7 @@ class Localtime extends BaseModule
{
static $mod_localtime = '';
public function post()
protected function post(array $request = [], array $post = [])
{
$time = ($_REQUEST['time'] ?? '') ?: 'now';
@ -42,7 +42,7 @@ class Localtime extends BaseModule
}
}
public function content(): string
protected function content(array $request = []): string
{
$time = ($_REQUEST['time'] ?? '') ?: 'now';

View file

@ -32,7 +32,7 @@ use Friendica\Network\Probe as NetworkProbe;
*/
class Probe extends BaseModule
{
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
throw new HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));

View file

@ -31,7 +31,7 @@ use Friendica\Network\Probe;
*/
class WebFinger extends BaseModule
{
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Only logged in users are permitted to perform a probing.'));