Merge pull request #367 from SergiX44/analysis-1b7dYN

Apply fixes from StyleCI

app/Controllers/MediaController.php

@@ -124,8 +124,10 @@ class MediaController extends Controller
     ): Response {
         $media = $this->getMedia($userCode, $mediaCode, false);
 
-        if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get('admin',
+        if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
-                    false))) {
+            'admin',
+            false
+        ))) {
             throw new HttpNotFoundException($request);
         }
 
@@ -156,8 +158,10 @@ class MediaController extends Controller
     {
         $media = $this->getMedia($userCode, $mediaCode, false);
 
-        if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get('admin',
+        if (!$media || (!$media->published && $this->session->get('user_id') !== $media->user_id && !$this->session->get(
-                    false))) {
+            'admin',
+            false
+        ))) {
             throw new HttpNotFoundException($request);
         }
 
@@ -178,16 +182,20 @@ class MediaController extends Controller
         if ($this->session->get('admin')) {
             $media = $this->database->query('SELECT * FROM `uploads` WHERE `id` = ? LIMIT 1', $id)->fetch();
         } else {
-            $media = $this->database->query('SELECT * FROM `uploads` WHERE `id` = ? AND `user_id` = ? LIMIT 1',
+            $media = $this->database->query(
-                [$id, $this->session->get('user_id')])->fetch();
+                'SELECT * FROM `uploads` WHERE `id` = ? AND `user_id` = ? LIMIT 1',
+                [$id, $this->session->get('user_id')]
+            )->fetch();
         }
 
         if (!$media) {
             throw new HttpNotFoundException($request);
         }
 
-        $this->database->query('UPDATE `uploads` SET `published`=? WHERE `id`=?',
+        $this->database->query(
-            [$media->published ? 0 : 1, $media->id]);
+            'UPDATE `uploads` SET `published`=? WHERE `id`=?',
+            [$media->published ? 0 : 1, $media->id]
+        );
 
         return $response;
     }
@@ -312,19 +320,23 @@ class MediaController extends Controller
     {
         $mediaCode = pathinfo($mediaCode)['filename'];
 
-        $media = $this->database->query('SELECT `uploads`.*, `users`.*, `users`.`id` AS `userId`, `uploads`.`id` AS `mediaId` FROM `uploads` INNER JOIN `users` ON `uploads`.`user_id` = `users`.`id` WHERE `user_code` = ? AND `uploads`.`code` = ? LIMIT 1',
+        $media = $this->database->query(
+            'SELECT `uploads`.*, `users`.*, `users`.`id` AS `userId`, `uploads`.`id` AS `mediaId` FROM `uploads` INNER JOIN `users` ON `uploads`.`user_id` = `users`.`id` WHERE `user_code` = ? AND `uploads`.`code` = ? LIMIT 1',
             [
                 $userCode,
                 $mediaCode,
-            ])->fetch();
+            ]
+        )->fetch();
 
         if (!$withTags || !$media) {
             return $media;
         }
 
         $media->tags = [];
-        foreach ($this->database->query('SELECT `tags`.`id`, `tags`.`name` FROM `uploads_tags` INNER JOIN `tags` ON `uploads_tags`.`tag_id` = `tags`.`id` WHERE `uploads_tags`.`upload_id` = ?',
+        foreach ($this->database->query(
-            $media->mediaId) as $tag) {
+            'SELECT `tags`.`id`, `tags`.`name` FROM `uploads_tags` INNER JOIN `tags` ON `uploads_tags`.`tag_id` = `tags`.`id` WHERE `uploads_tags`.`upload_id` = ?',
+            $media->mediaId
+        ) as $tag) {
             $media->tags[$tag->id] = $tag->name;
         }
 
@@ -353,10 +365,17 @@ class MediaController extends Controller
         $this->session->close();
         $mime = $storage->getMimetype($media->storage_path);
 
-        if ((param($request, 'width') !== null || param($request, 'height') !== null) && explode('/',
+        if ((param($request, 'width') !== null || param($request, 'height') !== null) && explode(
-                $mime)[0] === 'image') {
+            '/',
-            return $this->makeThumbnail($storage, $media, param($request, 'width'), param($request, 'height'),
+            $mime
-                $disposition);
+        )[0] === 'image') {
+            return $this->makeThumbnail(
+                $storage,
+                $media,
+                param($request, 'width'),
+                param($request, 'height'),
+                $disposition
+            );
         } else {
             $stream = new Stream($storage->readStream($media->storage_path));
 
@@ -368,8 +387,14 @@ class MediaController extends Controller
             }
 
             if (isset($request->getServerParams()['HTTP_RANGE'])) {
-                return $this->handlePartialRequest($response, $stream, $request->getServerParams()['HTTP_RANGE'],
+                return $this->handlePartialRequest(
-                    $disposition, $media, $mime);
+                    $response,
+                    $stream,
+                    $request->getServerParams()['HTTP_RANGE'],
+                    $disposition,
+                    $media,
+                    $mime
+                );
             }
 
             return $response->withHeader('Content-Type', $mime)
@@ -403,8 +428,10 @@ class MediaController extends Controller
             })
             ->resizeCanvas($width, $height, 'center')
             ->psrResponse('png')
-            ->withHeader('Content-Disposition',
+            ->withHeader(
-                $disposition.';filename="scaled-'.pathinfo($media->filename, PATHINFO_FILENAME).'.png"');
+                'Content-Disposition',
+                $disposition.';filename="scaled-'.pathinfo($media->filename, PATHINFO_FILENAME).'.png"'
+            );
     }
 
     /**

app/Web/UA.php

@@ -52,5 +52,4 @@ class UA
 
         return false;
     }
-
 }