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

@ -48,7 +48,7 @@ class Acl extends BaseModule
const TYPE_PRIVATE_MESSAGE = 'm';
const TYPE_ANY_CONTACT = 'a';
public function rawContent()
protected function rawContent(array $request = [])
{
if (!local_user()) {
throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.'));

View file

@ -31,7 +31,7 @@ use Friendica\Module\Security\Login;
*/
class Directory extends BaseSearch
{
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
notice(DI::l10n()->t('Permission denied.'));

View file

@ -17,7 +17,7 @@ use Friendica\Module\Security\Login;
class Filed extends BaseSearch
{
public function content(): string
protected function content(array $request = []): string
{
if (!local_user()) {
return Login::form();

View file

@ -41,7 +41,7 @@ use Friendica\Network\HTTPException;
class Index extends BaseSearch
{
public function content(): string
protected function content(array $request = []): string
{
$search = (!empty($_GET['q']) ? trim(rawurldecode($_GET['q'])) : '');

View file

@ -21,32 +21,27 @@
namespace Friendica\Module\Search;
use Friendica\App\Arguments;
use Friendica\App\BaseURL;
use Friendica\App;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Search;
use Friendica\Database\Database;
use Friendica\Util\Profiler;
use Psr\Log\LoggerInterface;
class Saved extends BaseModule
{
/** @var Arguments */
protected $args;
/** @var Database */
protected $dba;
/** @var BaseURL */
protected $baseUrl;
public function __construct(BaseURL $baseUrl, Database $dba, Arguments $args, L10n $l10n, array $parameters = [])
public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Database $dba, array $server, array $parameters = [])
{
parent::__construct($l10n, $parameters);
parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $server, $parameters);
$this->baseUrl = $baseUrl;
$this->dba = $dba;
$this->args = $args;
$this->dba = $dba;
}
public function rawContent()
protected function rawContent(array $request = [])
{
$action = $this->args->get(2, 'none');
$search = trim(rawurldecode($_GET['term'] ?? ''));