refactor: fix some of phpstan's ignored errors

app/Controllers/BaseController.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Controllers;
 
 use CodeIgniter\Controller;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -20,6 +21,13 @@ use ViewThemes\Theme;
  */
 abstract class BaseController extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
     /**
      * Constructor.
      */

app/Controllers/EpisodeAudioController.php

@@ -16,6 +16,7 @@ use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -27,6 +28,13 @@ use Psr\Log\LoggerInterface;
 
 class EpisodeAudioController extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
     /**
      * An array of helpers to be loaded automatically upon class instantiation. These helpers will be available to all
      * other controllers that extend Analytics.

app/Controllers/EpisodeCommentController.php

@@ -166,16 +166,24 @@ class EpisodeCommentController extends BaseController
 
     public function attemptLike(): RedirectResponse
     {
+        if (! ($interactAsActor = interact_as_actor()) instanceof Actor) {
+            return redirect()->back();
+        }
+
         model(LikeModel::class)
-            ->toggleLike(interact_as_actor(), $this->comment);
+            ->toggleLike($interactAsActor, $this->comment);
 
         return redirect()->back();
     }
 
     public function attemptReply(): RedirectResponse
     {
+        if (! ($interactAsActor = interact_as_actor()) instanceof Actor) {
+            return redirect()->back();
+        }
+
         model(LikeModel::class)
-            ->toggleLike(interact_as_actor(), $this->comment);
+            ->toggleLike($interactAsActor, $this->comment);
 
         return redirect()->back();
     }

app/Controllers/FeedController.php

@@ -10,10 +10,12 @@ declare(strict_types=1);
 
 namespace App\Controllers;
 
+use App\Entities\Podcast;
 use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\ResponseInterface;
 use Exception;
 use Modules\PremiumPodcasts\Entities\Subscription;
@@ -22,13 +24,20 @@ use Opawg\UserAgentsPhp\UserAgentsRSS;
 
 class FeedController extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
     public function index(string $podcastHandle): ResponseInterface
     {
         helper(['rss', 'premium_podcasts', 'misc']);
 
         $podcast = (new PodcastModel())->where('handle', $podcastHandle)
             ->first();
-        if (! $podcast) {
+        if (! $podcast instanceof Podcast) {
             throw PageNotFoundException::forPageNotFound();
         }
 

app/Controllers/PageController.php

@@ -24,9 +24,8 @@ class PageController extends BaseController
             throw PageNotFoundException::forPageNotFound();
         }
 
-        if (
+        $page = (new PageModel())->where('slug', $params[0])->first();
-            ($page = (new PageModel())->where('slug', $params[0])->first()) === null
+        if (! $page instanceof Page) {
-        ) {
             throw PageNotFoundException::forPageNotFound();
         }
 

app/Database/Migrations/2021-05-29-152000_add_categories.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddCategories extends BaseMigration
-
-class AddCategories extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-05-30-101000_add_languages.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddLanguages extends BaseMigration
-
-class AddLanguages extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-05-30-101500_add_podcasts.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPodcasts extends BaseMigration
-
-class AddPodcasts extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-06-05-170000_add_episodes.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddEpisodes extends BaseMigration
-
-class AddEpisodes extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-06-05-190000_add_platforms.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPlatforms extends BaseMigration
-
-class AddPlatforms extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-06-05-200000_add_podcasts_platforms.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPodcastsPlatforms extends BaseMigration
-
-class AddPodcastsPlatforms extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-08-12-150000_add_episode_comments.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddEpisodeComments extends BaseMigration
-
-class AddEpisodeComments extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-08-12-160000_add_likes.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddLikes extends BaseMigration
-
-class AddLikes extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-08-17-150000_add_pages.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPages extends BaseMigration
-
-class AddPages extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-09-29-150000_add_podcasts_categories.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPodcastsCategories extends BaseMigration
-
-class AddPodcastsCategories extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-12-09-130000_add_clips.php

@@ -10,9 +10,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddClips extends BaseMigration
-
-class AddClips extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-12-25-120000_add_persons.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPersons extends BaseMigration
-
-class AddPersons extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-12-25-130000_add_podcasts_persons.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddPodcastsPersons extends BaseMigration
-
-class AddPodcastsPersons extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-12-25-140000_add_episodes_persons.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddEpisodesPersons extends BaseMigration
-
-class AddEpisodesPersons extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2021-12-25-150000_add_credits_view.php

@@ -10,9 +10,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddCreditsView extends BaseMigration
-
-class AddCreditsView extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2022-02-23-100000_add_episode_id_to_posts.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddEpisodeIdToPosts extends BaseMigration
-
-class AddEpisodeIdToPosts extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/2022-03-09-113000_add_created_by_to_posts.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddCreatedByToPosts extends BaseMigration
-
-class AddCreatedByToPosts extends Migration
 {
     public function up(): void
     {

app/Database/Migrations/BaseMigration.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Class AddCreatedByToPosts Adds created_by field to posts table in database
+ *
+ * @copyright  2020 Ad Aures
+ * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
+ * @link       https://castopod.org/
+ */
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Migration;
+
+class BaseMigration extends Migration
+{
+    /**
+     * Database Connection instance
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    public function up(): void
+    {
+    }
+
+    public function down(): void
+    {
+    }
+}

app/Database/Seeds/FakePodcastsAnalyticsSeeder.php

@@ -12,9 +12,12 @@ declare(strict_types=1);
 
 namespace App\Database\Seeds;
 
+use App\Entities\Episode;
+use App\Entities\Podcast;
 use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Database\Seeder;
+use Exception;
 use GeoIp2\Database\Reader;
 
 use GeoIp2\Exception\AddressNotFoundException;
@@ -41,11 +44,18 @@ class FakePodcastsAnalyticsSeeder extends Seeder
 
         $podcast = (new PodcastModel())->first();
 
-        if ($podcast !== null) {
+        if (! $podcast instanceof Podcast) {
+            throw new Exception("COULD NOT POPULATE DATABASE:\n\tCreate a podcast with episodes first.\n");
+        }
+
         $firstEpisode = (new EpisodeModel())
             ->selectMin('published_at')
             ->first();
 
+        if (! $firstEpisode instanceof Episode) {
+            throw new Exception("COULD NOT POPULATE DATABASE:\n\tCreate an episode first.");
+        }
+
         for (
             $date = strtotime((string) $firstEpisode->published_at);
             $date < strtotime('now');
@@ -195,8 +205,5 @@ class FakePodcastsAnalyticsSeeder extends Seeder
                 ->ignore(true)
                 ->insertBatch($analyticsPodcastsByRegion);
         }
-        } else {
-            echo "COULD NOT POPULATE DATABASE:\n\tCreate a podcast with episodes first.\n";
-        }
     }
 }

app/Database/Seeds/FakeWebsiteAnalyticsSeeder.php

@@ -12,10 +12,13 @@ declare(strict_types=1);
 
 namespace App\Database\Seeds;
 
+use App\Entities\Episode;
+use App\Entities\Podcast;
 use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 
 use CodeIgniter\Database\Seeder;
+use Exception;
 
 class FakeWebsiteAnalyticsSeeder extends Seeder
 {
@@ -183,11 +186,18 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
     {
         $podcast = (new PodcastModel())->first();
 
-        if ($podcast) {
+        if (! $podcast instanceof Podcast) {
+            throw new Exception("COULD NOT POPULATE DATABASE:\n\tCreate a podcast with episodes first.\n");
+        }
+
         $firstEpisode = (new EpisodeModel())
             ->selectMin('published_at')
             ->first();
 
+        if (! $firstEpisode instanceof Episode) {
+            throw new Exception("COULD NOT POPULATE DATABASE:\n\tCreate an episode first.");
+        }
+
         for (
             $date = strtotime((string) $firstEpisode->published_at);
             $date < strtotime('now');
@@ -261,8 +271,5 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
                 ->ignore(true)
                 ->insertBatch($websiteByReferer);
         }
-        } else {
-            echo "COULD NOT POPULATE DATABASE:\n\tCreate a podcast with episodes first.\n";
-        }
     }
 }

app/Entities/Clip/BaseClip.php

@@ -119,6 +119,7 @@ class BaseClip extends Entity
 
     public function getUser(): ?User
     {
+        /** @var ?User */
         return (new UserModel())->find($this->created_by);
     }
 

