Remove deprecated code

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

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 346ae0914438807c2446172e06d25fc3aa94d3cd..963cc8c344e7ada9b85003e5d7de19fe38180442 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -6,18 +6,19 @@ use Friendica\BaseModule;
 use Friendica\Content;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\DI;
 
 /**
  * Prints the possible Smilies of this node
  */
 class Smilies extends BaseModule
 {
-       public static function rawContent()
+       public static function rawContent(array $parameters = [])
        {
-               $app = self::getApp();
-               $smilies = Content\Smilies::getList();
+               $app = DI::app();
 
                if (!empty($app->argv[1]) && ($app->argv[1] === "json")) {
+                       $smilies = Content\Smilies::getList();
                        $results = [];
                        for ($i = 0; $i < count($smilies['texts']); $i++) {
                                $results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];
@@ -26,10 +27,10 @@ class Smilies extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $smilies = Content\Smilies::getList();
-               $count = count(defaults($smilies, 'texts', []));
+               $count = count($smilies['texts'] ?? []);
 
                $tpl = Renderer::getMarkupTemplate('smilies.tpl');
                return Renderer::replaceMacros($tpl, [