From da8c41e09490f977bd2089a6f7b22974ba85a253 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Tue, 21 Dec 2021 12:17:51 +0000
Subject: [PATCH] [TOOLS] Fix errors found by PHPStan

---
 src/Controller/Actor.php                | 10 +++++-----
 src/Core/Controller/ActorController.php |  6 +++++-
 src/Entity/Actor.php                    |  9 +++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Controller/Actor.php b/src/Controller/Actor.php
index d9a8c0ee54..7c86fc454f 100644
--- a/src/Controller/Actor.php
+++ b/src/Controller/Actor.php
@@ -87,9 +87,9 @@ class Actor extends ActorController
                 if ($form->isSubmitted() && $form->isValid()) {
                     Log::info(
                         _m(
-                        'Actor id:{actor_id} nick:{actor_nick} created the group {nickname}',
-                        ['{actor_id}' => $actor->getId(), 'actor_nick' => $actor->getNickname(), 'nickname' => $nickname],
-                    ),
+                            'Actor id:{actor_id} nick:{actor_nick} created the group {nickname}',
+                            ['{actor_id}' => $actor->getId(), 'actor_nick' => $actor->getNickname(), 'nickname' => $nickname],
+                        ),
                     );
 
                     $group = E\Actor::create([
@@ -112,8 +112,8 @@ class Actor extends ActorController
                         'is_admin' => true,
                     ]));
                     DB::flush();
-                    Cache::delete(self::cacheKeys($actor->getId())['subscriber']);
-                    Cache::delete(self::cacheKeys($actor->getId())['subscribed']);
+                    Cache::delete(E\Actor::cacheKeys($actor->getId())['subscriber']);
+                    Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribed']);
                     throw new RedirectException;
                 }
 
diff --git a/src/Core/Controller/ActorController.php b/src/Core/Controller/ActorController.php
index fb3356264c..241807de96 100644
--- a/src/Core/Controller/ActorController.php
+++ b/src/Core/Controller/ActorController.php
@@ -33,6 +33,10 @@ declare(strict_types = 1);
 namespace App\Core\Controller;
 
 use App\Core\Controller;
+use App\Core\DB\DB;
+use function App\Core\I18n\_m;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\RedirectException;
 
 abstract class ActorController extends Controller
 {
@@ -43,7 +47,7 @@ abstract class ActorController extends Controller
     {
         $actor = DB::findOneBy('actor', ['id' => $id]);
         if ($actor->getIsLocal()) {
-            return new RedirectResponse($actor->getUrl());
+            throw new RedirectException($actor->getUrl());
         }
         if (empty($actor)) {
             throw new ClientException(_m('No such actor.'), 404);
diff --git a/src/Entity/Actor.php b/src/Entity/Actor.php
index 9d691212bc..983fc1dcf0 100644
--- a/src/Entity/Actor.php
+++ b/src/Entity/Actor.php
@@ -29,6 +29,7 @@ use App\Core\Entity;
 use App\Core\Event;
 use App\Core\Router\Router;
 use App\Core\UserRoles;
+use App\Util\Exception\BugFoundException;
 use App\Util\Exception\DuplicateFoundException;
 use App\Util\Exception\NicknameException;
 use App\Util\Exception\NotFoundException;
@@ -501,6 +502,9 @@ class Actor extends Entity
                 break;
             case self::GROUP:
                 $uri = Router::url('group_actor_view_id', ['id' => $this->getId()], $type);
+                // no break
+            default:
+                throw new BugFoundException('Actor type added but `Actor::getUri` was not updated');
             }
             Event::handle('EndGetActorUri', [$this, $type, &$uri]);
         }
@@ -521,6 +525,9 @@ class Actor extends Entity
                     break;
                 case self::GROUP:
                     $url = Router::url('group_actor_view_nickname', ['nickname' => $this->getNickname()], $type);
+                    // no break
+                default:
+                    throw new BugFoundException('Actor type added but `Actor::getUrl` was not updated');
                 }
             } else {
                 return $this->getUri($type);
@@ -540,6 +547,8 @@ class Actor extends Entity
             return Router::url('actor_view_nickname', ['nickname' => $nickname], $uri_type);
         case self::GROUP:
             return Router::url('group_actor_view_nickname', ['nickname' => $nickname], $uri_type);
+        default:
+            throw new BugFoundException('Actor type added but `Actor::getPlaceholderUri` was not updated');
         }
     }