Merge pull request #12277 from nupplaphil/mod/fbrowser

[friendica.git] / src / LegacyModule.php

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index d307d84ac82995cd296f929e8707d496abcd2dbf..7d9cf20283d20fd171c1a50a6da33080922e10c6 100644 (file)
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,6 +22,9 @@
 namespace Friendica;
 
 use Friendica\Core\L10n;
+use Friendica\Module\Response;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  * This mock module enable class encapsulation of legacy global function modules.
@@ -39,9 +42,9 @@ class LegacyModule extends BaseModule
         */
        private $moduleName = '';
 
-       public function __construct(L10n $l10n, string $file_path = '', array $parameters = [])
+       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, string $file_path = '', array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->setModuleFile($file_path);
 
@@ -54,7 +57,7 @@ class LegacyModule extends BaseModule
         * @param string $file_path
         * @throws \Exception
         */
-       private function setModuleFile($file_path)
+       private function setModuleFile(string $file_path)
        {
                if (!is_readable($file_path)) {
                        throw new \Exception(DI::l10n()->t('Legacy module file not found: %s', $file_path));
@@ -65,13 +68,15 @@ class LegacyModule extends BaseModule
                require_once $file_path;
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                return $this->runModuleFunction('content');
        }
 
-       public function post()
+       protected function post(array $request = [])
        {
+               parent::post($request);
+
                $this->runModuleFunction('post');
        }
 
@@ -82,13 +87,13 @@ class LegacyModule extends BaseModule
         * @return string
         * @throws \Exception
         */
-       private function runModuleFunction(string $function_suffix)
+       private function runModuleFunction(string $function_suffix): string
        {
                $function_name = $this->moduleName . '_' . $function_suffix;
 
                if (\function_exists($function_name)) {
                        $a = DI::app();
-                       return $function_name($a);
+                       return $function_name($a) ?? '';
                }
 
                return '';