Compare revisions

00870cef · 00870cef · 00870cef · 00870cef · 00870cef · 00870cef
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -18,9 +18,9 @@ Javascript dependencies can be found in the [package.json](./package.json) file.
  ([Open Font License](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL))
 - [RemixIcon](https://remixicon.com/)
  ([Apache License 2.0](https://github.com/Remix-Design/RemixIcon/blob/master/License))
- [OPAWG/User agent list](https://github.com/opawg/user-agents)
+- [OPAWG/User agent list](https://github.com/opawg/user-agents-v2)
  ([by Open Podcast Analytics Working Group](https://github.com/opawg))
-  ([MIT license](https://github.com/opawg/user-agents/blob/master/LICENSE))
+  ([MIT license](https://github.com/opawg/user-agents-v2/blob/master/LICENSE))
 - [OPAWG/podcast-rss-useragents](https://github.com/opawg/podcast-rss-useragents)
  ([by Open Podcast Analytics Working Group](https://github.com/opawg))
  ([MIT license](https://github.com/opawg/podcast-rss-useragents/blob/master/LICENSE))

--- a/README.md
+++ b/README.md
 <div align="center">
  <h1>
    <a href="https://castopod.org/">
-      <img src="https://docs.castopod.org/images/castopod-logo-inline.svg" alt="Castopod" height="64px" />
+      <img src="./docs/src/assets/castopod-logo-inline.svg" alt="Castopod" height="64px" />
    </a>
  </h1>
 </div>
@@ -31,12 +31,9 @@ please contact us directly by email at
 Contributions are always welcome!
-See the
+See the [contribution guidelines](./CONTRIBUTING.md) for ways to get started.
-[contribution guidelines](https://docs.castopod.org/contributing/guidelines) for
-ways to get started.
-> **Note**
+> [!Important]  
->
 > **Any** contribution made on a repository other than
 > [the original repository](https://code.castopod.org/adaures/castopod) will not
 > be accepted.
@@ -52,7 +49,7 @@ Thanks goes to these wonderful people
 <table>
  <tbody>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yassinedoghri"><img src="https://code.castopod.org/uploads/-/system/user/avatar/3/avatar.png?s=100" width="100px;" alt="Yassine Doghri"/><br /><sub><b>Yassine Doghri</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a> <a href="https://code.castopod.org/adaures/castopod/issues?author_username=yassinedoghri" title="Bug reports">🐛</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Documentation">📖</a> <a href="https://code.castopod.org/adaures/castopod/merge_requests?scope=all&state=all&approver_usernames[]=yassinedoghri" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-yassinedoghri" title="Maintenance">🚧</a> <a href="#content-yassinedoghri" title="Content">🖋</a> <a href="#design-yassinedoghri" title="Design">🎨</a> <a href="#a11y-yassinedoghri" title="Accessibility">️️️️♿️</a> <a href="https://translate.castopod.org" title="Translation">🌍</a> <a href="#question-yassinedoghri" title="Answering Questions">💬</a> <a href="#mentoring-yassinedoghri" title="Mentoring">🧑‍🏫</a> <a href="#infra-yassinedoghri" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-yassinedoghri" title="Ideas, Planning, & Feedback">🤔</a> <a href="#projectManagement-yassinedoghri" title="Project Management">📆</a> <a href="https://blog.castopod.org/author/yassinedoghri/" title="Blogposts">📝</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://yassinedoghri.com"><img src="https://avatars.githubusercontent.com/u/11021441?v=4?s=100" width="100px;" alt="Yassine Doghri"/><br /><sub><b>Yassine Doghri</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a> <a href="https://code.castopod.org/adaures/castopod/issues?author_username=yassinedoghri" title="Bug reports">🐛</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Documentation">📖</a> <a href="https://code.castopod.org/adaures/castopod/merge_requests?scope=all&state=all&approver_usernames[]=yassinedoghri" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-yassinedoghri" title="Maintenance">🚧</a> <a href="#content-yassinedoghri" title="Content">🖋</a> <a href="#design-yassinedoghri" title="Design">🎨</a> <a href="#a11y-yassinedoghri" title="Accessibility">️️️️♿️</a> <a href="https://translate.castopod.org" title="Translation">🌍</a> <a href="#question-yassinedoghri" title="Answering Questions">💬</a> <a href="#mentoring-yassinedoghri" title="Mentoring">🧑‍🏫</a> <a href="#infra-yassinedoghri" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-yassinedoghri" title="Ideas, Planning, & Feedback">🤔</a> <a href="#projectManagement-yassinedoghri" title="Project Management">📆</a> <a href="https://blog.castopod.org/author/yassinedoghri/" title="Blogposts">📝</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://code.castopod.org/benjamin"><img src="https://code.castopod.org/uploads/-/system/user/avatar/2/avatar.png?s=100" width="100px;" alt="Benjamin Bellamy"/><br /><sub><b>Benjamin Bellamy</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a> <a href="https://code.castopod.org/adaures/castopod/issues?author_username=benjamin" title="Bug reports">🐛</a> <a href="https://code.castopod.org/adaures/castopod/merge_requests?scope=all&state=all&approver_usernames[]=benjamin" title="Reviewed Pull Requests">👀</a> <a href="#content-benjamin" title="Content">🖋</a> <a href="https://translate.castopod.org" title="Translation">🌍</a> <a href="#question-benjamin" title="Answering Questions">💬</a> <a href="#infra-benjamin" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#ideas-benjamin" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://blog.castopod.org/author/benjamin-bellamy/" title="Blogposts">📝</a> <a href="#projectManagement-benjamin" title="Project Management">📆</a> <a href="#talk-benjamin" title="Talks">📢</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ola-hn"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="Ola Hneini"/><br /><sub><b>Ola Hneini</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a> <a href="https://code.castopod.org/adaures/castopod/merge_requests?scope=all&state=all&approver_usernames[]=ola" title="Reviewed Pull Requests">👀</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Documentation">📖</a> <a href="#maintenance-ola" title="Maintenance">🚧</a> <a href="#question-ola" title="Answering Questions">💬</a> <a href="#ideas-ola" title="Ideas, Planning, & Feedback">🤔</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://mamot.fr/@rdelaage"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="Romain de Laage"/><br /><sub><b>Romain de Laage</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a> <a href="#infra-rdelaage" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Documentation">📖</a> <a href="https://translate.castopod.org" title="Translation">🌍</a> <a href="#ideas-rdelaage" title="Ideas, Planning, & Feedback">🤔</a></td>
@@ -106,17 +103,18 @@ Thanks goes to these wonderful people
      <td align="center" valign="top" width="14.28%"><a href="https://twitter.com/caos30"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="Sergi"/><br /><sub><b>Sergi</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
    </tr>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/xosem"><img src="https://crowdin-static.downloads.crowdin.com/avatar/12617257/large/a201650da44fed28890b0e0d8477a663.jpg?s=100" width="100px;" alt="ghose (XoseM)"/><br /><sub><b>ghose (XoseM)</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/basen1982"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="Andreas Olsson"/><br /><sub><b>Andreas Olsson</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/leonfrom"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="leonfrom"/><br /><sub><b>leonfrom</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/agentcobra57"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="agentcobra"/><br /><sub><b>agentcobra</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/alephoto85"><img src="https://crowdin-static.downloads.crowdin.com/avatar/15094649/large/530391f54157af52ae33058ec15b0f99.jpg?s=100" width="100px;" alt="Alessandro"/><br /><sub><b>Alessandro</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://crowdin.com/profile/liimee"><img src="https://castopod.org/assets/images/castopod-avatar.jpg?s=100" width="100px;" alt="liimee"/><br /><sub><b>liimee</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ahmedsabouni"><img src="https://avatars.githubusercontent.com/u/74497842?v=4?s=100" width="100px;" alt="Ahmed Sabouni"/><br /><sub><b>Ahmed Sabouni</b></sub></a><br /><a href="https://translate.castopod.org" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KrzysztofDomanczyk"><img src="https://avatars.githubusercontent.com/u/75178474?v=4?s=100" width="100px;" alt="KrzysztofDomanczyk"/><br /><sub><b>KrzysztofDomanczyk</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a></td>
    </tr>
    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KrzysztofDomanczyk"><img src="https://avatars.githubusercontent.com/u/75178474?v=4?s=100" width="100px;" alt="KrzysztofDomanczyk"/><br /><sub><b>KrzysztofDomanczyk</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Dwev"><img src="https://avatars.githubusercontent.com/u/46626050?v=4?s=100" width="100px;" alt="Guy Martin"/><br /><sub><b>Guy Martin</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/issues?author_username=Dwev" title="Bug reports">🐛</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://code.castopod.org/NeoluxConsulting"><img src="https://secure.gravatar.com/avatar/6e745565356330c1e29a85d52bffdaa1?s=80&d=identicon?s=100" width="100px;" alt="Guy Martin"/><br /><sub><b>Guy Martin</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/issues?author_username=NeoluxConsulting" title="Bug reports">🐛</a> <a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/prcutler"><img src="https://avatars.githubusercontent.com/u/67276?v=4?s=100" width="100px;" alt="Paul Cutler"/><br /><sub><b>Paul Cutler</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Documentation">📖</a> <a href="#question-prcutler" title="Answering Questions">💬</a> <a href="#ideas-prcutler" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/nateritter"><img src="https://avatars.githubusercontent.com/u/198798?v=4?s=100" width="100px;" alt="Nate Ritter"/><br /><sub><b>Nate Ritter</b></sub></a><br /><a href="https://code.castopod.org/adaures/castopod/commits/master" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -157,10 +155,10 @@ backers. If you'd like to help, please consider
  <tbody>
    <tr>
      <td align="center">
-        <a href="https://docs.castopod.org/images/sponsors/adaures.svg" target="_blank" rel="noopener noreferrer"><img height="48" src="https://docs.castopod.org/images/sponsors/adaures.svg" alt="Netlify" /></a>
+        <a href="https://docs.castopod.org/images/sponsors/adaures.svg" target="_blank" rel="noopener noreferrer"><img height="48" src="./docs/src/assets/images/sponsors/adaures.svg" alt="Ad Aures" /></a>
      </td>
      <td align="center">
-        <a href="https://nlnet.nl/project/Castopod/" target="_blank" rel="noopener noreferrer"><img src="https://docs.castopod.org/images/sponsors/nlnet.svg" alt="NLnet Logo" height="48" /></a>
+        <a href="https://nlnet.nl/project/Castopod/" target="_blank" rel="noopener noreferrer"><img src="./docs/src/assets/images/sponsors/nlnet.svg" alt="NLnet Logo" height="48" /></a>
      </td>
    </tr>
  </tbody>

--- a/app/.htaccess
+++ b/app/.htaccess
-<IfModule authz_core_module>
+<IfModule authz_core_module> Require all denied </IfModule>
-    Require all denied
+<IfModule !authz_core_module> Deny from all </IfModule>
-</IfModule>
-<IfModule !authz_core_module>
-    Deny from all
-</IfModule>
--- a/app/Commands/EpisodesComputeDownloads.php
+++ b/app/Commands/EpisodesComputeDownloads.php
+<?php
+declare(strict_types=1);
+namespace App\Commands;
+use App\Models\EpisodeModel;
+use CodeIgniter\CLI\BaseCommand;
+class EpisodesComputeDownloads extends BaseCommand
+{
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Episodes';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'episodes:compute-downloads';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = "Calculates all episodes downloads and stores results in episodes' downloads_count field.";
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params): void
+    {
+        $episodesModel = new EpisodeModel();
+        $query = $episodesModel->builder()
+            ->select('episodes.id as id, IFNULL(SUM(ape.hits),0) as downloads_count')
+            ->join('analytics_podcasts_by_episode ape', 'episodes.id=ape.episode_id', 'left')
+            ->groupBy('episodes.id');
+        $episodeModel2 = new EpisodeModel();
+        $episodeModel2->builder()
+            ->setQueryAsData($query)
+            ->onConstraint('id')
+            ->updateBatch();
+    }
+}
--- a/app/Common.php
+++ b/app/Common.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);
-use Config\View;
 use ViewThemes\Theme;
 /**
@@ -37,7 +36,8 @@ if (! function_exists('view')) {
        /** @var CodeIgniter\View\View $renderer */
        $renderer = single_service('renderer', $path);
-        $saveData = config(View::class)->saveData;
+        $saveData = config('View')
+            ->saveData;
        if (array_key_exists('saveData', $options)) {
            $saveData = (bool) $options['saveData'];

--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Config;
 use CodeIgniter\Config\BaseConfig;
+use Override;
 class App extends BaseConfig
 {
@@ -16,7 +17,7 @@ class App extends BaseConfig
     * URL to your CodeIgniter root. Typically, this will be your base URL,
     * WITH a trailing slash:
     *
-     *    http://example.com/
+     * E.g., http://example.com/
     */
    public string $baseURL = 'http://localhost:8080/';
@@ -24,10 +25,10 @@ class App extends BaseConfig
     * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
     * If you want to accept multiple Hostnames, set this.
     *
-     * E.g. When your site URL ($baseURL) is 'http://example.com/', and your site
+     * E.g.,
-     *      also accepts 'http://media.example.com/' and
+     * When your site URL ($baseURL) is 'http://example.com/', and your site
-     *      'http://accounts.example.com/':
+     * also accepts 'http://media.example.com/' and 'http://accounts.example.com/':
-     *          ['media.example.com', 'accounts.example.com']
+     *     ['media.example.com', 'accounts.example.com']
     *
     * @var list<string>
     */
@@ -38,9 +39,9 @@ class App extends BaseConfig
     * Index File
     * --------------------------------------------------------------------------
     *
-     * Typically this will be your index.php file, unless you've renamed it to
+     * Typically, this will be your `index.php` file, unless you've renamed it to
-     * something else. If you are using mod_rewrite to remove the page set this
+     * something else. If you have configured your web server to remove this file
-     * variable so that it is blank.
+     * from your site URIs, set this variable to an empty string.
     */
    public string $indexPage = '';
@@ -50,17 +51,41 @@ class App extends BaseConfig
     * --------------------------------------------------------------------------
     *
     * This item determines which server global should be used to retrieve the
-     * URI string.  The default setting of 'REQUEST_URI' works for most servers.
+     * URI string. The default setting of 'REQUEST_URI' works for most servers.
     * If your links do not seem to work, try one of the other delicious flavors:
     *
-     * 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+     *  'REQUEST_URI': Uses $_SERVER['REQUEST_URI']
-     * 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+     * 'QUERY_STRING': Uses $_SERVER['QUERY_STRING']
-     * 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+     *    'PATH_INFO': Uses $_SERVER['PATH_INFO']
     *
     * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
     */
    public string $uriProtocol = 'REQUEST_URI';
+    /*
+    *--------------------------------------------------------------------------
+    * Allowed URL Characters
+    *--------------------------------------------------------------------------
+    *
+    * This lets you specify which characters are permitted within your URLs.
+    * When someone tries to submit a URL with disallowed characters they will
+    * get a warning message.
+    *
+    * As a security measure you are STRONGLY encouraged to restrict URLs to
+    * as few characters as possible.
+    *
+    * By default, only these are allowed: `a-z 0-9~%.:_-`
+    *
+    * Set an empty string to allow all characters -- but only if you are insane.
+    *
+    * The configured value is actually a regular expression character group
+    * and it will be used as: '/\A[<permittedURIChars>]+\z/iu'
+    *
+    * DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+    *
+    */
+    public string $permittedURIChars = 'a-z 0-9~%.:_\-@';
    /**
     * --------------------------------------------------------------------------
     * Default Locale
@@ -96,9 +121,21 @@ class App extends BaseConfig
     *
     * IncomingRequest::setLocale() also uses this list.
     *
-     * @var string[]
+     * @var list<string>
     */
-    public array $supportedLocales = ['en', 'fr', 'pl', 'de', 'pt-BR', 'nn-NO', 'es', 'zh-Hans', 'ca'];
+    public array $supportedLocales = [
+        'en',
+        'fr',
+        'pl',
+        'de',
+        'pt-br',
+        'nn-no',
+        'es',
+        'zh-hans',
+        'ca',
+        'br',
+        'sr-latn',
+    ];
    /**
     * --------------------------------------------------------------------------
@@ -108,7 +145,8 @@ class App extends BaseConfig
     * The default timezone that will be used in your application to display
     * dates with the date helper, and can be retrieved through app_timezone()
     *
-     * @see https://www.php.net/manual/en/timezones.php for list of timezones supported by PHP.
+     * @see https://www.php.net/manual/en/timezones.php for list of timezones
+     *      supported by PHP.
     */
    public string $appTimezone = 'UTC';
@@ -132,7 +170,7 @@ class App extends BaseConfig
     * If true, this will force every request made to this application to be
     * made via a secure connection (HTTPS). If the incoming request is not
     * secure, the user will be redirected to a secure version of the page
-     * and the HTTP Strict Transport Security header will be set.
+     * and the HTTP Strict Transport Security (HSTS) header will be set.
     */
    public bool $forceGlobalSecureRequests = true;
@@ -155,9 +193,9 @@ class App extends BaseConfig
     *         '192.168.5.0/24' => 'X-Real-IP',
     *     ]
     *
-     * @var array<string, string>
+     * @var array<string, string>|string
     */
-    public array $proxyIPs = [];
+    public $proxyIPs = [];
    /**
     * --------------------------------------------------------------------------
@@ -212,4 +250,37 @@ class App extends BaseConfig
    public ?int $bandwidthLimit = null;
    public ?string $legalNoticeURL = null;
+    /**
+     * AuthToken Config Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        if (is_string($this->proxyIPs)) {
+            $array = json_decode($this->proxyIPs, true);
+            if (is_array($array)) {
+                $this->proxyIPs = $array;
+            }
+        }
+    }
+    /**
+     * Override parent initEnvValue() to allow for direct setting to array properties values from ENV
+     *
+     * In order to set array properties via ENV vars we need to set the property to a string value first.
+     *
+     * @param mixed $property
+     */
+    #[Override]
+    protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix): void
+    {
+        // if attempting to set property from ENV, first set to empty string
+        if ($name === 'proxyIPs' && $this->getEnvValue($name, $prefix, $shortPrefix) !== null) {
+            $property = '';
+        }
+        parent::initEnvValue($property, $name, $prefix, $shortPrefix);
+    }
 }
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -29,23 +29,17 @@ class Autoload extends AutoloadConfig
     * their location on the file system. These are used by the autoloader
     * to locate files the first time they have been instantiated.
     *
-     * The '/app' and '/system' directories are already mapped for you.
+     * The 'Config' (APPPATH . 'Config') and 'CodeIgniter' (SYSTEMPATH) are
-     * you may change the name of the 'App' namespace if you wish,
+     * already mapped for you.
+     *
+     * You may change the name of the 'App' namespace if you wish,
     * but this should be done prior to creating any namespaced classes,
     * else you will need to modify all of those classes for this to work.
     *
-     * Prototype:
-     *
-     *   $psr4 = [
-     *       'CodeIgniter' => SYSTEMPATH,
-     *       'App'	       => APPPATH
-     *   ];
-     *
     * @var array<string, list<string>|string>
     */
    public $psr4 = [
        APP_NAMESPACE             => APPPATH,
-        'Config'                  => APPPATH . 'Config/',
        'Modules'                 => ROOTPATH . 'modules/',
        'Modules\Admin'           => ROOTPATH . 'modules/Admin/',
        'Modules\Analytics'       => ROOTPATH . 'modules/Analytics/',
@@ -55,6 +49,8 @@ class Autoload extends AutoloadConfig
        'Modules\Install'         => ROOTPATH . 'modules/Install/',
        'Modules\Media'           => ROOTPATH . 'modules/Media/',
        'Modules\MediaClipper'    => ROOTPATH . 'modules/MediaClipper/',
+        'Modules\Platforms'       => ROOTPATH . 'modules/Platforms/',
+        'Modules\Plugins'         => ROOTPATH . 'modules/Plugins/',
        'Modules\PodcastImport'   => ROOTPATH . 'modules/PodcastImport/',
        'Modules\PremiumPodcasts' => ROOTPATH . 'modules/PremiumPodcasts/',
        'Modules\Update'          => ROOTPATH . 'modules/Update/',
@@ -62,12 +58,10 @@ class Autoload extends AutoloadConfig
        'Themes'                  => ROOTPATH . 'themes',
        'ViewComponents'          => APPPATH . 'Libraries/ViewComponents/',
        'ViewThemes'              => APPPATH . 'Libraries/ViewThemes/',
-        'Vite'                    => APPPATH . 'Libraries/Vite/',
    ];
    /**
     * -------------------------------------------------------------------
-     * Class Map
     * -------------------------------------------------------------------
     * The class map provides a map of class names and their exact
     * location on the drive. Classes loaded in this manner will have
@@ -101,7 +95,7 @@ class Autoload extends AutoloadConfig
     *
     * @var list<string>
     */
-    public $files = [APPPATH . 'Libraries/ViewComponents/Helpers/view_components_helper.php'];
+    public $files = [];
    /**
     * -------------------------------------------------------------------
@@ -114,5 +108,5 @@ class Autoload extends AutoloadConfig
     *
     * @var list<string>
     */
-    public $helpers = ['auth', 'setting'];
+    public $helpers = ['auth', 'setting', 'plugins'];
 }
--- a/app/Config/Boot/production.php
+++ b/app/Config/Boot/production.php
@@ -11,8 +11,10 @@ declare(strict_types=1);
 *
 * If you set 'display_errors' to '1', CI4's detailed error report will show.
 */
+error_reporting(E_ALL & ~E_DEPRECATED);
+// If you want to suppress more types of errors.
+// error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 ini_set('display_errors', '0');
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 /**
 * --------------------------------------------------------------------------

--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -36,37 +36,6 @@ class Cache extends BaseConfig
     */
    public string $backupHandler = 'dummy';
-    /**
-     * --------------------------------------------------------------------------
-     * Cache Directory Path
-     * --------------------------------------------------------------------------
-     *
-     * The path to where cache files should be stored, if using a file-based
-     * system.
-     *
-     * @deprecated Use the driver-specific variant under $file
-     */
-    public string $storePath = WRITEPATH . 'cache/';
-    /**
-     * --------------------------------------------------------------------------
-     * Cache Include Query String
-     * --------------------------------------------------------------------------
-     *
-     * Whether to take the URL query string into consideration when generating
-     * output cache files. Valid options are:
-     *
-     *    false = Disabled
-     *    true  = Enabled, take all query parameters into account.
-     *            Please be aware that this may result in numerous cache
-     *            files generated for the same page over and over again.
-     *    ['q'] = Enabled, but only take into account the specified list
-     *                 of query parameters.
-     *
-     * @var boolean|string[]
-     */
-    public bool | array $cacheQueryString = false;
    /**
     * --------------------------------------------------------------------------
     * Key Prefix
@@ -107,6 +76,7 @@ class Cache extends BaseConfig
     * --------------------------------------------------------------------------
     * File settings
     * --------------------------------------------------------------------------
+     *
     * Your file storage preferences can be specified below, if you are using
     * the File driver.
     *
@@ -121,6 +91,7 @@ class Cache extends BaseConfig
     * -------------------------------------------------------------------------
     * Memcached settings
     * -------------------------------------------------------------------------
+     *
     * Your Memcached servers can be specified below, if you are using
     * the Memcached drivers.
     *
@@ -170,4 +141,23 @@ class Cache extends BaseConfig
        'redis'     => RedisHandler::class,
        'wincache'  => WincacheHandler::class,
    ];
+    /**
+     * --------------------------------------------------------------------------
+     * Web Page Caching: Cache Include Query String
+     * --------------------------------------------------------------------------
+     *
+     * Whether to take the URL query string into consideration when generating
+     * output cache files. Valid options are:
+     *
+     *    false = Disabled
+     *    true  = Enabled, take all query parameters into account.
+     *            Please be aware that this may result in numerous cache
+     *            files generated for the same page over and over again.
+     *    ['q'] = Enabled, but only take into account the specified list
+     *            of query parameters.
+     *
+     * @var bool|list<string>
+     */
+    public $cacheQueryString = false;
 }
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 |
 | NOTE: this constant is updated upon release with Continuous Integration.
 */
-defined('CP_VERSION') || define('CP_VERSION', '1.9.0');
+defined('CP_VERSION') || define('CP_VERSION', '2.0.0-next.3');
 /*
 | --------------------------------------------------------------------
@@ -24,10 +24,23 @@ defined('CP_VERSION') || define('CP_VERSION', '1.9.0');
 | classes should use.
 |
 | NOTE: changing this will require manually modifying the
- | existing namespaces of App\* namespaced-classes.
+ | existing namespaces of App* namespaced-classes.
 */
 defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
+/*
+ | --------------------------------------------------------------------
+ | Plugins Path
+ | --------------------------------------------------------------------
+ |
+ | This defines the folder in which plugins will live.
+ */
+defined('PLUGINS_PATH') ||
+    define('PLUGINS_PATH', ROOTPATH . 'plugins' . DIRECTORY_SEPARATOR);
+defined('PLUGINS_KEY_PATTERN') ||
+    define('PLUGINS_KEY_PATTERN', '[a-z0-9]([_.-]?[a-z0-9]+)*\/[a-z0-9]([_.-]?[a-z0-9]+)*');
 /*
 | --------------------------------------------------------------------------
 | Composer Path
@@ -91,18 +104,3 @@ defined('EXIT_USER_INPUT') || define('EXIT_USER_INPUT', 7); // invalid user inpu
 defined('EXIT_DATABASE') || define('EXIT_DATABASE', 8); // database error
 defined('EXIT__AUTO_MIN') || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
 defined('EXIT__AUTO_MAX') || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
- */
-define('EVENT_PRIORITY_LOW', 200);
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
- */
-define('EVENT_PRIORITY_NORMAL', 100);
-/**
- * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
- */
-define('EVENT_PRIORITY_HIGH', 10);
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -35,28 +35,28 @@ class ContentSecurityPolicy extends BaseConfig
    /**
     * Will default to self if not overridden
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $defaultSrc = null;
    /**
     * Lists allowed scripts' URLs.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $scriptSrc = 'self';
    /**
     * Lists allowed stylesheets' URLs.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $styleSrc = 'self';
    /**
     * Defines the origins from which images can be loaded.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $imageSrc = 'self';
@@ -65,35 +65,35 @@ class ContentSecurityPolicy extends BaseConfig
     *
     * Will default to self if not overridden
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $baseURI = null;
    /**
     * Lists the URLs for workers and embedded frame contents
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $childSrc = 'self';
    /**
     * Limits the origins that you can connect to (via XHR, WebSockets, and EventSource).
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $connectSrc = 'self';
    /**
     * Specifies the origins that can serve web fonts.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $fontSrc;
    /**
     * Lists valid endpoints for submission from `<form>` tags.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $formAction = 'self';
@@ -102,47 +102,47 @@ class ContentSecurityPolicy extends BaseConfig
     * `<embed>`, and `<applet>` tags. This directive can't be used in `<meta>` tags and applies only to non-HTML
     * resources.
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $frameAncestors = null;
    /**
     * The frame-src directive restricts the URLs which may be loaded into nested browsing contexts.
     *
-     * @var string[]|string|null
+     * @var list<string>|string|null
     */
    public string | array | null $frameSrc = null;
    /**
     * Restricts the origins allowed to deliver video and audio.
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $mediaSrc = null;
    /**
     * Allows control over Flash and other plugins.
     *
-     * @var string|string[]
+     * @var list<string>|string
     */
    public string | array $objectSrc = 'self';
    /**
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $manifestSrc = null;
    /**
     * Limits the kinds of plugins a page may invoke.
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $pluginTypes = null;
    /**
     * List of actions allowed.
     *
-     * @var string|string[]|null
+     * @var list<string>|string|null
     */
    public string | array | null $sandbox = null;

--- a/app/Config/Cors.php
+++ b/app/Config/Cors.php
+<?php
+declare(strict_types=1);
+namespace Config;
+use CodeIgniter\Config\BaseConfig;
+/**
+ * Cross-Origin Resource Sharing (CORS) Configuration
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+ */
+class Cors extends BaseConfig
+{
+    /**
+     * The default CORS configuration.
+     *
+     * @var array{
+     *      allowedOrigins: list<string>,
+     *      allowedOriginsPatterns: list<string>,
+     *      supportsCredentials: bool,
+     *      allowedHeaders: list<string>,
+     *      exposedHeaders: list<string>,
+     *      allowedMethods: list<string>,
+     *      maxAge: int,
+     *  }
+     */
+    public array $default = [
+        /**
+         * Origins for the `Access-Control-Allow-Origin` header.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
+         *
+         * E.g.:
+         *   - ['http://localhost:8080']
+         *   - ['https://www.example.com']
+         */
+        'allowedOrigins' => [],
+        /**
+         * Origin regex patterns for the `Access-Control-Allow-Origin` header.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
+         *
+         * NOTE: A pattern specified here is part of a regular expression. It will
+         *       be actually `#\A<pattern>\z#`.
+         *
+         * E.g.:
+         *   - ['https://\w+\.example\.com']
+         */
+        'allowedOriginsPatterns' => [],
+        /**
+         * Weather to send the `Access-Control-Allow-Credentials` header.
+         *
+         * The Access-Control-Allow-Credentials response header tells browsers whether
+         * the server allows cross-origin HTTP requests to include credentials.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
+         */
+        'supportsCredentials' => false,
+        /**
+         * Set headers to allow.
+         *
+         * The Access-Control-Allow-Headers response header is used in response to
+         * a preflight request which includes the Access-Control-Request-Headers to
+         * indicate which HTTP headers can be used during the actual request.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
+         */
+        'allowedHeaders' => [],
+        /**
+         * Set headers to expose.
+         *
+         * The Access-Control-Expose-Headers response header allows a server to
+         * indicate which response headers should be made available to scripts running
+         * in the browser, in response to a cross-origin request.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
+         */
+        'exposedHeaders' => [],
+        /**
+         * Set methods to allow.
+         *
+         * The Access-Control-Allow-Methods response header specifies one or more
+         * methods allowed when accessing a resource in response to a preflight
+         * request.
+         *
+         * E.g.:
+         *   - ['GET', 'POST', 'PUT', 'DELETE']
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
+         */
+        'allowedMethods' => [],
+        /**
+         * Set how many seconds the results of a preflight request can be cached.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
+         */
+        'maxAge' => 7200,
+    ];
+}
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -45,6 +45,12 @@ class Database extends Config
        'failover'     => [],
        'port'         => 3306,
        'numberNative' => false,
+        'foundRows'    => false,
+        'dateFormat'   => [
+            'date'     => 'Y-m-d',
+            'datetime' => 'Y-m-d H:i:s',
+            'time'     => 'H:i:s',
+        ],
    ];
    /**
@@ -64,7 +70,7 @@ class Database extends Config
        'pConnect'    => false,
        'DBDebug'     => true,
        'charset'     => 'utf8',
-        'DBCollat'    => 'utf8_general_ci',
+        'DBCollat'    => '',
        'swapPre'     => '',
        'encrypt'     => false,
        'compress'    => false,
@@ -73,6 +79,11 @@ class Database extends Config
        'port'        => 3306,
        'foreignKeys' => true,
        'busyTimeout' => 1000,
+        'dateFormat'  => [
+            'date'     => 'Y-m-d',
+            'datetime' => 'Y-m-d H:i:s',
+            'time'     => 'H:i:s',
+        ],
    ];
    //--------------------------------------------------------------------

--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -50,11 +50,12 @@ Events::on('pre_system', static function (): void {
     */
    if (CI_DEBUG && ! is_cli()) {
        Events::on('DBQuery', Database::class . '::collect');
-        Services::toolbar()->respond();
+        service('toolbar')
+            ->respond();
        // Hot Reload route - for framework use on the hot reloader.
        if (ENVIRONMENT === 'development') {
-            Services::routes()->get('__hot-reload', static function (): void {
+            service('routes')->get('__hot-reload', static function (): void {
                (new HotReloader())->run();
            });
        }

--- a/app/Config/Exceptions.php
+++ b/app/Config/Exceptions.php
@@ -33,7 +33,7 @@ class Exceptions extends BaseConfig
     * Any status codes here will NOT be logged if logging is turned on.
     * By default, only 404 (Page Not Found) exceptions are ignored.
     *
-     * @var int[]
+     * @var list<int>
     */
    public array $ignoreCodes = [404];
@@ -56,18 +56,16 @@ class Exceptions extends BaseConfig
     * In order to specify 2 levels, use "/" to separate.
     * ex. ['server', 'setup/password', 'secret_token']
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $sensitiveDataInTrace = [];
    /**
     * --------------------------------------------------------------------------
-     * LOG DEPRECATIONS INSTEAD OF THROWING?
+     * WHETHER TO THROW AN EXCEPTION ON DEPRECATED ERRORS
     * --------------------------------------------------------------------------
-     * By default, CodeIgniter converts deprecations into exceptions. Also,
+     * If set to `true`, DEPRECATED errors are only logged and no exceptions are
-     * starting in PHP 8.1 will cause a lot of deprecated usage warnings.
+     * thrown. This option also works for user deprecations.
-     * Use this option to temporarily cease the warnings and instead log those.
-     * This option also works for user deprecations.
     */
    public bool $logDeprecations = true;

--- a/app/Config/Feature.php
+++ b/app/Config/Feature.php
@@ -12,21 +12,28 @@ use CodeIgniter\Config\BaseConfig;
 class Feature extends BaseConfig
 {
    /**
-     * Enable multiple filters for a route or not.
+     * Use improved new auto routing instead of the legacy version.
+     */
+    public bool $autoRoutesImproved = true;
+    /**
+     * Use filter execution order in 4.4 or before.
+     */
+    public bool $oldFilterOrder = false;
+    /**
+     * The behavior of `limit(0)` in Query Builder.
     *
-     * If you enable this:
+     * If true, `limit(0)` returns all records. (the behavior of 4.4.x or before in version 4.x.)
-     *   - CodeIgniter\CodeIgniter::handleRequest() uses:
+     * If false, `limit(0)` returns no records. (the behavior of 3.1.9 or later in version 3.x.)
-     *     - CodeIgniter\Filters\Filters::enableFilters(), instead of enableFilter()
-     *   - CodeIgniter\CodeIgniter::tryToRouteIt() uses:
-     *     - CodeIgniter\Router\Router::getFilters(), instead of getFilter()
-     *   - CodeIgniter\Router\Router::handle() uses:
-     *     - property $filtersInfo, instead of $filterInfo
-     *     - CodeIgniter\Router\RouteCollection::getFiltersForRoute(), instead of getFilterForRoute()
     */
-    public bool $multipleFilters = false;
+    public bool $limitZeroAsAll = true;
    /**
-     * Use improved new auto routing instead of the default legacy version.
+     * Use strict location negotiation.
+     *
+     * By default, the locale is selected based on a loose comparison of the language code (ISO 639-1)
+     * Enabling strict comparison will also consider the region code (ISO 3166-1 alpha-2).
     */
-    public bool $autoRoutesImproved = false;
+    public bool $strictLocaleNegotiation = false;
 }
--- a/app/Config/Fediverse.php
+++ b/app/Config/Fediverse.php
@@ -34,15 +34,15 @@ class Fediverse extends FediverseBaseConfig
        try {
            $appTheme = service('settings')
                ->get('App.theme');
-            $defaultBanner = config(Images::class)
+            $defaultBanner = config('Images')
-                ->podcastBannerDefaultPaths[$appTheme] ?? config(Images::class)->podcastBannerDefaultPaths['default'];
+                ->podcastBannerDefaultPaths[$appTheme] ?? config('Images')->podcastBannerDefaultPaths['default'];
        } catch (Exception) {
-            $defaultBanner = config(Images::class)
+            $defaultBanner = config('Images')
                ->podcastBannerDefaultPaths['default'];
        }
        ['dirname' => $dirname, 'extension' => $extension, 'filename' => $filename] = pathinfo(
-            $defaultBanner['path']
+            $defaultBanner['path'],
        );
        $defaultBannerPath = $filename;
        if ($dirname !== '.') {

--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -8,8 +8,11 @@ use App\Filters\AllowCorsFilter;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Filters\CSRF;
 use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\ForceHTTPS;
 use CodeIgniter\Filters\Honeypot;
 use CodeIgniter\Filters\InvalidChars;
+use CodeIgniter\Filters\PageCache;
+use CodeIgniter\Filters\PerformanceMetrics;
 use CodeIgniter\Filters\SecureHeaders;
 use Modules\Auth\Filters\PermissionFilter;
@@ -18,8 +21,10 @@ class Filters extends BaseConfig
    /**
     * Configures aliases for Filter classes to make reading things nicer and simpler.
     *
-     * @var array<string, class-string|list<class-string>> [filter_name => classname]
+     * @var array<string, class-string|list<class-string>>
-     *                                                     or [filter_name => [classname1, classname2, ...]]
+     *
+     * [filter_name => classname]
+     * or [filter_name => [classname1, classname2, ...]]
     */
    public array $aliases = [
        'csrf'          => CSRF::class,
@@ -28,23 +33,55 @@ class Filters extends BaseConfig
        'invalidchars'  => InvalidChars::class,
        'secureheaders' => SecureHeaders::class,
        'allow-cors'    => AllowCorsFilter::class,
+        'cors'          => Cors::class,
+        'forcehttps'    => ForceHTTPS::class,
+        'pagecache'     => PageCache::class,
+        'performance'   => PerformanceMetrics::class,
+    ];
+    /**
+     * List of special required filters.
+     *
+     * The filters listed here are special. They are applied before and after
+     * other kinds of filters, and always applied even if a route does not exist.
+     *
+     * Filters set by default provide framework functionality. If removed,
+     * those functions will no longer work.
+     *
+     * @see https://codeigniter.com/user_guide/incoming/filters.html#provided-filters
+     *
+     * @var array{before: list<string>, after: list<string>}
+     */
+    public array $required = [
+        'before' => [
+            'forcehttps', // Force Global Secure Requests
+            'pagecache',  // Web Page Caching
+        ],
+        'after' => [
+            'pagecache',   // Web Page Caching
+            'performance', // Performance Metrics
+            'toolbar',     // Debug Toolbar
+        ],
    ];
    /**
     * List of filter aliases that are always applied before and after every request.
     *
-     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
+     * @var array<string, array<string, array<string, string|array<string>>>>|array<string, list<string>>
     */
    public array $globals = [
        'before' => [
            // 'honeypot',
            'csrf' => [
-                'except' => ['@[a-zA-Z0-9\_]{1,32}/inbox'],
+                'except' => [
+                    '@[a-zA-Z0-9\_]{1,32}/inbox',
+                    'api/rest/v1/episodes',
+                    'api/rest/v1/episodes/[0-9]+/publish',
+                ],
            ],
            // 'invalidchars',
        ],
        'after' => [
-            'toolbar',
            // 'honeypot',
            // 'secureheaders',
        ],
@@ -53,12 +90,12 @@ class Filters extends BaseConfig
    /**
     * List of filter aliases that works on a particular HTTP method (GET, POST, etc.).
     *
-     * Example: 'post' => ['foo', 'bar']
+     * Example: 'POST' => ['foo', 'bar']
     *
     * If you use this, you should disable auto-routing because auto-routing permits any HTTP method to access a
     * controller. Accessing the controller with a method you don’t expect could bypass the filter.
     *
-     * @var array<string, string[]>
+     * @var array<string, list<string>>
     */
    public array $methods = [];
@@ -67,7 +104,7 @@ class Filters extends BaseConfig
     *
     * Example: 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
     *
-     * @var array<string, array<string, string[]>>
+     * @var array<string, array<string, list<string>>>
     */
    public array $filters = [];

--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Config;
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
@@ -24,7 +23,7 @@ class Format extends BaseConfig
     * These formats are only checked when the data passed to the respond()
     * method is an array.
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $supportedResponseFormats = [
        'application/json',
@@ -64,16 +63,4 @@ class Format extends BaseConfig
        'application/xml'  => 0,
        'text/xml'         => 0,
    ];
-    //--------------------------------------------------------------------
-    /**
-     * A Factory method to return the appropriate formatter for the given mime type.
-     *
-     * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
-     */
-    public function getFormatter(string $mime): FormatterInterface
-    {
-        return Services::format()->getFormatter($mime);
-    }
 }
--- a/app/Config/Generators.php
+++ b/app/Config/Generators.php
@@ -25,11 +25,13 @@ class Generators extends BaseConfig
     *
     * YOU HAVE BEEN WARNED!
     *
-     * @var array<string, string>
+     * @var array<string, string|array<string,string>>
     */
    public array $views = [
-        'make:cell'         => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
+        'make:cell' => [
-        'make:cell_view'    => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
+            'class' => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
+            'view'  => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
+        ],
        'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
        'make:config'       => 'CodeIgniter\Commands\Generators\Views\config.tpl.php',
        'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
No results found