Added type hints

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index bcfe13f5372e4330a2650f15caa8225a3109ab66..0c2baeac4019155cbfdc969bcdb1f118b42ed2e0 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -9,6 +9,7 @@ use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\DI;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Object\Image;
 
@@ -23,9 +24,9 @@ class Photo extends BaseModule
         * Fetch a photo or an avatar, in optional size, check for permissions and
         * return the image
         */
-       public static function init()
+       public static function init(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
                // @TODO: Replace with parameter from router
                if ($a->argc <= 1 || $a->argc > 4) {
                        throw new \Friendica\Network\HTTPException\BadRequestException();
@@ -53,15 +54,15 @@ class Photo extends BaseModule
                switch($a->argc) {
                        case 4:
                                $customsize = intval($a->argv[2]);
-                               $uid = self::stripExtension($a->argv[3]);
+                               $uid = MPhoto::stripExtension($a->argv[3]);
                                $photo = self::getAvatar($uid, $a->argv[1]);
                                break;
                        case 3:
-                               $uid = self::stripExtension($a->argv[2]);
+                               $uid = MPhoto::stripExtension($a->argv[2]);
                                $photo = self::getAvatar($uid, $a->argv[1]);
                                break;
                        case 2:
-                               $photoid = self::stripExtension($a->argv[1]);
+                               $photoid = MPhoto::stripExtension($a->argv[1]);
                                $scale = 0;
                                if (substr($photoid, -2, 1) == "-") {
                                        $scale = intval(substr($photoid, -1, 1));
@@ -117,15 +118,6 @@ class Photo extends BaseModule
                exit();
        }
 
-       private static function stripExtension($name)
-       {
-               $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
-               foreach (Image::supportedTypes() as $m => $e) {
-                       $name = str_replace("." . $e, "", $name);
-               }
-               return $name;
-       }
-
        private static function getAvatar($uid, $type="avatar")
        {