Use rawContent for Special Options to avoid a protected options() method

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

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 963cc8c344e7ada9b85003e5d7de19fe38180442..1ea992d68e9e3d79c433604170342c6cc26a0b2b 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -1,9 +1,29 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, 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\BaseModule;
 use Friendica\Content;
+use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -13,11 +33,9 @@ use Friendica\DI;
  */
 class Smilies extends BaseModule
 {
-       public static function rawContent(array $parameters = [])
+       protected function rawContent(array $request = [])
        {
-               $app = DI::app();
-
-               if (!empty($app->argv[1]) && ($app->argv[1] === "json")) {
+               if (!empty(DI::args()->getArgv()[1]) && (DI::args()->getArgv()[1] === "json")) {
                        $smilies = Content\Smilies::getList();
                        $results = [];
                        for ($i = 0; $i < count($smilies['texts']); $i++) {
@@ -27,7 +45,7 @@ class Smilies extends BaseModule
                }
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                $smilies = Content\Smilies::getList();
                $count = count($smilies['texts'] ?? []);