app/Entities/Credit.php

@@ -98,6 +98,7 @@ class Credit extends Entity
             return '';
         }
 
+        /** @var string */
         return lang("PersonsTaxonomy.persons.{$this->person_group}.label");
     }
 
@@ -111,6 +112,7 @@ class Credit extends Entity
             return '';
         }
 
+        /** @var string */
         return lang("PersonsTaxonomy.persons.{$this->person_group}.roles.{$this->person_role}.label");
     }
 }

app/Entities/Episode.php

@@ -33,6 +33,7 @@ use Modules\Media\Entities\Image;
 use Modules\Media\Entities\Transcript;
 use Modules\Media\Models\MediaModel;
 use RuntimeException;
+use SimpleXMLElement;
 
 /**
  * @property int $id
@@ -619,13 +620,19 @@ class Episode extends Entity
         }
 
         helper('rss');
-        $customRssArray = rss_to_array(
+
-            simplexml_load_string(
+        $customXML = simplexml_load_string(
             '<?xml version="1.0" encoding="utf-8"?><rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:podcast="https://github.com/Podcastindex-org/podcast-namespace/blob/main/docs/1.0.md" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><item>' .
                 $customRssString .
                 '</item></channel></rss>',
-            ),
+        );
-        )['elements'][0]['elements'][0];
+
+        if (! $customXML instanceof SimpleXMLElement) {
+            // TODO: Failed to parse custom xml, should return error?
+            return $this;
+        }
+
+        $customRssArray = rss_to_array($customXML)['elements'][0]['elements'][0];
 
         if (array_key_exists('elements', $customRssArray)) {
             $this->attributes['custom_rss'] = json_encode($customRssArray['elements']);

app/Entities/Podcast.php

@@ -21,6 +21,7 @@ use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Entities\User;
+use Exception;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
@@ -260,7 +261,13 @@ class Podcast extends Entity
     public function getCover(): Image
     {
         if (! $this->cover instanceof Image) {
-            $this->cover = (new MediaModel('image'))->getMediaById($this->cover_id);
+            $cover = (new MediaModel('image'))->getMediaById($this->cover_id);
+
+            if (! $cover instanceof Image) {
+                throw new Exception('Could not retrieve podcast cover.');
+            }
+
+            $this->cover = $cover;
         }
 
         return $this->cover;

app/Helpers/url_helper.php

@@ -40,7 +40,9 @@ if (! function_exists('current_domain')) {
      */
     function current_domain(): string
     {
+        /** @var URI $uri */
         $uri = current_url(true);
+
         return $uri->getHost() . ($uri->getPort() ? ':' . $uri->getPort() : '');
     }
 }

