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

[friendica.git] / src / Module / Apps.php

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index bc099ce8bbb8a5b6fd854f506ee131b6e2228113..6b8d18b94244385d2c3dbccf26a4461d07527412 100644 (file)
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -1,37 +1,62 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
+use Friendica\App;
+use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * Shows the App menu
  */
 class Apps extends BaseModule
 {
-       public static function init(array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IManageConfigValues $config, array $server, array $parameters = [])
        {
-               $privateaddons = Config::get('config', 'private_addons');
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+
+               $privateaddons = $config->get('config', 'private_addons');
                if ($privateaddons === "1" && !local_user()) {
-                       self::getApp()->internalRedirect();
+                       $baseUrl->redirect();
                }
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                $apps = Nav::getAppMenu();
 
                if (count($apps) == 0) {
-                       notice(L10n::t('No installed applications.') . EOL);
+                       notice($this->t('No installed applications.'));
                }
 
                $tpl = Renderer::getMarkupTemplate('apps.tpl');
                return Renderer::replaceMacros($tpl, [
-                       '$title' => L10n::t('Applications'),
+                       '$title' => $this->t('Applications'),
                        '$apps'  => $apps,
                ]);
        }