Introduce `Response` for Modules to create a testable way for module responses

[friendica.git] / src / Module / Filer / SaveTag.php

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index b1742c8a6a75e191da1a9bc28f67445e4c2c918f..3adf4f1fb5fc2e3ec57e257c01402487bf4bad98 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -21,36 +21,40 @@
 
 namespace Friendica\Module\Filer;
 
+use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model;
+use Friendica\Module\Response;
 use Friendica\Network\HTTPException;
+use Friendica\Util\Profiler;
 use Friendica\Util\XML;
+use Psr\Log\LoggerInterface;
 
 /**
  * Shows a dialog for adding tags to a file
  */
 class SaveTag extends BaseModule
 {
-       public function init()
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
                if (!local_user()) {
-                       notice(DI::l10n()->t('You must be logged in to use this module'));
-                       DI::baseUrl()->redirect();
+                       notice($this->t('You must be logged in to use this module'));
+                       $baseUrl->redirect();
                }
        }
 
-       public function rawContent()
+       protected function rawContent(array $request = [])
        {
-               $logger = DI::logger();
-
                $term = XML::unescape(trim($_GET['term'] ?? ''));
 
                $item_id = $this->parameters['id'] ?? 0;
 
-               $logger->info('filer', ['tag' => $term, 'item' => $item_id]);
+               $this->logger->info('filer', ['tag' => $term, 'item' => $item_id]);
 
                if ($item_id && strlen($term)) {
                        $item = Model\Post::selectFirst(['uri-id'], ['id' => $item_id]);
@@ -65,8 +69,8 @@ class SaveTag extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
                echo Renderer::replaceMacros($tpl, [
-                       '$field' => ['term', DI::l10n()->t("Save to Folder:"), '', '', $filetags, DI::l10n()->t('- select -')],
-                       '$submit' => DI::l10n()->t('Save'),
+                       '$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
+                       '$submit' => $this->t('Save'),
                ]);
 
                exit;