app/Models/EpisodeCommentModel.php

@@ -10,6 +10,8 @@ declare(strict_types=1);
 
 namespace App\Models;
 
+use App\Entities\Actor;
+use App\Entities\Episode;
 use App\Entities\EpisodeComment;
 use App\Libraries\CommentObject;
 use CodeIgniter\Database\BaseBuilder;
@@ -297,7 +299,15 @@ class EpisodeCommentModel extends UuidModel
             $episode = model(EpisodeModel::class, false)
                 ->find((int) $data['data']['episode_id']);
 
-            $data['data']['uri'] = url_to('episode-comment', esc($actor->username), $episode->slug, $uuid4->toString());
+            if (! $episode instanceof Episode) {
+                return $data;
+            }
+
+            if (! $actor instanceof Actor) {
+                return $data;
+            }
+
+            $data['data']['uri'] = url_to('episode-comment', $actor->username, $episode->slug, $uuid4->toString());
         }
 
         return $data;

app/Models/LikeModel.php

@@ -15,6 +15,7 @@ use App\Entities\Like;
 use Michalsn\Uuid\UuidModel;
 use Modules\Fediverse\Activities\LikeActivity;
 use Modules\Fediverse\Activities\UndoActivity;
+use Modules\Fediverse\Entities\Activity;
 use Modules\Fediverse\Entities\Actor;
 use Modules\Fediverse\Models\ActivityModel;
 
@@ -113,6 +114,11 @@ class LikeModel extends UuidModel
                 ])
                 ->first();
 
+            if (! $activity instanceof Activity) {
+                // no like activity found, do nothing
+                return;
+            }
+
             $likeActivity = new LikeActivity();
             $likeActivity
                 ->set('id', url_to('activity', esc($actor->username), $activity->id))

app/Models/PodcastModel.php

@@ -439,13 +439,15 @@ class PodcastModel extends Model
         if ($podcast instanceof Podcast) {
             $podcastActor = (new ActorModel())->find($podcast->actor_id);
 
-            if ($podcastActor) {
+            if (! $podcastActor instanceof Actor) {
+                return $data;
+            }
+
             $podcastActor->avatar_image_url = $podcast->cover->federation_url;
             $podcastActor->avatar_image_mimetype = $podcast->cover->federation_mimetype;
 
             (new ActorModel())->update($podcast->actor_id, $podcastActor);
         }
-        }
 
         return $data;
     }

modules/Analytics/Database/Migrations/2017-12-01-000000_add_analytics_podcasts.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcasts extends Migration
+class AddAnalyticsPodcasts extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-010000_add_analytics_podcasts_by_episode.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsByEpisode extends Migration
+class AddAnalyticsPodcastsByEpisode extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-020000_add_analytics_podcasts_by_hour.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsByHour extends Migration
+class AddAnalyticsPodcastsByHour extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-030000_add_analytics_podcasts_by_player.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsByPlayer extends Migration
+class AddAnalyticsPodcastsByPlayer extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-040000_add_analytics_podcasts_by_country.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsByCountry extends Migration
+class AddAnalyticsPodcastsByCountry extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-050000_add_analytics_podcasts_by_region.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsByRegion extends Migration
+class AddAnalyticsPodcastsByRegion extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-060000_add_analytics_website_by_browser.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsWebsiteByBrowser extends Migration
+class AddAnalyticsWebsiteByBrowser extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-070000_add_analytics_website_by_referer.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsWebsiteByReferer extends Migration
+class AddAnalyticsWebsiteByReferer extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-080000_add_analytics_website_by_entry_page.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsWebsiteByEntryPage extends Migration
+class AddAnalyticsWebsiteByEntryPage extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-090000_add_analytics_unknown_useragents.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsUnknownUseragents extends Migration
+class AddAnalyticsUnknownUseragents extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-100000_add_analytics_podcasts_by_subscription.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsBySubscription extends Migration
+class AddAnalyticsPodcastsBySubscription extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-210000_add_analytics_podcasts_procedure.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsPodcastsProcedure extends Migration
+class AddAnalyticsPodcastsProcedure extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-210000_add_analytics_unknown_useragents_procedure.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsUnknownUseragentsProcedure extends Migration
+class AddAnalyticsUnknownUseragentsProcedure extends BaseMigration
 {
     public function up(): void
     {

modules/Analytics/Database/Migrations/2017-12-01-210000_add_analytics_website_procedure.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Analytics\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddAnalyticsWebsiteProcedure extends Migration
+class AddAnalyticsWebsiteProcedure extends BaseMigration
 {
     public function up(): void
     {

modules/Auth/Database/Migrations/2020-12-29-100000_add_is_owner_to_users.php

@@ -4,9 +4,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddIsOwnerToUsers extends BaseMigration
-
-class AddIsOwnerToUsers extends Migration
 {
     public function up(): void
     {

modules/Auth/Helpers/auth_helper.php

@@ -68,15 +68,15 @@ if (! function_exists('interact_as_actor')) {
     /**
      * Get the actor the user is currently interacting as
      */
-    function interact_as_actor(): Actor | false
+    function interact_as_actor(): ?Actor
     {
         if (! auth()->loggedIn()) {
-            return false;
+            return null;
         }
 
         $session = session();
         if (! $session->has('interact_as_actor_id')) {
-            return false;
+            return null;
         }
 
         return model(ActorModel::class, false)->getActorById($session->get('interact_as_actor_id'));

modules/Fediverse/Controllers/PostController.php

@@ -12,6 +12,7 @@ namespace Modules\Fediverse\Controllers;
 
 use CodeIgniter\Controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -23,6 +24,13 @@ use Modules\Fediverse\Objects\OrderedCollectionPage;
 
 class PostController extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
     /**
      * @var string[]
      */

modules/Fediverse/Core/AbstractObject.php

@@ -47,8 +47,8 @@ abstract class AbstractObject
         });
     }
 
-    public function toJSON(): string | bool
+    public function toJSON(): string
     {
-        return json_encode($this->toArray(), JSON_UNESCAPED_UNICODE);
+        return (string) json_encode($this->toArray(), JSON_UNESCAPED_UNICODE);
     }
 }

modules/Fediverse/Database/Migrations/2018-01-01-010000_add_actors.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddActors extends Migration
+class AddActors extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-020000_add_posts.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddPosts extends Migration
+class AddPosts extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-100000_add_activities.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddActivities extends Migration
+class AddActivities extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-100000_add_favourites.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddFavourites extends Migration
+class AddFavourites extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-100000_add_follows.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddFollowers extends Migration
+class AddFollowers extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-100000_add_preview_cards.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddPreviewCards extends Migration
+class AddPreviewCards extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-110000_add_posts_preview_cards.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddPostsPreviewCards extends Migration
+class AddPostsPreviewCards extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-120000_add_blocked_domains.php

@@ -12,9 +12,9 @@ declare(strict_types=1);
 
 namespace Modules\Fediverse\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddBlockedDomains extends Migration
+class AddBlockedDomains extends BaseMigration
 {
     public function up(): void
     {

modules/Fediverse/Database/Migrations/2018-01-01-130000_add_notifications.php

@@ -12,9 +12,7 @@ declare(strict_types=1);
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+class AddNotifications extends BaseMigration
-
-class AddNotifications extends Migration
 {
     public function up(): void
     {

modules/Media/Database/Migrations/2021-05-29-120000_add_media.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Media\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddMedia extends Migration
+class AddMedia extends BaseMigration
 {
     public function up(): void
     {

modules/Media/Database/Migrations/2022-30-12-180000_rename_media_file_path.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Media\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class RenameMediafileKey extends Migration
+class RenameMediafileKey extends BaseMigration
 {
     public function up(): void
     {

modules/PremiumPodcasts/Database/Migrations/2022-07-07-120000_add_subscriptions.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Modules\PremiumPodcasts\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddSubscriptions extends Migration
+class AddSubscriptions extends BaseMigration
 {
     public function up(): void
     {

modules/WebSub/Database/Migrations/2022-03-07-180000_add_is_published_on_hubs_to_podcasts.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Modules\WebSub\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddIsPublishedOnHubsToPodcasts extends Migration
+class AddIsPublishedOnHubsToPodcasts extends BaseMigration
 {
     public function up(): void
     {

modules/WebSub/Database/Migrations/2022-03-07-181500_add_is_published_on_hubs_to_episodes.php

@@ -10,9 +10,9 @@ declare(strict_types=1);
 
 namespace Modules\WebSub\Database\Migrations;
 
-use CodeIgniter\Database\Migration;
+use App\Database\Migrations\BaseMigration;
 
-class AddIsPublishedOnHubsToEpisodes extends Migration
+class AddIsPublishedOnHubsToEpisodes extends BaseMigration
 {
     public function up(): void
     {

phpstan.neon

@@ -27,7 +27,4 @@ parameters:
         - ENVIRONMENT
         - SODIUM_LIBRARY_VERSION
     ignoreErrors:
-        - '#Cannot access property [\$a-z_]+ on ((array\|)?object)#'
-        - '#^Call to an undefined method CodeIgniter\\Database\\ConnectionInterface#'
         - '#^Access to an undefined property Modules\\Media\\Entities\\Image#'
-        - '#^Call to an undefined method CodeIgniter\\HTTP\\RequestInterface#'

tests/database/ExampleDatabaseTest.php

@@ -36,6 +36,11 @@ class ExampleDatabaseTest extends CIUnitTestCase
         $this->setPrivateProperty($model, 'tempUseSoftDeletes', true);
 
         $object = $model->first();
+
+        if (! is_object($object)) {
+            return;
+        }
+
         $model->delete($object->id);
 
         // The model should no longer find it