chore: change rector and ecs configs + update devcontainer to php 8.2

refs #457

.devcontainer/Dockerfile

@@ -4,7 +4,7 @@
 # ⚠️ NOT optimized for production
 # should be used only for development purposes
 #---------------------------------------------------
-FROM php:8.1-fpm
+FROM php:8.2-fpm
 
 LABEL maintainer="Yassine Doghri <yassine@doghri.fr>"
 

.gitignore

@@ -132,7 +132,6 @@ tmp/
 
 /results/
 /phpunit*.xml
-/.phpunit.*.cache
 
 # js package manager
 yarn.lock

app/.htaccess

@@ -1,6 +1,2 @@
-<IfModule authz_core_module>
-    Require all denied
-</IfModule>
-<IfModule !authz_core_module>
-    Deny from all
-</IfModule>
+<IfModule authz_core_module> Require all denied </IfModule>
+<IfModule !authz_core_module> Deny from all </IfModule>

app/Config/App.php

@@ -61,6 +61,30 @@ class App extends BaseConfig
      */
     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

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.
-     * you may change the name of the 'App' namespace if you wish,
+     * The 'Config' (APPPATH . 'Config') and 'CodeIgniter' (SYSTEMPATH) are
+     * 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,7 @@ 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\PodcastImport'   => ROOTPATH . 'modules/PodcastImport/',
         'Modules\PremiumPodcasts' => ROOTPATH . 'modules/PremiumPodcasts/',
         'Modules\Update'          => ROOTPATH . 'modules/Update/',
@@ -67,7 +62,6 @@ class Autoload extends AutoloadConfig
 
     /**
      * -------------------------------------------------------------------
-     * 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

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);
 
 /**
  * --------------------------------------------------------------------------

app/Config/Cache.php

@@ -48,25 +48,6 @@ class Cache extends BaseConfig
      */
     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
@@ -170,4 +151,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;
 }

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;
 

app/Config/Cors.php

@@ -0,0 +1,107 @@
+<?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,
+    ];
+}

app/Config/Database.php

@@ -45,6 +45,11 @@ class Database extends Config
         'failover'     => [],
         'port'         => 3306,
         'numberNative' => false,
+        'dateFormat'   => [
+            'date'     => 'Y-m-d',
+            'datetime' => 'Y-m-d H:i:s',
+            'time'     => 'H:i:s',
+        ],
     ];
 
     /**
@@ -64,7 +69,7 @@ class Database extends Config
         'pConnect'    => false,
         'DBDebug'     => true,
         'charset'     => 'utf8',
-        'DBCollat'    => 'utf8_general_ci',
+        'DBCollat'    => '',
         'swapPre'     => '',
         'encrypt'     => false,
         'compress'    => false,
@@ -73,6 +78,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',
+        ],
     ];
 
     //--------------------------------------------------------------------

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,7 +56,7 @@ 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 = [];
 

app/Config/Feature.php

@@ -11,22 +11,21 @@ use CodeIgniter\Config\BaseConfig;
  */
 class Feature extends BaseConfig
 {
-    /**
-     * Enable multiple filters for a route or not.
-     *
-     * If you enable this:
-     *   - CodeIgniter\CodeIgniter::handleRequest() uses:
-     *     - 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;
-
     /**
      * Use improved new auto routing instead of the default legacy version.
      */
     public bool $autoRoutesImproved = false;
+
+    /**
+     * Use filter execution order in 4.4 or before.
+     */
+    public bool $oldFilterOrder = false;
+
+    /**
+     * The behavior of `limit(0)` in Query Builder.
+     *
+     * If true, `limit(0)` returns all records. (the behavior of 4.4.x or before in version 4.x.)
+     * If false, `limit(0)` returns no records. (the behavior of 3.1.9 or later in version 3.x.)
+     */
+    public bool $limitZeroAsAll = true;
 }

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]
-     *                                                     or [filter_name => [classname1, classname2, ...]]
+     * @var array<string, class-string|list<class-string>>
+     *
+     * [filter_name => classname]
+     * or [filter_name => [classname1, classname2, ...]]
      */
     public array $aliases = [
         'csrf'          => CSRF::class,
@@ -28,12 +33,41 @@ 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' => [
@@ -44,7 +78,6 @@ class Filters extends BaseConfig
             // 'invalidchars',
         ],
         'after' => [
-            'toolbar',
             // 'honeypot',
             // 'secureheaders',
         ],
@@ -53,12 +86,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 +100,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 = [];
 

app/Config/Format.php

@@ -24,7 +24,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',

app/Config/Generators.php

@@ -28,8 +28,10 @@ class Generators extends BaseConfig
      * @var array<string, string>
      */
     public array $views = [
-        'make:cell'         => 'CodeIgniter\Commands\Generators\Views\cell.tpl.php',
-        'make:cell_view'    => 'CodeIgniter\Commands\Generators\Views\cell_view.tpl.php',
+        'make:cell' => [
+            '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',

app/Config/Kint.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Config;
 
-use CodeIgniter\Config\BaseConfig;
 use Kint\Parser\ConstructablePluginInterface;
 use Kint\Renderer\AbstractRenderer;
 use Kint\Renderer\Rich\TabPluginInterface;
@@ -20,7 +19,7 @@ use Kint\Renderer\Rich\ValuePluginInterface;
  *
  * @see https://kint-php.github.io/kint/ for details on these settings.
  */
-class Kint extends BaseConfig
+class Kint
 {
     /*
     |--------------------------------------------------------------------------

app/Config/Logger.php

@@ -38,7 +38,7 @@ class Logger extends BaseConfig
      * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
      * your log files will fill up very fast.
      *
-     * @var int|int[]
+     * @var int|list<int>
      */
     public int | array $threshold = (ENVIRONMENT === 'production') ? 4 : 9;
 
@@ -75,7 +75,7 @@ class Logger extends BaseConfig
      * Handlers are executed in the order defined in this array, starting with
      * the handler on top and continuing down.
      *
-     * @var array<string, mixed>
+     * @var array<class-string, array<string, int|list<string>|string>>
      */
     public array $handlers = [
         /*

app/Config/Mimes.php

@@ -22,7 +22,7 @@ class Mimes
     /**
      * Map of extensions to mime types.
      *
-     * @var array<string, string|string[]>
+     * @var array<string, list<string>|string>
      */
     public static $mimes = [
         'hqx' => [

app/Config/Optimize.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Config;
+
+/**
+ * Optimization Configuration.
+ *
+ * NOTE: This class does not extend BaseConfig for performance reasons.
+ *       So you cannot replace the property values with Environment Variables.
+ *
+ * @immutable
+ */
+class Optimize
+{
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/factories.html#config-caching
+     */
+    public bool $configCacheEnabled = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/autoloader.html#file-locator-caching
+     */
+    public bool $locatorCacheEnabled = false;
+}

app/Config/Routes.php

@@ -15,7 +15,6 @@ use CodeIgniter\Router\RouteCollection;
 $routes->addPlaceholder('podcastHandle', '[a-zA-Z0-9\_]{1,32}');
 $routes->addPlaceholder('slug', '[a-zA-Z0-9\-]{1,128}');
 $routes->addPlaceholder('base64', '[A-Za-z0-9\.\_]+\-{0,2}');
-$routes->addPlaceholder('platformType', '\bpodcasting|\bsocial|\bfunding');
 $routes->addPlaceholder('postAction', '\bfavourite|\breblog|\breply');
 $routes->addPlaceholder('embedTheme', '\blight|\bdark|\blight-transparent|\bdark-transparent');
 $routes->addPlaceholder(

app/Config/Routing.php

@@ -12,13 +12,14 @@ use CodeIgniter\Config\Routing as BaseRouting;
 class Routing extends BaseRouting
 {
     /**
+     * For Defined Routes.
      * An array of files that contain route definitions.
      * Route files are read in order, with the first match
      * found taking precedence.
      *
      * Default: APPPATH . 'Config/Routes.php'
      *
-     * @var string[]
+     * @var list<string>
      */
     public array $routeFiles = [
         APPPATH . 'Config/Routes.php',
@@ -28,11 +29,13 @@ class Routing extends BaseRouting
         ROOTPATH . 'modules/Auth/Config/Routes.php',
         ROOTPATH . 'modules/Fediverse/Config/Routes.php',
         ROOTPATH . 'modules/Install/Config/Routes.php',
+        ROOTPATH . 'modules/Platforms/Config/Routes.php',
         ROOTPATH . 'modules/PodcastImport/Config/Routes.php',
         ROOTPATH . 'modules/PremiumPodcasts/Config/Routes.php',
     ];
 
     /**
+     * For Defined Routes and Auto Routing.
      * The default namespace to use for Controllers when no other
      * namespace has been specified.
      *
@@ -41,6 +44,7 @@ class Routing extends BaseRouting
     public string $defaultNamespace = 'App\Controllers';
 
     /**
+     * For Auto Routing.
      * The default controller to use when no other controller has been
      * specified.
      *
@@ -49,6 +53,7 @@ class Routing extends BaseRouting
     public string $defaultController = 'HomeController';
 
     /**
+     * For Defined Routes and Auto Routing.
      * The default method to call on the controller when no other
      * method has been set in the route.
      *
@@ -57,7 +62,8 @@ class Routing extends BaseRouting
     public string $defaultMethod = 'index';
 
     /**
-     * Whether to translate dashes in URIs to underscores.
+     * For Auto Routing.
+     * Whether to translate dashes in URIs for controller/method to underscores.
      * Primarily useful when using the auto-routing.
      *
      * Default: false
@@ -93,6 +99,7 @@ class Routing extends BaseRouting
     public bool $autoRoute = false;
 
     /**
+     * For Defined Routes.
      * If TRUE, will enable the use of the 'prioritize' option
      * when defining routes.
      *
@@ -101,7 +108,16 @@ class Routing extends BaseRouting
     public bool $prioritize = false;
 
     /**
-     * Map of URI segments and namespaces. For Auto Routing (Improved).
+     * For Defined Routes.
+     * If TRUE, matched multiple URI segments will be passed as one parameter.
+     *
+     * Default: false
+     */
+    public bool $multipleSegmentsOneParam = false;
+
+    /**
+     * For Auto Routing (Improved).
+     * Map of URI segments and namespaces.
      *
      * The key is the first URI segment. The value is the controller namespace.
      * E.g.,
@@ -112,4 +128,15 @@ class Routing extends BaseRouting
      * @var array<string, string> [ uri_segment => namespace ]
      */
     public array $moduleRoutes = [];
+
+    /**
+     * For Auto Routing (Improved).
+     * Whether to translate dashes in URIs for controller/method to CamelCase.
+     * E.g., blog-controller -> BlogController
+     *
+     * If you enable this, $translateURIDashes is ignored.
+     *
+     * Default: false
+     */
+    public bool $translateUriToCamelCase = false;
 }

app/Config/Security.php

@@ -80,9 +80,9 @@ class Security extends BaseConfig
      * CSRF Redirect
      * --------------------------------------------------------------------------
      *
-     * Redirect to previous page with error on failure.
+     * @see https://codeigniter4.github.io/userguide/libraries/security.html#redirection-on-failure
      */
-    public bool $redirect = false;
+    public bool $redirect = (ENVIRONMENT === 'production');
 
     /**
      * --------------------------------------------------------------------------

app/Config/Services.php

@@ -37,8 +37,8 @@ class Services extends BaseService
             return static::getSharedInstance('router', $routes, $request);
         }
 
-        $routes = $routes ?? static::routes();
-        $request = $request ?? static::request();
+        $routes ??= static::routes();
+        $request ??= static::request();
 
         return new Router($routes, $request);
     }
@@ -53,7 +53,7 @@ class Services extends BaseService
             return static::getSharedInstance('negotiator', $request);
         }
 
-        $request = $request ?? static::request();
+        $request ??= static::request();
 
         return new Negotiate($request);
     }

app/Config/Session.php

@@ -101,4 +101,29 @@ class Session extends BaseConfig
      * DB Group for the database session.
      */
     public ?string $DBGroup = null;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Lock Retry Interval (microseconds)
+     * --------------------------------------------------------------------------
+     *
+     * This is used for RedisHandler.
+     *
+     * Time (microseconds) to wait if lock cannot be acquired.
+     * The default is 100,000 microseconds (= 0.1 seconds).
+     */
+    public int $lockRetryInterval = 100_000;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Lock Max Retries
+     * --------------------------------------------------------------------------
+     *
+     * This is used for RedisHandler.
+     *
+     * Maximum number of lock acquisition attempts.
+     * The default is 300 times. That is lock timeout is about 30 (0.1 * 300)
+     * seconds.
+     */
+    public int $lockMaxRetries = 300;
 }

app/Config/Toolbar.php

@@ -33,7 +33,7 @@ class Toolbar extends BaseConfig
      * List of toolbar collectors that will be called when Debug Toolbar
      * fires up and collects data from.
      *
-     * @var string[]
+     * @var list<class-string>
      */
     public array $collectors = [
         Timers::class,
@@ -51,7 +51,7 @@ class Toolbar extends BaseConfig
      * Collect Var Data
      * --------------------------------------------------------------------------
      *
-     * If set to false var data from the views will not be colleted. Useful to
+     * If set to false var data from the views will not be collected. Useful to
      * avoid high memory usage when there are lots of data passed to the view.
      */
     public bool $collectVarData = true;
@@ -102,7 +102,7 @@ class Toolbar extends BaseConfig
      *
      * NOTE: The ROOTPATH will be prepended to all values.
      *
-     * @var string[]
+     * @var list<string>
      */
     public array $watchedDirectories = ['app', 'modules', 'themes'];
 
@@ -114,7 +114,7 @@ class Toolbar extends BaseConfig
      * Contains an array of file extensions that will be watched for changes and
      * used to determine if the hot-reload feature should reload the page or not.
      *
-     * @var string[]
+     * @var list<string>
      */
     public array $watchedExtensions = ['php', 'css', 'js', 'html', 'svg', 'json', 'env'];
 }

app/Config/Validation.php

@@ -16,7 +16,7 @@ class Validation extends BaseConfig
     /**
      * Stores the classes that contain the rules that are available.
      *
-     * @var string[]
+     * @var list<string>
      */
     public array $ruleSets = [
         Rules::class,

app/Config/View.php

@@ -9,8 +9,8 @@ use CodeIgniter\View\ViewDecoratorInterface;
 use ViewComponents\Decorator;
 
 /**
- * @phpstan-type ParserCallable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  */
 class View extends BaseView
 {
@@ -31,8 +31,8 @@ class View extends BaseView
      *
      * Examples: { title|esc(js) } { created_on|date(Y-m-d)|esc(attr) }
      *
-     * @var array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @var         array<string, string>
+     * @phpstan-var array<string, parser_callable_string>
      */
     public $filters = [];
 
@@ -40,8 +40,8 @@ class View extends BaseView
      * Parser Plugins provide a way to extend the functionality provided by the core Parser by creating aliases that
      * will be replaced with any callable. Can be single or tag pair.
      *
-     * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @var         array<string, callable|list<string>|string>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
      */
     public $plugins = [];
 
@@ -51,7 +51,7 @@ class View extends BaseView
      *
      * All classes must implement CodeIgniter\View\ViewDecoratorInterface
      *
-     * @var class-string<ViewDecoratorInterface>[]
+     * @var list<class-string<ViewDecoratorInterface>>
      */
     public array $decorators = [Decorator::class];
 }

app/Controllers/BaseController.php

@@ -13,8 +13,6 @@ use Psr\Log\LoggerInterface;
 use ViewThemes\Theme;
 
 /**
- * Class BaseController
- *
  * BaseController provides a convenient place for loading components and performing functions that are needed by all
  * your controllers. Extend this class in any new controllers: class Home extends BaseController
  *
@@ -41,7 +39,7 @@ abstract class BaseController extends Controller
      * class instantiation. These helpers will be available
      * to all other controllers that extend BaseController.
      *
-     * @var string[]
+     * @var list<string>
      */
     protected $helpers = [];
 

app/Controllers/EpisodeAudioController.php

@@ -40,7 +40,7 @@ class EpisodeAudioController extends Controller
      * An array of helpers to be loaded automatically upon class instantiation. These helpers will be available to all
      * other controllers that extend Analytics.
      *
-     * @var string[]
+     * @var list<string>
      */
     protected $helpers = ['analytics'];
 

app/Controllers/EpisodeController.php

@@ -106,9 +106,7 @@ class EpisodeController extends BaseController
 
             // The page cache is set to a decade so it is deleted manually upon podcast update
             return view('episode/comments', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                ? $secondsToNextUnpublishedEpisode
-                : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -157,9 +155,7 @@ class EpisodeController extends BaseController
 
             // The page cache is set to a decade so it is deleted manually upon podcast update
             return view('episode/activity', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -218,9 +214,7 @@ class EpisodeController extends BaseController
 
             // The page cache is set to a decade so it is deleted manually upon podcast update
             return view('episode/chapters', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -284,9 +278,7 @@ class EpisodeController extends BaseController
 
             // The page cache is set to a decade so it is deleted manually upon podcast update
             return view('episode/transcript', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -339,9 +331,7 @@ class EpisodeController extends BaseController
 
             // The page cache is set to a decade so it is deleted manually upon podcast update
             return view('embed', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -420,11 +410,9 @@ class EpisodeController extends BaseController
          * get comments: aggregated replies from posts referring to the episode
          */
         $episodeComments = model(PostModel::class)
-            ->whereIn('in_reply_to_id', function (BaseBuilder $builder): BaseBuilder {
-                return $builder->select('id')
-                    ->from('fediverse_posts')
-                    ->where('episode_id', $this->episode->id);
-            })
+            ->whereIn('in_reply_to_id', fn (BaseBuilder $builder): BaseBuilder => $builder->select('id')
+                ->from('fediverse_posts')
+                ->where('episode_id', $this->episode->id))
             ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
             ->orderBy('published_at', 'ASC');
 

app/Controllers/FeedController.php

@@ -79,13 +79,7 @@ class FeedController extends Controller
             );
 
             cache()
-                ->save(
-                    $cacheName,
-                    $found,
-                    $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
-                );
+                ->save($cacheName, $found, $secondsToNextUnpublishedEpisode ?: DECADE);
         }
 
         return $this->response->setXML($found);

app/Controllers/PlatformController.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * @copyright  2020 Ad Aures
- * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
- * @link       https://castopod.org/
- */
-
-namespace App\Controllers;
-
-use App\Models\PlatformModel;
-use CodeIgniter\Controller;
-use CodeIgniter\HTTP\ResponseInterface;
-
-/*
- * Provide public access to all platforms so that they can be exported
- */
-class PlatformController extends Controller
-{
-    public function index(): ResponseInterface
-    {
-        $model = new PlatformModel();
-
-        return $this->response->setJSON($model->getPlatforms());
-    }
-}

app/Controllers/PodcastController.php

@@ -96,9 +96,7 @@ class PodcastController extends BaseController
             );
 
             return view('podcast/activity', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -148,9 +146,7 @@ class PodcastController extends BaseController
             );
 
             return view('podcast/about', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }
@@ -270,9 +266,7 @@ class PodcastController extends BaseController
                 $this->podcast->id,
             );
             return view('podcast/episodes', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                 'cache_name' => $cacheName,
             ]);
         }

app/Database/Migrations/2024-04-18-160000_add_podcasts_verify_txt.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Class AddPodcastsVerifyTxtField adds 1 field to podcast table in database to support podcast:txt tag
+ *
+ * @copyright  2024 Ad Aures
+ * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
+ * @link       https://castopod.org/
+ */
+
+namespace App\Database\Migrations;
+
+class AddPodcastsVerifyTxtField extends BaseMigration
+{
+    public function up(): void
+    {
+        $fields = [
+            'verify_txt' => [
+                'type'  => 'TEXT',
+                'null'  => true,
+                'after' => 'location_osm',
+            ],
+        ];
+
+        $this->forge->addColumn('podcasts', $fields);
+    }
+
+    public function down(): void
+    {
+        $this->forge->dropColumn('podcasts', 'verify_txt');
+    }
+}

app/Database/Migrations/2024-04-18-180000_refactor_platforms.php

@@ -0,0 +1,154 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class RefactorPlatforms extends Migration
+{
+    public function up(): void
+    {
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'podcast_id' => [
+                'type'     => 'INT',
+                'unsigned' => true,
+            ],
+            'type' => [
+                'type'       => 'ENUM',
+                'constraint' => ['podcasting', 'social', 'funding'],
+                'after'      => 'podcast_id',
+            ],
+            'slug' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 32,
+            ],
+            'link_url' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 512,
+            ],
+            'account_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 128,
+                'null'       => true,
+            ],
+            'is_visible' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'default'    => 0,
+            ],
+        ]);
+
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey('podcast_id', 'podcasts', 'id', '', 'CASCADE', 'platforms_podcast_id_foreign');
+        $this->forge->addUniqueKey(['podcast_id', 'type', 'slug']);
+        $this->forge->createTable('platforms_temp');
+
+        $platformsData = $this->db->table('podcasts_platforms')
+            ->select('podcasts_platforms.*, type')
+            ->join('platforms', 'platforms.slug = podcasts_platforms.platform_slug')
+            ->get()
+            ->getResultArray();
+
+        $data = [];
+        foreach ($platformsData as $platformData) {
+            $data[] = [
+                'podcast_id' => $platformData['podcast_id'],
+                'type'       => $platformData['type'],
+                'slug'       => $platformData['platform_slug'],
+                'link_url'   => $platformData['link_url'],
+                'account_id' => $platformData['account_id'],
+                'is_visible' => $platformData['is_visible'],
+            ];
+        }
+
+        if ($data !== []) {
+            $this->db->table('platforms_temp')
+                ->insertBatch($data);
+        }
+
+        $this->forge->dropTable('platforms');
+
+        $this->forge->dropTable('podcasts_platforms');
+
+        $this->forge->renameTable('platforms_temp', 'platforms');
+    }
+
+    public function down(): void
+    {
+        // delete platforms
+        $this->forge->dropTable('platforms');
+
+        // recreate platforms and podcasts_platforms tables
+        $this->forge->addField([
+            'slug' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 32,
+            ],
+            'type' => [
+                'type'       => 'ENUM',
+                'constraint' => ['podcasting', 'social', 'funding'],
+            ],
+            'label' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 32,
+            ],
+            'home_url' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+            'submit_url' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 512,
+                'null'       => true,
+            ],
+        ]);
+        $this->forge->addField('`created_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP()');
+        $this->forge->addField(
+            '`updated_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP() ON UPDATE CURRENT_TIMESTAMP()'
+        );
+        $this->forge->addPrimaryKey('slug');
+        $this->forge->createTable('platforms');
+
+        $this->forge->addField([
+            'podcast_id' => [
+                'type'     => 'INT',
+                'unsigned' => true,
+            ],
+            'platform_slug' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 32,
+            ],
+            'link_url' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 512,
+            ],
+            'account_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 128,
+                'null'       => true,
+            ],
+            'is_visible' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'default'    => 0,
+            ],
+            'is_on_embed' => [
+                'type'       => 'TINYINT',
+                'constraint' => 1,
+                'default'    => 0,
+            ],
+        ]);
+
+        $this->forge->addPrimaryKey(['podcast_id', 'platform_slug']);
+        $this->forge->addForeignKey('podcast_id', 'podcasts', 'id', '', 'CASCADE');
+        $this->forge->addForeignKey('platform_slug', 'platforms', 'slug', 'CASCADE');
+        $this->forge->createTable('podcasts_platforms');
+    }
+}

app/Database/Seeds/AppSeeder.php

@@ -20,6 +20,5 @@ class AppSeeder extends Seeder
     {
         $this->call('CategorySeeder');
         $this->call('LanguageSeeder');
-        $this->call('PlatformSeeder');
     }
 }

app/Database/Seeds/DevSeeder.php

@@ -20,7 +20,6 @@ class DevSeeder extends Seeder
     {
         $this->call('CategorySeeder');
         $this->call('LanguageSeeder');
-        $this->call('PlatformSeeder');
         $this->call('DevSuperadminSeeder');
     }
 }

app/Database/Seeds/FakePodcastsAnalyticsSeeder.php

@@ -77,34 +77,32 @@ class FakePodcastsAnalyticsSeeder extends Seeder
 
                 for (
                     $lineNumber = 0;
-                    $lineNumber < rand(1, (int) $probability1);
+                    $lineNumber < random_int(1, (int) $probability1);
                     ++$lineNumber
                 ) {
                     $probability2 = floor(exp(6 - $age / 20)) + 10;
 
                     $player =
                         $jsonUserAgents[
-                            rand(1, count($jsonUserAgents) - 1)
+                            random_int(1, count($jsonUserAgents) - 1)
                         ];
                     $service =
                         $jsonRSSUserAgents[
-                            rand(1, count($jsonRSSUserAgents) - 1)
+                            random_int(1, count($jsonRSSUserAgents) - 1)
                         ]['slug'];
-                    $app = isset($player['app']) ? $player['app'] : '';
-                    $device = isset($player['device'])
-                        ? $player['device']
-                        : '';
-                    $os = isset($player['os']) ? $player['os'] : '';
-                    $isBot = isset($player['bot']) ? $player['bot'] : 0;
+                    $app = $player['app'] ?? '';
+                    $device = $player['device'] ?? '';
+                    $os = $player['os'] ?? '';
+                    $isBot = $player['bot'] ?? 0;
 
                     $fakeIp =
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255);
+                        random_int(0, 255);
 
                     $cityReader = new Reader(WRITEPATH . 'uploads/GeoLite2-City/GeoLite2-City.mmdb');
 
@@ -115,9 +113,7 @@ class FakePodcastsAnalyticsSeeder extends Seeder
                     try {
                         $city = $cityReader->city($fakeIp);
 
-                        $countryCode = $city->country->isoCode === null
-                            ? 'N/A'
-                            : $city->country->isoCode;
+                        $countryCode = $city->country->isoCode ?? 'N/A';
 
                         $regionCode = $city->subdivisions === []
                             ? 'N/A'
@@ -128,20 +124,20 @@ class FakePodcastsAnalyticsSeeder extends Seeder
                         //Bad luck, bad IP, nothing to do.
                     }
 
-                    $hits = rand(0, (int) $probability2);
+                    $hits = random_int(0, (int) $probability2);
 
                     $analyticsPodcasts[] = [
                         'podcast_id'       => $podcast->id,
                         'date'             => date('Y-m-d', $date),
-                        'duration'         => rand(60, 3600),
-                        'bandwidth'        => rand(1000000, 10000000),
+                        'duration'         => random_int(60, 3600),
+                        'bandwidth'        => random_int(1000000, 10000000),
                         'hits'             => $hits,
                         'unique_listeners' => $hits,
                     ];
                     $analyticsPodcastsByHour[] = [
                         'podcast_id' => $podcast->id,
                         'date'       => date('Y-m-d', $date),
-                        'hour'       => rand(0, 23),
+                        'hour'       => random_int(0, 23),
                         'hits'       => $hits,
                     ];
                     $analyticsPodcastsByCountry[] = [

app/Database/Seeds/FakeWebsiteAnalyticsSeeder.php

@@ -216,23 +216,23 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
 
                 for (
                     $lineNumber = 0;
-                    $lineNumber < rand(1, $probability1);
+                    $lineNumber < random_int(1, $probability1);
                     ++$lineNumber
                 ) {
                     $probability2 = (int) floor(exp(6 - $age / 20)) + 10;
 
                     $domain =
-                        $this->domains[rand(0, count($this->domains) - 1)];
+                        $this->domains[random_int(0, count($this->domains) - 1)];
                     $keyword =
                         $this->keywords[
-                            rand(0, count($this->keywords) - 1)
+                            random_int(0, count($this->keywords) - 1)
                         ];
                     $browser =
                         $this->browsers[
-                            rand(0, count($this->browsers) - 1)
+                            random_int(0, count($this->browsers) - 1)
                         ];
 
-                    $hits = rand(0, $probability2);
+                    $hits = random_int(0, $probability2);
 
                     $websiteByBrowser[] = [
                         'podcast_id' => $podcast->id,

app/Entities/Episode.php

@@ -483,7 +483,7 @@ class Episode extends Entity
 
     public function setGuid(?string $guid = null): static
     {
-        $this->attributes['guid'] = $guid === null ? $this->getLink() : $guid;
+        $this->attributes['guid'] = $guid ?? $this->getLink();
 
         return $this;
     }

app/Entities/Podcast.php

@@ -15,7 +15,6 @@ use App\Models\ActorModel;
 use App\Models\CategoryModel;
 use App\Models\EpisodeModel;
 use App\Models\PersonModel;
-use App\Models\PlatformModel;
 use CodeIgniter\Entity\Entity;
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
@@ -32,6 +31,8 @@ use League\CommonMark\MarkdownConverter;
 use Modules\Auth\Models\UserModel;
 use Modules\Media\Entities\Image;
 use Modules\Media\Models\MediaModel;
+use Modules\Platforms\Entities\Platform;
+use Modules\Platforms\Models\PlatformModel;
 use Modules\PremiumPodcasts\Entities\Subscription;
 use Modules\PremiumPodcasts\Models\SubscriptionModel;
 use RuntimeException;
@@ -528,7 +529,7 @@ class Podcast extends Entity
         }
 
         if ($this->podcasting_platforms === null) {
-            $this->podcasting_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'podcasting');
+            $this->podcasting_platforms = (new PlatformModel())->getPlatforms($this->id, 'podcasting');
         }
 
         return $this->podcasting_platforms;
@@ -546,7 +547,7 @@ class Podcast extends Entity
         }
 
         if ($this->social_platforms === null) {
-            $this->social_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'social');
+            $this->social_platforms = (new PlatformModel())->getPlatforms($this->id, 'social');
         }
 
         return $this->social_platforms;
@@ -564,7 +565,7 @@ class Podcast extends Entity
         }
 
         if ($this->funding_platforms === null) {
-            $this->funding_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'funding');
+            $this->funding_platforms = (new PlatformModel())->getPlatforms($this->id, 'funding');
         }
 
         return $this->funding_platforms;

app/Helpers/id3_helper.php

@@ -42,24 +42,16 @@ if (! function_exists('write_audio_file_tags')) {
 
         // populate data array
         $TagData = [
-            'title'  => [esc($episode->title)],
-            'artist' => [
-                $episode->podcast->publisher === null
-                    ? esc($episode->podcast->owner_name)
-                    : $episode->podcast->publisher,
-            ],
+            'title'             => [esc($episode->title)],
+            'artist'            => [$episode->podcast->publisher ?? esc($episode->podcast->owner_name)],
             'album'             => [esc($episode->podcast->title)],
             'year'              => [$episode->published_at instanceof Time ? $episode->published_at->format('Y') : ''],
             'genre'             => ['Podcast'],
             'comment'           => [$episode->description],
             'track_number'      => [(string) $episode->number],
             'copyright_message' => [$episode->podcast->copyright],
-            'publisher'         => [
-                $episode->podcast->publisher === null
-                    ? esc($episode->podcast->owner_name)
-                    : $episode->podcast->publisher,
-            ],
-            'encoded_by' => ['Castopod'],
+            'publisher'         => [$episode->podcast->publisher ?? esc($episode->podcast->owner_name)],
+            'encoded_by'        => ['Castopod'],
 
             // TODO: find a way to add the remaining tags for podcasts as the library doesn't seem to allow it
             // 'website' => [$podcast_url],

app/Helpers/misc_helper.php

@@ -164,7 +164,7 @@ if (! function_exists('parse_size')) {
         $size = (float) preg_replace('~[^0-9\.]~', '', $size); // Remove the non-numeric characters from the size.
         if ($unit !== '') {
             // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by.
-            return round($size * pow(1024, (float) stripos('bkmgtpezy', $unit[0])));
+            return round($size * 1024 ** ((float) stripos('bkmgtpezy', $unit[0])));
         }
 
         return round($size);
@@ -183,7 +183,7 @@ if (! function_exists('format_bytes')) {
         $pow = floor(($bytes ? log($bytes) : 0) / log($is_binary ? 1024 : 1000));
         $pow = min($pow, count($units) - 1);
 
-        $bytes /= pow($is_binary ? 1024 : 1000, $pow);
+        $bytes /= ($is_binary ? 1024 : 1000) ** $pow;
 
         return round($bytes, $precision) . $units[$pow];
     }

app/Helpers/rss_helper.php

@@ -121,6 +121,12 @@ if (! function_exists('get_rss_feed')) {
                 ->addAttribute('owner', $podcast->owner_email);
         }
 
+        if ($podcast->verify_txt !== null) {
+            $channel
+                ->addChild('txt', $podcast->verify_txt, $podcastNamespace)
+                ->addAttribute('purpose', 'verify');
+        }
+
         if ($podcast->imported_feed_url !== null) {
             $channel->addChild('previousUrl', $podcast->imported_feed_url, $podcastNamespace);
         }
@@ -254,12 +260,7 @@ if (! function_exists('get_rss_feed')) {
             $itunesNamespace,
         );
 
-        $channel->addChild(
-            'author',
-            $podcast->publisher ? $podcast->publisher : $podcast->owner_name,
-            $itunesNamespace,
-            false
-        );
+        $channel->addChild('author', $podcast->publisher ?: $podcast->owner_name, $itunesNamespace, false);
         $channel->addChild('link', $podcast->link);
 
         $owner = $channel->addChild('owner', null, $itunesNamespace);
@@ -348,7 +349,7 @@ if (! function_exists('get_rss_feed')) {
             $item->addChild('episodeType', $episode->type, $itunesNamespace);
 
             // If episode is of type trailer, add podcast:trailer tag on channel level
-            if ($episode->type == 'trailer') {
+            if ($episode->type === 'trailer') {
                 $trailer = $channel->addChild('trailer', $episode->title, $podcastNamespace);
                 $trailer->addAttribute('pubdate', $episode->published_at->format(DATE_RFC2822));
                 $trailer->addAttribute(

app/Libraries/Router.php

@@ -48,7 +48,7 @@ class Router extends CodeIgniterRouter
             $matchedKey = $routeKey;
 
             // Are we dealing with a locale?
-            if (strpos($routeKey, '{locale}') !== false) {
+            if (str_contains($routeKey, '{locale}')) {
                 $routeKey = str_replace('{locale}', '[^/]+', $routeKey);
             }
 
@@ -73,7 +73,7 @@ class Router extends CodeIgniterRouter
 
                 // Store our locale so CodeIgniter object can
                 // assign it to the Request.
-                if (strpos($matchedKey, '{locale}') !== false) {
+                if (str_contains($matchedKey, '{locale}')) {
                     preg_match(
                         '#^' . str_replace('{locale}', '(?<locale>[^/]+)', $matchedKey) . '$#u',
                         $uri,
@@ -183,13 +183,13 @@ class Router extends CodeIgniterRouter
                 [$controller] = explode('::', (string) $handler);
 
                 // Checks `/` in controller name
-                if (strpos($controller, '/') !== false) {
+                if (str_contains($controller, '/')) {
                     throw RouterException::forInvalidControllerName($handler);
                 }
 
-                if (strpos((string) $handler, '$') !== false && strpos($routeKey, '(') !== false) {
+                if (str_contains((string) $handler, '$') && str_contains($routeKey, '(')) {
                     // Checks dynamic controller
-                    if (strpos($controller, '$') !== false) {
+                    if (str_contains($controller, '$')) {
                         throw RouterException::forDynamicController($handler);
                     }
 

app/Libraries/ViewComponents/Decorator.php

@@ -7,8 +7,6 @@ namespace ViewComponents;
 use CodeIgniter\View\ViewDecoratorInterface;
 
 /**
- * Class Decorator
- *
  * Enables rendering of View Components into the views.
  *
  * Borrowed and adapted from https://github.com/lonnieezell/Bonfire2/

app/Libraries/ViewThemes/Theme.php

@@ -19,7 +19,7 @@ class Theme
     protected static $defaultTheme = 'app';
 
     /**
-     * @var string
+     * @var ?string
      */
     protected static $currentTheme;
 
@@ -71,9 +71,7 @@ class Theme
      */
     public static function current(): string
     {
-        return static::$currentTheme !== null
-            ? static::$currentTheme
-            : static::$defaultTheme;
+        return static::$currentTheme ?? static::$defaultTheme;
     }
 
     /**

app/Models/CategoryModel.php

@@ -26,7 +26,7 @@ class CategoryModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = ['parent_id', 'code', 'apple_category', 'google_category'];
 

app/Models/ClipModel.php

@@ -33,7 +33,7 @@ class ClipModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = [
         'id',

app/Models/EpisodeCommentModel.php

@@ -40,7 +40,7 @@ class EpisodeCommentModel extends UuidModel
     protected $uuidFields = ['id', 'in_reply_to_id'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = [
         'id',
@@ -57,7 +57,7 @@ class EpisodeCommentModel extends UuidModel
     ];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeInsert = ['setCommentId'];
 

app/Models/EpisodeModel.php

@@ -62,7 +62,7 @@ class EpisodeModel extends UuidModel
     protected $table = 'episodes';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = [
         'id',
@@ -127,17 +127,17 @@ class EpisodeModel extends UuidModel
     ];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterInsert = ['writeEnclosureMetadata', 'clearCache'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterUpdate = ['clearCache', 'writeEnclosureMetadata'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeDelete = ['clearCache'];
 
@@ -272,13 +272,7 @@ class EpisodeModel extends UuidModel
             $secondsToNextUnpublishedEpisode = $this->getSecondsToNextUnpublishedEpisode($podcastId);
 
             cache()
-                ->save(
-                    $cacheName,
-                    $found,
-                    $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
-                );
+                ->save($cacheName, $found, $secondsToNextUnpublishedEpisode ?: DECADE);
         }
 
         return $found;

app/Models/LanguageModel.php

@@ -26,7 +26,7 @@ class LanguageModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = ['code', 'native_name'];
 

app/Models/LikeModel.php

@@ -31,7 +31,7 @@ class LikeModel extends UuidModel
     protected $uuidFields = ['comment_id'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = ['actor_id', 'comment_id'];
 

app/Models/PageModel.php

@@ -26,7 +26,7 @@ class PageModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = ['id', 'title', 'slug', 'content_markdown', 'content_html'];
 
@@ -55,19 +55,19 @@ class PageModel extends Model
     ];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterInsert = ['clearCache'];
 
     /**
      * Before update because slug or title might change
      *
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeUpdate = ['clearCache'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeDelete = ['clearCache'];
 

app/Models/PersonModel.php

@@ -26,7 +26,7 @@ class PersonModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = [
         'id',
@@ -64,19 +64,19 @@ class PersonModel extends Model
     ];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterInsert = ['clearCache'];
 
     /**
      * clear cache before update if by any chance, the person name changes, so will the person link
      *
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeUpdate = ['clearCache'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeDelete = ['clearCache'];
 

app/Models/PlatformModel.php

@@ -1,205 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * Class PlatformModel Model for platforms 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\Models;
-
-use App\Entities\Platform;
-use CodeIgniter\Model;
-use Config\App;
-
-class PlatformModel extends Model
-{
-    /**
-     * @var string
-     */
-    protected $table = 'platforms';
-
-    /**
-     * @var string
-     */
-    protected $primaryKey = 'slug';
-
-    /**
-     * @var string[]
-     */
-    protected $allowedFields = ['slug', 'type', 'label', 'home_url', 'submit_url'];
-
-    /**
-     * @var string
-     */
-    protected $returnType = Platform::class;
-
-    /**
-     * @var bool
-     */
-    protected $useSoftDeletes = false;
-
-    /**
-     * @var bool
-     */
-    protected $useTimestamps = false;
-
-    /**
-     * @return Platform[]
-     */
-    public function getPlatforms(): array
-    {
-        if (! ($found = cache('platforms'))) {
-            $baseUrl = rtrim(config(App::class)->baseURL, '/');
-            $found = $this->select(
-                "*, CONCAT('{$baseUrl}/assets/images/platforms/',`type`,'/',`slug`,'.svg') as icon",
-            )->findAll();
-            cache()
-                ->save('platforms', $found, DECADE);
-        }
-
-        return $found;
-    }
-
-    public function getPlatform(string $slug): ?Platform
-    {
-        $cacheName = "platform-{$slug}";
-        if (! ($found = cache($cacheName))) {
-            $found = $this->where('slug', $slug)
-                ->first();
-            cache()
-                ->save($cacheName, $found, DECADE);
-        }
-
-        return $found;
-    }
-
-    public function createPlatform(
-        string $slug,
-        string $type,
-        string $label,
-        string $homeUrl,
-        string $submitUrl = null
-    ): bool {
-        $data = [
-            'slug'       => $slug,
-            'type'       => $type,
-            'label'      => $label,
-            'home_url'   => $homeUrl,
-            'submit_url' => $submitUrl,
-        ];
-
-        return $this->insert($data, false);
-    }
-
-    /**
-     * @return Platform[]
-     */
-    public function getPlatformsWithLinks(int $podcastId, string $platformType): array
-    {
-        if (
-            ! ($found = cache("podcast#{$podcastId}_platforms_{$platformType}_withLinks"))
-        ) {
-            $found = $this->select(
-                'platforms.*, podcasts_platforms.link_url, podcasts_platforms.account_id, podcasts_platforms.is_visible, podcasts_platforms.is_on_embed',
-            )
-                ->join(
-                    'podcasts_platforms',
-                    "podcasts_platforms.platform_slug = platforms.slug AND podcasts_platforms.podcast_id = {$podcastId}",
-                    'left',
-                )
-                ->where('platforms.type', $platformType)
-                ->findAll();
-
-            cache()
-                ->save("podcast#{$podcastId}_platforms_{$platformType}_withLinks", $found, DECADE);
-        }
-
-        return $found;
-    }
-
-    /**
-     * @return Platform[]
-     */
-    public function getPodcastPlatforms(int $podcastId, string $platformType): array
-    {
-        $cacheName = "podcast#{$podcastId}_platforms_{$platformType}";
-        if (! ($found = cache($cacheName))) {
-            $found = $this->select(
-                'platforms.*, podcasts_platforms.link_url, podcasts_platforms.account_id, podcasts_platforms.is_visible, podcasts_platforms.is_on_embed',
-            )
-                ->join('podcasts_platforms', 'podcasts_platforms.platform_slug = platforms.slug')
-                ->where('podcasts_platforms.podcast_id', $podcastId)
-                ->where('platforms.type', $platformType)
-                ->findAll();
-
-            cache()
-                ->save($cacheName, $found, DECADE);
-        }
-
-        return $found;
-    }
-
-    /**
-     * @param mixed[] $podcastsPlatformsData
-     *
-     * @return int|false Number of rows inserted or FALSE on failure
-     */
-    public function savePodcastPlatforms(
-        int $podcastId,
-        string $platformType,
-        array $podcastsPlatformsData
-    ): int | false {
-        $this->clearCache($podcastId);
-
-        $podcastsPlatformsTable = $this->db->prefixTable('podcasts_platforms');
-        $platformsTable = $this->db->prefixTable('platforms');
-
-        $deleteJoinQuery = <<<SQL
-        DELETE {$podcastsPlatformsTable}
-        FROM {$podcastsPlatformsTable}
-        INNER JOIN {$platformsTable} ON {$platformsTable}.slug = {$podcastsPlatformsTable}.platform_slug
-        WHERE `podcast_id` = ? AND `type` = ?
-        SQL;
-
-        $this->db->query($deleteJoinQuery, [$podcastId, $platformType]);
-
-        if ($podcastsPlatformsData === []) {
-            // no rows inserted
-            return 0;
-        }
-
-        return $this->db
-            ->table('podcasts_platforms')
-            ->insertBatch($podcastsPlatformsData);
-    }
-
-    public function removePodcastPlatform(int $podcastId, string $platformSlug): bool | string
-    {
-        $this->clearCache($podcastId);
-
-        return $this->db->table('podcasts_platforms')
-            ->delete([
-                'podcast_id'    => $podcastId,
-                'platform_slug' => $platformSlug,
-            ]);
-    }
-
-    public function clearCache(int $podcastId): void
-    {
-        cache()->deleteMatching("podcast#{$podcastId}_platforms_*");
-
-        // delete localized podcast page cache
-        cache()
-            ->deleteMatching("page_podcast#{$podcastId}*");
-        // delete post and episode comments pages cache
-        cache()
-            ->deleteMatching('page_post*');
-        cache()
-            ->deleteMatching('page_episode#*');
-    }
-}

app/Models/PodcastModel.php

@@ -30,7 +30,7 @@ class PodcastModel extends Model
     protected $primaryKey = 'id';
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $allowedFields = [
         'id',
@@ -61,6 +61,7 @@ class PodcastModel extends Model
         'location_name',
         'location_geo',
         'location_osm',
+        'verify_txt',
         'payment_pointer',
         'custom_rss',
         'is_published_on_hubs',
@@ -103,29 +104,29 @@ class PodcastModel extends Model
     ];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeInsert = ['setPodcastGUID', 'createPodcastActor'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterInsert = ['setActorAvatar'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $afterUpdate = ['updatePodcastActor'];
 
     /**
      * clear cache before update if by any chance, the podcast name changes, so will the podcast link
      *
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeUpdate = ['clearCache'];
 
     /**
-     * @var string[]
+     * @var list<string>
      */
     protected $beforeDelete = ['clearCache'];
 
@@ -258,13 +259,7 @@ class PodcastModel extends Model
             $secondsToNextUnpublishedEpisode = $episodeModel->getSecondsToNextUnpublishedEpisode($podcastId);
 
             cache()
-                ->save(
-                    $cacheName,
-                    $found,
-                    $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
-                );
+                ->save($cacheName, $found, $secondsToNextUnpublishedEpisode ?: DECADE);
         }
 
         return $found;
@@ -294,13 +289,7 @@ class PodcastModel extends Model
             $secondsToNextUnpublishedEpisode = $episodeModel->getSecondsToNextUnpublishedEpisode($podcastId);
 
             cache()
-                ->save(
-                    $cacheName,
-                    $found,
-                    $secondsToNextUnpublishedEpisode
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
-                );
+                ->save($cacheName, $found, $secondsToNextUnpublishedEpisode ?: DECADE);
         }
 
         return $found;
@@ -334,11 +323,7 @@ class PodcastModel extends Model
             $secondsToNextUnpublishedEpisode = (new EpisodeModel())->getSecondsToNextUnpublishedEpisode($podcastId);
 
             cache()
-                ->save(
-                    $cacheName,
-                    $defaultQuery,
-                    $secondsToNextUnpublishedEpisode ? $secondsToNextUnpublishedEpisode : DECADE
-                );
+                ->save($cacheName, $defaultQuery, $secondsToNextUnpublishedEpisode ?: DECADE);
         }
 
         return $defaultQuery;

app/Resources/icons/podcasting/breaker.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path d="M0,0H24V24H0Z" fill="none" />
-    <path d="M13.3,13.07a1.91,1.91,0,0,1,.48,0,2.51,2.51,0,0,1,1.88,1.63c.08.26.19.66.26.93l.09.37h.38a5.49,5.49,0,0,0,5.38-5.46c0-4.52-3.77-8.28-9.54-8.28A10.16,10.16,0,0,0,5.9,4.56,10,10,0,0,0,2.23,12.3a10.64,10.64,0,0,0,.28,2.35,10,10,0,0,0,9.72,7.65,11.07,11.07,0,0,0,1.3-.08A10,10,0,0,0,20,18.6l.1-.12-.2-.73-.38.1a14.32,14.32,0,0,1-3.72.48,14.14,14.14,0,0,1-3-.31,2.51,2.51,0,0,1-1.87-1.65,2.51,2.51,0,0,1,.48-2.44A2.5,2.5,0,0,1,13.3,13.07ZM12.23,3.24c5.34,0,8.6,3.42,8.6,7.34a4.55,4.55,0,0,1-4.1,4.5c-.06-.22-.13-.45-.18-.62a15.25,15.25,0,0,0-9.36-9.7A8.79,8.79,0,0,1,12.23,3.24ZM3.17,12.3A9,9,0,0,1,6.3,5.45a14.35,14.35,0,0,1,8.38,7A3.26,3.26,0,0,0,14,12.2a15.86,15.86,0,0,0-3.17-.33,15.65,15.65,0,0,0-7.51,1.94A9.33,9.33,0,0,1,3.17,12.3Zm9.44,6.64a15.9,15.9,0,0,0,3.19.33,16.77,16.77,0,0,0,2.46-.19,9,9,0,0,1-4.6,2.17,13.91,13.91,0,0,1-1.73-2.52A3.83,3.83,0,0,0,12.61,18.94Zm-.07,2.42h-.31a8.82,8.82,0,0,1-4.16-1A14.24,14.24,0,0,1,9.88,16a4.07,4.07,0,0,0,.16.71A15.68,15.68,0,0,0,12.54,21.36Zm-1.83-8a15.6,15.6,0,0,0-3.48,6.55,9,9,0,0,1-3.72-5.1,14.27,14.27,0,0,1,7.29-1.95h.44A3.57,3.57,0,0,0,10.71,13.31Z" />
-</svg>

app/Resources/icons/podcasting/google.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-    <path d="M0,0H24V24H0Z" fill="none" />
-    <path d="M3.22,10.08A1.24,1.24,0,0,0,2,11.31V12.7a1.22,1.22,0,0,0,2.44,0h0V11.31A1.17,1.17,0,0,0,3.22,10.08Zm17.56,0a1.23,1.23,0,0,0-1.22,1.23V12.7a1.21,1.21,0,0,0,1.22,1.22A1.22,1.22,0,0,0,22,12.7h0V11.31A1.24,1.24,0,0,0,20.78,10.08ZM7.56,14.2a1.24,1.24,0,0,0-1.23,1.23v1.4a1.23,1.23,0,0,0,2.45,0h0v-1.4A1.17,1.17,0,0,0,7.56,14.2ZM7.56,6A1.24,1.24,0,0,0,6.33,7.24V11.7h0a1.23,1.23,0,0,0,2.45,0h0V7.24A1.17,1.17,0,0,0,7.56,6Zm8.88,0a1.24,1.24,0,0,0-1.22,1.23V8.63a1.23,1.23,0,0,0,2.45,0h0V7.24A1.24,1.24,0,0,0,16.44,6ZM12,2a1.23,1.23,0,0,0-1.22,1.23V4.62a1.22,1.22,0,1,0,2.44,0h0V3.23A1.23,1.23,0,0,0,12,2Zm0,16.16a1.22,1.22,0,0,0-1.22,1.22v1.4a1.22,1.22,0,1,0,2.44,0h0v-1.4A1.26,1.26,0,0,0,12,18.16Zm4.44-7a1.23,1.23,0,0,0-1.22,1.22v4.47a1.23,1.23,0,0,0,2.45,0h0V12.36A1.23,1.23,0,0,0,16.44,11.14ZM13.22,8.41a1.22,1.22,0,0,0-2.44,0h0v7.36h0a1.22,1.22,0,1,0,2.44,0h0V8.41Z" />
-</svg>

app/Views/Components/Alert.php

@@ -42,7 +42,7 @@ class Alert extends Component
             $this->variant = 'default';
         }
 
-        $glyph = icon(($this->glyph === null ? $variants[$this->variant]['glyph'] : $this->glyph), 'flex-shrink-0 mr-2 text-lg');
+        $glyph = icon(($this->glyph ?? $variants[$this->variant]['glyph']), 'flex-shrink-0 mr-2 text-lg');
         $title = $this->title === null ? '' : '<div class="font-semibold">' . $this->title . '</div>';
         $class = 'inline-flex w-full p-2 text-sm border rounded ' . $variants[$this->variant]['class'] . ' ' . $this->class;
 

app/Views/Components/Button.php

@@ -28,17 +28,18 @@ class Button extends Component
     public function render(): string
     {
         $baseClass =
-            'gap-x-2 flex-shrink-0 inline-flex items-center justify-center font-semibold shadow-xs rounded-full focus:ring-accent';
+            'gap-x-2 flex-shrink-0 inline-flex items-center justify-center font-semibold rounded-full focus:ring-accent';
 
         $variantClass = [
-            'default'   => 'text-black bg-gray-300 hover:bg-gray-400',
-            'primary'   => 'text-accent-contrast bg-accent-base hover:bg-accent-hover',
-            'secondary' => 'border-2 border-accent-base text-accent-base bg-white hover:border-accent-hover hover:text-accent-hover',
-            'success'   => 'text-white bg-pine-500 hover:bg-pine-800',
-            'danger'    => 'text-white bg-red-600 hover:bg-red-700',
-            'warning'   => 'text-black bg-yellow-500 hover:bg-yellow-600',
-            'info'      => 'text-white bg-blue-500 hover:bg-blue-600',
-            'disabled'  => 'text-black bg-gray-300 cursor-not-allowed',
+            'default'   => 'shadow-sm text-black bg-gray-300 hover:bg-gray-400',
+            'primary'   => 'shadow-sm text-accent-contrast bg-accent-base hover:bg-accent-hover',
+            'secondary' => 'shadow-sm border-2 border-accent-base text-accent-base bg-white hover:border-accent-hover hover:text-accent-hover',
+            'success'   => 'shadow-sm text-white bg-pine-500 hover:bg-pine-800',
+            'danger'    => 'shadow-sm text-white bg-red-600 hover:bg-red-700',
+            'warning'   => 'shadow-sm text-black bg-yellow-500 hover:bg-yellow-600',
+            'info'      => 'shadow-sm text-white bg-blue-500 hover:bg-blue-600',
+            'disabled'  => 'shadow-sm text-black bg-gray-300 cursor-not-allowed',
+            'link'      => 'text-accent-base bg-transparent underline hover:no-underline',
         ];
 
         $sizeClass = [

app/Views/errors/cli/error_exception.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use CodeIgniter\CLI\CLI;
 
 // The main Exception
-CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::write('[' . $exception::class . ']', 'light_gray', 'red');
 CLI::write($message);
 CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
 CLI::newLine();
@@ -16,7 +16,7 @@ while ($prevException = $last->getPrevious()) {
     $last = $prevException;
 
     CLI::write('  Caused by:');
-    CLI::write('  [' . get_class($prevException) . ']', 'red');
+    CLI::write('  [' . $prevException::class . ']', 'red');
     CLI::write('  ' . $prevException->getMessage());
     CLI::write('  at ' . CLI::color(clean_path($prevException->getFile()) . ':' . $prevException->getLine(), 'green'));
     CLI::newLine();
@@ -52,20 +52,11 @@ if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
             $function .= $padClass . $error['function'];
         }
 
-        $args = implode(', ', array_map(static function ($value) {
-            switch (true) {
-                case is_object($value):
-                    return 'Object(' . get_class($value) . ')';
-
-                case is_array($value):
-                    return count($value) ? '[...]' : '[]';
-
-                case $value === null:
-                    return 'null'; // return the lowercased version
-
-                default:
-                    return var_export($value, true);
-            }
+        $args = implode(', ', array_map(static fn ($value) => match (true) {
+            is_object($value) => 'Object(' . $value::class . ')',
+            is_array($value)  => count($value) ? '[...]' : '[]',
+            $value === null   => 'null', // return the lowercased version
+            default           => var_export($value, true),
         }, array_values($error['args'] ?? [])));
 
         $function .= '(' . $args . ')';

app/Views/errors/html/debug.css

@@ -18,62 +18,69 @@ body {
   margin: 0;
   padding: 0;
 }
+
 h1 {
   font-weight: lighter;
-  letter-spacing: 0.8;
   font-size: 3rem;
   color: var(--dark-text-color);
   margin: 0;
 }
+
 h1.headline {
   margin-top: 20%;
   font-size: 5rem;
 }
+
 .text-center {
   text-align: center;
 }
+
 p.lead {
   font-size: 1.6rem;
 }
+
 .container {
   max-width: 75rem;
   margin: 0 auto;
   padding: 1rem;
 }
+
 .header {
   background: var(--light-bg-color);
   color: var(--dark-text-color);
 }
+
 .header .container {
-  padding: 1rem 1.75rem 1.75rem 1.75rem;
+  padding: 1rem;
 }
+
 .header h1 {
   font-size: 2.5rem;
   font-weight: 500;
 }
+
 .header p {
   font-size: 1.2rem;
   margin: 0;
   line-height: 2.5;
 }
+
 .header a {
   color: var(--brand-primary-color);
   margin-left: 2rem;
   display: none;
   text-decoration: none;
 }
+
 .header:hover a {
   display: inline;
 }
 
-.footer {
+.environment {
   background: var(--dark-bg-color);
   color: var(--light-text-color);
-}
-.footer .container {
-  border-top: 1px solid #e7e7e7;
-  margin-top: 1rem;
   text-align: center;
+  padding: 0.2rem;
 }
 
 .source {
@@ -86,17 +93,21 @@ p.lead {
   margin: 0;
   overflow-x: scroll;
 }
+
 .source span.line {
   line-height: 1.4;
 }
+
 .source span.line .number {
   color: #666;
 }
+
 .source .line .highlight {
   display: block;
   background: var(--dark-text-color);
   color: var(--light-text-color);
 }
+
 .source span.highlight .number {
   color: #fff;
 }
@@ -108,37 +119,44 @@ p.lead {
   padding: 0;
   margin-bottom: -1px;
 }
+
 .tabs li {
   display: inline;
 }
+
 .tabs a:link,
 .tabs a:visited {
-  padding: 0rem 1rem;
+  padding: 0 1rem;
   line-height: 2.7;
   text-decoration: none;
   color: var(--dark-text-color);
   background: var(--light-bg-color);
-  border: 1px solid rgba(0, 0, 0, 0.15);
+  border: 1px solid rgb(0 0 0 / 15%);
   border-bottom: 0;
   border-top-left-radius: 5px;
   border-top-right-radius: 5px;
   display: inline-block;
 }
+
 .tabs a:hover {
   background: var(--light-bg-color);
-  border-color: rgba(0, 0, 0, 0.15);
+  border-color: rgb(0 0 0 / 15%);
 }
+
 .tabs a.active {
   background: var(--main-bg-color);
   color: var(--main-text-color);
 }
+
 .tab-content {
   background: var(--main-bg-color);
-  border: 1px solid rgba(0, 0, 0, 0.15);
+  border: 1px solid rgb(0 0 0 / 15%);
 }
+
 .content {
   padding: 1rem;
 }
+
 .hide {
   display: none;
 }
@@ -153,26 +171,26 @@ p.lead {
   border-radius: 5px;
   color: #31708f;
 }
-ul,
-ol {
-  line-height: 1.8;
-}
 
 table {
   width: 100%;
   overflow: hidden;
 }
+
 th {
   text-align: left;
   border-bottom: 1px solid #e7e7e7;
   padding-bottom: 0.5rem;
 }
+
 td {
   padding: 0.2rem 0.5rem 0.2rem 0;
 }
+
 tr:hover td {
   background: #f1f1f1;
 }
+
 td pre {
   white-space: pre-wrap;
 }
@@ -180,20 +198,25 @@ td pre {
 .trace a {
   color: inherit;
 }
+
 .trace table {
   width: auto;
 }
+
 .trace tr td:first-child {
   min-width: 5em;
   font-weight: bold;
 }
+
 .trace td {
   background: var(--light-bg-color);
   padding: 0 1rem;
 }
+
 .trace td pre {
   margin: 0;
 }
+
 .args {
   display: none;
 }

app/Views/errors/html/error_exception.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use CodeIgniter\CodeIgniter;
+use CodeIgniter\HTTP\Header;
 use Config\Services;
 
 $errorId = uniqid('error', true);
@@ -26,6 +27,12 @@ $errorId = uniqid('error', true);
 
 	<!-- Header -->
 	<div class="header">
+		<div class="environment">
+            Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+            PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+            CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
+            Environment: <?= ENVIRONMENT ?>
+        </div>
 		<div class="container">
 			<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
 			<p>
@@ -57,10 +64,10 @@ while ($prevException = $last->getPrevious()) {
 
     <pre>
     Caused by:
-    <?= esc(get_class($prevException)), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
+    <?= esc($prevException::class), esc($prevException->getCode() ? ' #' . $prevException->getCode() : '') ?>
 
     <?= nl2br(esc($prevException->getMessage())) ?>
-    <a href="https://www.duckduckgo.com/?q=<?= urlencode(get_class($prevException) . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
+    <a href="https://www.duckduckgo.com/?q=<?= urlencode($prevException::class . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $prevException->getMessage())) ?>"
        rel="noreferrer" target="_blank">search &rarr;</a>
     <?= esc(clean_path($prevException->getFile()) . ':' . $prevException->getLine()) ?>
     </pre>
@@ -117,7 +124,7 @@ while ($prevException = $last->getPrevious()) {
 										<?php
 									$params = null;
 								    // Reflection by name is not available for closure function
-								    if (substr($row['function'], -1) !== '}') {
+								    if (! str_ends_with($row['function'], '}')) {
 								        $mirror = isset($row['class']) ? new ReflectionMethod($row['class'], $row['function']) : new ReflectionFunction($row['function']);
 								        $params = $mirror->getParameters();
 								    }
@@ -231,7 +238,7 @@ while ($prevException = $last->getPrevious()) {
 						</tr>
 						<tr>
 							<td>HTTP Method</td>
-							<td><?= esc(strtoupper($request->getMethod())) ?></td>
+							<td><?= esc($request->getMethod()) ?></td>
 						</tr>
 						<tr>
 							<td>IP Address</td>
@@ -315,22 +322,22 @@ while ($prevException = $last->getPrevious()) {
 							</tr>
 						</thead>
 						<tbody>
-						<?php foreach ($headers as $value) : ?>
-							<?php
-                            if (empty($value)) {
-                                continue;
-                            }
-
-                            if (! is_array($value)) {
-                                $value = [$value];
-                            } ?>
-							<?php foreach ($value as $h) : ?>
-								<tr>
-									<td><?= esc($h->getName(), 'html') ?></td>
-									<td><?= esc($h->getValueLine(), 'html') ?></td>
-								</tr>
-							<?php endforeach; ?>
-						<?php endforeach; ?>
+						<?php foreach ($headers as $name => $value) : ?>
+                            <tr>
+                                <td><?= esc($name, 'html') ?></td>
+                                <td>
+                                <?php
+                                if ($value instanceof Header) {
+                                    echo esc($value->getValueLine(), 'html');
+                                } else {
+                                    foreach ($value as $i => $header) {
+                                        echo ' (' . $i + 1 . ') ' . esc($header->getValueLine(), 'html');
+                                    }
+                                }
+						    ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
 						</tbody>
 					</table>
 
@@ -352,8 +359,6 @@ $response->setStatusCode(http_response_code());
 
 				<?php $headers = $response->headers(); ?>
 				<?php if (! empty($headers)) : ?>
-					<?php natsort($headers) ?>
-
 					<h3>Headers</h3>
 
 					<table>
@@ -364,12 +369,22 @@ $response->setStatusCode(http_response_code());
 							</tr>
 						</thead>
 						<tbody>
-                        <?php foreach (array_keys($headers) as $name) : ?>
+                        <?php foreach ($headers as $name => $value) : ?>
                             <tr>
                                 <td><?= esc($name, 'html') ?></td>
-                                <td><?= esc($response->getHeaderLine($name), 'html') ?></td>
+                                <td>
+                                <?php
+                                if ($value instanceof Header) {
+                                    echo esc($response->getHeaderLine($name), 'html');
+                                } else {
+                                    foreach ($value as $i => $header) {
+                                        echo ' (' . $i + 1 . ') ' . esc($header->getValueLine(), 'html');
+                                    }
+                                }
+                            ?>
+                                </td>
                             </tr>
-						<?php endforeach; ?>
+                        <?php endforeach; ?>
 						</tbody>
 					</table>
 
@@ -414,18 +429,5 @@ $response->setStatusCode(http_response_code());
 	</div> <!-- /container -->
 	<?php endif; ?>
 
-	<div class="footer">
-		<div class="container">
-
-			<p>
-				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-				PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-                CodeIgniter: <?= esc(CodeIgniter::CI_VERSION) ?> --
-                Environment: <?= ENVIRONMENT ?>
-			</p>
-
-		</div>
-	</div>
-
 </body>
 </html>

builds

@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+declare(strict_types=1);
+
 define('LATEST_RELEASE', '^4.0');
 define('GITHUB_URL', 'https://github.com/codeigniter4/codeigniter4');
 

composer.json

@@ -9,38 +9,41 @@
     "php": "^8.1",
     "adaures/ipcat-php": "^v1.0.0",
     "adaures/podcast-persons-taxonomy": "^v1.0.1",
-    "aws/aws-sdk-php": "^3.300.8",
+    "aws/aws-sdk-php": "^3.305.1",
     "chrisjean/php-ico": "^1.0.4",
     "cocur/slugify": "^v4.5.1",
-    "codeigniter4/framework": "v4.4.6",
+    "codeigniter4/framework": "v4.5.1",
     "codeigniter4/settings": "v2.2.0",
-    "codeigniter4/shield": "v1.0.1",
+    "codeigniter4/shield": "v1.0.3",
     "codeigniter4/tasks": "dev-develop",
     "geoip2/geoip2": "v3.0.0",
     "james-heinrich/getid3": "^2.0.0-beta5",
     "league/commonmark": "^2.4.2",
     "league/html-to-markdown": "5.1.1",
     "melbahja/seo": "^v2.1.1",
-    "michalsn/codeigniter4-uuid": "v1.0.2",
-    "mpratt/embera": "^2.0.36",
+    "michalsn/codeigniter4-uuid": "v1.1.0",
+    "mpratt/embera": "^2.0.38",
     "opawg/user-agents-v2-php": "dev-main",
     "phpseclib/phpseclib": "~2.0.47",
     "vlucas/phpdotenv": "v5.6.0",
-    "whichbrowser/parser": "^v2.1.7",
+    "whichbrowser/parser": "^v2.1.8",
     "yassinedoghri/podcast-feed": "dev-main"
   },
   "require-dev": {
-    "captainhook/captainhook": "^5.21.2",
+    "captainhook/captainhook": "^5.23.0",
     "codeigniter/phpstan-codeigniter": "v1.4.3",
     "mikey179/vfsstream": "^v1.6.11",
     "phpstan/extension-installer": "^1.3.1",
-    "phpstan/phpstan": "^1.10.59",
-    "phpunit/phpunit": "^10.5.11",
-    "rector/rector": "^1.0.1",
-    "symplify/coding-standard": "^12.0.7",
-    "symplify/easy-coding-standard": "^12.0.13"
+    "phpstan/phpstan": "^1.10.67",
+    "phpunit/phpunit": "^10.5.20",
+    "rector/rector": "^1.0.4",
+    "symplify/coding-standard": "^12.1.4",
+    "symplify/easy-coding-standard": "^12.1.14"
   },
   "autoload": {
+    "psr-4": {
+      "App\\": "app/"
+    },
     "exclude-from-classmap": [
       "**/Database/Migrations/**"
     ]

docs/src/contributing/setup-development.md

@@ -303,11 +303,8 @@ You may skip this section if you go through the install wizard (go to
    # Populates all Languages
    php spark db:seed LanguageSeeder
 
-   # Populates all podcasts platforms
-   php spark db:seed PlatformSeeder
-
    # Adds a superadmin with [admin@castopod.local / castopod] credentials
-   php spark db:seed PlatformSeeder
+   php spark db:seed DevSuperadminSeeder
    ```
 
 3. (optionnal) Populate the database with test data:

ecs.php

@@ -10,26 +10,20 @@ use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\CodingStandard\Fixer\Naming\StandardizeHereNowDocKeywordFixer;
 use Symplify\CodingStandard\Fixer\Spacing\MethodChainingNewlineFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
-return static function (ECSConfig $ecsConfig): void {
-    // alternative to CLI arguments, easier to maintain and extend
-    $ecsConfig->paths([
+return ECSConfig::configure()
+    ->withPaths([
         __DIR__ . '/app',
         __DIR__ . '/modules',
         __DIR__ . '/themes',
         __DIR__ . '/tests',
         __DIR__ . '/public',
         __DIR__ . '/builds',
-        __DIR__ . '/ecs.php',
-        __DIR__ . '/preload.php',
-        __DIR__ . '/rector.php',
         __DIR__ . '/spark',
-    ]);
-
-    $ecsConfig->sets([SetList::CLEAN_CODE, SetList::COMMON, SetList::SYMPLIFY, SetList::PSR_12]);
-
-    $ecsConfig->skip([
+    ])
+    ->withRootFiles()
+    ->withPreparedSets(cleanCode: true, common: true, symplify: true, strict: true, psr12: true)
+    ->withSkip([
         // skip specific generated files
         __DIR__ . '/modules/Admin/Language/*/PersonsTaxonomy.php',
 
@@ -40,11 +34,7 @@ return static function (ECSConfig $ecsConfig): void {
             __DIR__ . '/app/Helpers/components_helper.php',
         ],
 
-        LineLengthFixer::class => [
-            __DIR__ . '/app/Views/*',
-            __DIR__ . '/modules/**/Views/*',
-            __DIR__ . '/themes/*',
-        ],
+        LineLengthFixer::class => [__DIR__ . '/app/Views/*', __DIR__ . '/modules/**/Views/*', __DIR__ . '/themes/*'],
 
         IndentationTypeFixer::class => [
             __DIR__ . '/app/Views/*',
@@ -65,11 +55,9 @@ return static function (ECSConfig $ecsConfig): void {
         BinaryOperatorSpacesFixer::class => [__DIR__ . '/app/Language/*', __DIR__ . '/modules/**/Language/*'],
 
         AssignmentInConditionSniff::class,
-    ]);
-
-    $ecsConfig->ruleWithConfiguration(BinaryOperatorSpacesFixer::class, [
+    ])
+    ->withConfiguredRule(BinaryOperatorSpacesFixer::class, [
         'operators' => [
             '=>' => 'align_single_space_minimal',
         ],
     ]);
-};

env

@@ -30,12 +30,15 @@
 # DATABASE
 #--------------------------------------------------------------------
 
+# If you use MySQLi as tests, first update the values of Config\Database::$tests.
 # database.default.hostname = localhost
 # database.default.database = ci4
 # database.default.username = root
 # database.default.password = root
 # database.default.DBDriver = MySQLi
 # database.default.DBPrefix =
+# database.tests.charset = utf8mb4
+# database.tests.DBCollat = utf8mb4_general_ci
 # database.default.port = 3306
 
 # database.tests.hostname = localhost
@@ -46,98 +49,21 @@
 # database.tests.DBPrefix =
 # database.tests.port = 3306
 
-#--------------------------------------------------------------------
-# CONTENT SECURITY POLICY
-#--------------------------------------------------------------------
-
-# contentsecuritypolicy.reportOnly = false
-# contentsecuritypolicy.defaultSrc = 'none'
-# contentsecuritypolicy.scriptSrc = 'self'
-# contentsecuritypolicy.styleSrc = 'self'
-# contentsecuritypolicy.imageSrc = 'self'
-# contentsecuritypolicy.baseURI = null
-# contentsecuritypolicy.childSrc = null
-# contentsecuritypolicy.connectSrc = 'self'
-# contentsecuritypolicy.fontSrc = null
-# contentsecuritypolicy.formAction = null
-# contentsecuritypolicy.frameAncestors = null
-# contentsecuritypolicy.frameSrc = null
-# contentsecuritypolicy.mediaSrc = null
-# contentsecuritypolicy.objectSrc = null
-# contentsecuritypolicy.pluginTypes = null
-# contentsecuritypolicy.reportURI = null
-# contentsecuritypolicy.sandbox = false
-# contentsecuritypolicy.upgradeInsecureRequests = false
-# contentsecuritypolicy.styleNonceTag = '{csp-style-nonce}'
-# contentsecuritypolicy.scriptNonceTag = '{csp-script-nonce}'
-# contentsecuritypolicy.autoNonce = true
-
-#--------------------------------------------------------------------
-# COOKIE
-#--------------------------------------------------------------------
-
-# cookie.prefix = ''
-# cookie.expires = 0
-# cookie.path = '/'
-# cookie.domain = ''
-# cookie.secure = false
-# cookie.httponly = false
-# cookie.samesite = 'Lax'
-# cookie.raw = false
-
 #--------------------------------------------------------------------
 # ENCRYPTION
 #--------------------------------------------------------------------
 
 # encryption.key =
-# encryption.driver = OpenSSL
-# encryption.blockSize = 16
-# encryption.digest = SHA512
-
-#--------------------------------------------------------------------
-# HONEYPOT
-#--------------------------------------------------------------------
-
-# honeypot.hidden = 'true'
-# honeypot.label = 'Fill This Field'
-# honeypot.name = 'honeypot'
-# honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
-# honeypot.container = '<div style="display:none">{template}</div>'
-
-#--------------------------------------------------------------------
-# SECURITY
-#--------------------------------------------------------------------
-
-# security.csrfProtection = 'cookie'
-# security.tokenRandomize = false
-# security.tokenName = 'csrf_token_name'
-# security.headerName = 'X-CSRF-TOKEN'
-# security.cookieName = 'csrf_cookie_name'
-# security.expires = 7200
-# security.regenerate = true
-# security.redirect = false
-# security.samesite = 'Lax'
 
 #--------------------------------------------------------------------
 # SESSION
 #--------------------------------------------------------------------
 
 # session.driver = 'CodeIgniter\Session\Handlers\FileHandler'
-# session.cookieName = 'ci_session'
-# session.expiration = 7200
 # session.savePath = null
-# session.matchIP = false
-# session.timeToUpdate = 300
-# session.regenerateDestroy = false
 
 #--------------------------------------------------------------------
 # LOGGER
 #--------------------------------------------------------------------
 
 # logger.threshold = 4
-
-#--------------------------------------------------------------------
-# CURLRequest
-#--------------------------------------------------------------------
-
-# curlrequest.shareOptions = false

modules/Admin/Config/Routes.php

@@ -511,48 +511,6 @@ $routes->group(
                         });
                     });
                 });
-                $routes->group('platforms', static function ($routes): void {
-                    $routes->get(
-                        '/',
-                        'PodcastPlatformController::platforms/$1/podcasting',
-                        [
-                            'as'     => 'platforms-podcasting',
-                            'filter' => 'permission:podcast#.manage-platforms',
-                        ],
-                    );
-                    $routes->get(
-                        'social',
-                        'PodcastPlatformController::platforms/$1/social',
-                        [
-                            'as'     => 'platforms-social',
-                            'filter' => 'permission:podcast#.manage-platforms',
-                        ],
-                    );
-                    $routes->get(
-                        'funding',
-                        'PodcastPlatformController::platforms/$1/funding',
-                        [
-                            'as'     => 'platforms-funding',
-                            'filter' => 'permission:podcast#.manage-platforms',
-                        ],
-                    );
-                    $routes->post(
-                        'save/(:platformType)',
-                        'PodcastPlatformController::attemptPlatformsUpdate/$1/$2',
-                        [
-                            'as'     => 'platforms-save',
-                            'filter' => 'permission:podcast#.manage-platforms',
-                        ],
-                    );
-                    $routes->get(
-                        '(:slug)/podcast-platform-remove',
-                        'PodcastPlatformController::removePodcastPlatform/$1/$2',
-                        [
-                            'as'     => 'podcast-platform-remove',
-                            'filter' => 'permission:podcast#.manage-platforms',
-                        ],
-                    );
-                });
                 // Podcast notifications
                 $routes->group('notifications', static function ($routes): void {
                     $routes->get('/', 'NotificationController::list/$1', [

modules/Admin/Controllers/BaseController.php

@@ -12,8 +12,6 @@ use Psr\Log\LoggerInterface;
 use ViewThemes\Theme;
 
 /**
- * Class BaseController
- *
  * BaseController provides a convenient place for loading components and performing functions that are needed by all
  * your controllers. Extend this class in any new controllers: class Home extends BaseController
  *

modules/Admin/Controllers/EpisodeController.php

@@ -326,12 +326,8 @@ class EpisodeController extends BaseController
             $this->request->getPost('parental_advisory') !== 'undefined'
                 ? $this->request->getPost('parental_advisory')
                 : null;
-        $this->episode->number = $this->request->getPost('episode_number')
-            ? $this->request->getPost('episode_number')
-            : null;
-        $this->episode->season_number = $this->request->getPost('season_number')
-            ? $this->request->getPost('season_number')
-            : null;
+        $this->episode->number = $this->request->getPost('episode_number') ?: null;
+        $this->episode->season_number = $this->request->getPost('season_number') ?: null;
         $this->episode->type = $this->request->getPost('type');
         $this->episode->is_blocked = $this->request->getPost('block') === 'yes';
         $this->episode->custom_rss_string = $this->request->getPost('custom_rss');

modules/Admin/Controllers/PageController.php

@@ -17,7 +17,7 @@ use CodeIgniter\HTTP\RedirectResponse;
 
 class PageController extends BaseController
 {
-    protected ?Page $page;
+    protected ?Page $page = null;
 
     public function _remap(string $method, string ...$params): mixed
     {

modules/Admin/Controllers/PersonController.php

@@ -18,7 +18,7 @@ use Modules\Media\Models\MediaModel;
 
 class PersonController extends BaseController
 {
-    protected ?Person $person;
+    protected ?Person $person = null;
 
     public function _remap(string $method, string ...$params): mixed
     {

modules/Admin/Controllers/PodcastController.php

@@ -224,6 +224,7 @@ class PodcastController extends BaseController
             'location'                         => $this->request->getPost('location_name') === '' ? null : new Location(
                 $this->request->getPost('location_name')
             ),
+            'verify_txt'            => $this->request->getPost('verify_txt'),
             'custom_rss_string'     => $this->request->getPost('custom_rss'),
             'is_blocked'            => $this->request->getPost('block') === 'yes',
             'is_completed'          => $this->request->getPost('complete') === 'yes',
@@ -320,6 +321,9 @@ class PodcastController extends BaseController
         $this->podcast->location = $this->request->getPost('location_name') === '' ? null : new Location(
             $this->request->getPost('location_name')
         );
+        $this->podcast->verify_txt = $this->request->getPost('verify_txt') === '' ? null : $this->request->getPost(
+            'verify_txt'
+        );
         $this->podcast->custom_rss_string = $this->request->getPost('custom_rss');
         $this->podcast->new_feed_url = $this->request->getPost('new_feed_url') === '' ? null : $this->request->getPost(
             'new_feed_url'

modules/Admin/Language/en/Podcast.php

@@ -138,6 +138,9 @@ return [
             'If you need RSS tags that Castopod does not handle, set them here.',
         'custom_rss' => 'Custom RSS tags for the podcast',
         'custom_rss_hint' => 'This will be injected within the ❬channel❭ tag.',
+        'verify_txt' => 'Ownership verification TXT',
+        'verify_txt_hint' => 'Rather than relying on email, certain third-party services may confirm your podcast ownership by requesting you to embed a verification text within your feed.',
+        'verify_txt_helper' => 'This text is injected into a <podcast:txt purpose="verify"> tag.',
         'new_feed_url' => 'New feed URL',
         'new_feed_url_hint' => 'Use this field when you move to another domain or podcast hosting platform. By default, the value is set to the current RSS URL if the podcast is imported.',
         'old_feed_url' => 'Old feed URL',

modules/Analytics/AnalyticsTrait.php

@@ -30,9 +30,7 @@ trait AnalyticsTrait
 
             $referer = $session->get('referer');
             $domain =
-                parse_url((string) $referer, PHP_URL_HOST) === null
-                    ? '- Direct -'
-                    : parse_url((string) $referer, PHP_URL_HOST);
+                parse_url((string) $referer, PHP_URL_HOST) ?? '- Direct -';
             parse_str((string) parse_url((string) $referer, PHP_URL_QUERY), $queries);
             $keywords = $queries['q'] ?? null;
 

modules/Analytics/Config/Routes.php

@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use CodeIgniter\Router\RouteCollection;
 use Modules\Analytics\Config\Analytics;
 
 /**

modules/Analytics/Helpers/analytics_helper.php

@@ -85,14 +85,10 @@ if (! function_exists('set_user_session_location')) {
                 $city = $cityReader->city(client_ip());
 
                 $location = [
-                    'countryCode' => $city->country->isoCode === null
-                        ? 'N/A'
-                        : $city->country->isoCode,
-                    'regionCode' => $city->subdivisions[0]->isoCode === null
-                        ? 'N/A'
-                        : $city->subdivisions[0]->isoCode,
-                    'latitude'  => round($city->location->latitude, 3),
-                    'longitude' => round($city->location->longitude, 3),
+                    'countryCode' => $city->country->isoCode ?? 'N/A',
+                    'regionCode'  => $city->subdivisions[0]->isoCode ?? 'N/A',
+                    'latitude'    => round($city->location->latitude, 3),
+                    'longitude'   => round($city->location->longitude, 3),
                 ];
                 // If things go wrong the show must go on and the user must be able to download the file
             } catch (Exception) {
@@ -179,9 +175,7 @@ if (! function_exists('set_user_session_referer')) {
     {
         $session = Services::session();
 
-        $newreferer = isset($_SERVER['HTTP_REFERER'])
-            ? $_SERVER['HTTP_REFERER']
-            : '- Direct -';
+        $newreferer = $_SERVER['HTTP_REFERER'] ?? '- Direct -';
         $newreferer =
             parse_url((string) $newreferer, PHP_URL_HOST) ===
             parse_url(current_url(false), PHP_URL_HOST)
@@ -250,9 +244,7 @@ if (! function_exists('podcast_hit')) {
             }
 
             //We get the HTTP header field `Range`:
-            $httpRange = isset($_SERVER['HTTP_RANGE'])
-                ? $_SERVER['HTTP_RANGE']
-                : null;
+            $httpRange = $_SERVER['HTTP_RANGE'] ?? null;
 
             $salt = config(Analytics::class)
                 ->salt;

modules/Api/Rest/V1/Controllers/EpisodeController.php

@@ -65,7 +65,7 @@ class EpisodeController extends Controller
             return $this->failNotFound('Episode not found');
         }
 
-        return $this->respond($this->mapEpisode($episode));
+        return $this->respond(static::mapEpisode($episode));
     }
 
     protected static function mapEpisode(Episode $episode): Episode

modules/Api/Rest/V1/Filters/ApiFilter.php

@@ -36,7 +36,7 @@ class ApiFilter implements FilterInterface
             }
 
             $authHeader = $request->getHeaderLine('Authorization');
-            if (substr($authHeader, 0, 6) !== 'Basic ') {
+            if (! str_starts_with($authHeader, 'Basic ')) {
                 $response->setStatusCode(401);
 
                 return $response;
@@ -44,7 +44,7 @@ class ApiFilter implements FilterInterface
 
             $auth_token = base64_decode(substr($authHeader, 6), true);
 
-            list($username, $password) = explode(':', (string) $auth_token);
+            [$username, $password] = explode(':', (string) $auth_token);
 
             if (! ($username === $restApiConfig->basicAuthUsername && $password === $restApiConfig->basicAuthPassword)) {
                 $response->setStatusCode(401);

modules/Auth/Controllers/ActionController.php

@@ -11,8 +11,6 @@ use Psr\Log\LoggerInterface;
 use ViewThemes\Theme;
 
 /**
- * Class ActionController
- *
  * A generic controller to handle Authentication Actions.
  */
 class ActionController extends ShieldActionController

modules/Auth/Controllers/ContributorController.php

@@ -22,7 +22,7 @@ class ContributorController extends BaseController
 {
     protected Podcast $podcast;
 
-    protected ?User $contributor;
+    protected ?User $contributor = null;
 
     public function _remap(string $method, string ...$params): mixed
     {

modules/Auth/Controllers/InteractController.php

@@ -8,8 +8,6 @@ use CodeIgniter\Controller;
 use CodeIgniter\HTTP\RedirectResponse;
 
 /**
- * Class ActionController
- *
  * A generic controller to handle Authentication Actions.
  */
 class InteractController extends Controller

modules/Auth/Controllers/RegisterController.php

@@ -11,8 +11,6 @@ use Psr\Log\LoggerInterface;
 use ViewThemes\Theme;
 
 /**
- * Class RegisterController
- *
  * Handles displaying registration form, and handling actual registration flow.
  */
 class RegisterController extends ShieldRegisterController

modules/Auth/Controllers/UserController.php

@@ -22,7 +22,7 @@ use Modules\Auth\Models\UserModel;
 
 class UserController extends BaseController
 {
-    protected ?User $user;
+    protected ?User $user = null;
 
     public function _remap(string $method, string ...$params): mixed
     {

modules/Auth/Helpers/auth_helper.php

@@ -102,9 +102,10 @@ if (! function_exists('add_podcast_group')) {
 if (! function_exists('get_instance_group')) {
     function get_instance_group(User $user): ?string
     {
-        $instanceGroups = array_filter($user->getGroups() ?? [], static function ($group): bool {
-            return ! str_starts_with($group, 'podcast#');
-        });
+        $instanceGroups = array_filter(
+            $user->getGroups() ?? [],
+            static fn ($group): bool => ! str_starts_with((string) $group, 'podcast#')
+        );
 
         if ($instanceGroups === []) {
             return null;
@@ -138,9 +139,10 @@ if (! function_exists('set_instance_group')) {
 if (! function_exists('get_podcast_group')) {
     function get_podcast_group(User $user, int $podcastId, bool $removePrefix = true): ?string
     {
-        $podcastGroups = array_filter($user->getGroups() ?? [], static function ($group) use ($podcastId): bool {
-            return str_starts_with($group, "podcast#{$podcastId}-");
-        });
+        $podcastGroups = array_filter(
+            $user->getGroups() ?? [],
+            static fn ($group): bool => str_starts_with((string) $group, "podcast#{$podcastId}-")
+        );
 
         if ($podcastGroups === []) {
             return null;
@@ -180,9 +182,10 @@ if (! function_exists('get_podcast_groups')) {
      */
     function get_user_podcast_ids(User $user): array
     {
-        $podcastGroups = array_filter($user->getGroups() ?? [], static function ($group): bool {
-            return str_starts_with($group, 'podcast#');
-        });
+        $podcastGroups = array_filter(
+            $user->getGroups() ?? [],
+            static fn ($group): bool => str_starts_with((string) $group, 'podcast#')
+        );
 
         $userPodcastIds = [];
         // extract all podcast ids from groups

modules/Fediverse/Core/AbstractObject.php

@@ -42,9 +42,7 @@ abstract class AbstractObject
         }
 
         // removes all NULL, FALSE and Empty Strings but leaves 0 (zero) values
-        return array_filter($array, static function ($value): bool {
-            return $value !== null && $value !== false && $value !== '';
-        });
+        return array_filter($array, static fn ($value): bool => $value !== null && $value !== false && $value !== '');
     }
 
     public function toJSON(): string

modules/Fediverse/Helpers/fediverse_helper.php

@@ -175,12 +175,10 @@ if (! function_exists('create_preview_card_from_url')) {
 
                 // Check that, at least, the url and title are set
                 $newPreviewCard = new PreviewCard([
-                    'url'         => $mediaUrl,
-                    'title'       => $media['title'] ?? '',
-                    'description' => $media['description'] ?? '',
-                    'type'        => isset($typeMapping[$media['type']])
-                        ? $typeMapping[$media['type']]
-                        : 'link',
+                    'url'           => $mediaUrl,
+                    'title'         => $media['title'] ?? '',
+                    'description'   => $media['description'] ?? '',
+                    'type'          => $typeMapping[$media['type']] ?? 'link',
                     'author_name'   => $media['author_name'] ?? null,
                     'author_url'    => $media['author_url'] ?? null,
                     'provider_name' => $media['provider_name'] ?? '',

modules/Fediverse/Models/PostModel.php

@@ -134,7 +134,7 @@ class PostModel extends UuidModel
             $secondsToNextUnpublishedPost = $this->getSecondsToNextUnpublishedPosts($actorId);
 
             cache()
-                ->save($cacheName, $found, $secondsToNextUnpublishedPost ? $secondsToNextUnpublishedPost : DECADE);
+                ->save($cacheName, $found, $secondsToNextUnpublishedPost ?: DECADE);
         }
 
         return $found;

modules/Install/Controllers/InstallController.php

@@ -160,9 +160,7 @@ class InstallController extends Controller
 
         if (! $this->validate($rules)) {
             return redirect()
-                ->to(
-                    (host_url() === null ? config(App::class) ->baseURL : host_url()) . config(Install::class)->gateway
-                )
+                ->to((host_url() ?? config(App::class) ->baseURL) . config(Install::class)->gateway)
                 ->withInput()
                 ->with('errors', $this->validator->getErrors());
         }

modules/Media/Entities/Transcript.php

@@ -85,16 +85,12 @@ class Transcript extends BaseMedia
         }
 
         $transcript_format = $this->file->getExtension();
-        switch ($transcript_format) {
-            case 'vtt':
-                $transcriptJson = $transcriptParser->loadString($transcriptContent)
-                    ->parseVtt();
-                break;
-            case 'srt':
-            default:
-                $transcriptJson = $transcriptParser->loadString($transcriptContent)
-                    ->parseSrt();
-        }
+        $transcriptJson = match ($transcript_format) {
+            'vtt' => $transcriptParser->loadString($transcriptContent)
+                ->parseVtt(),
+            default => $transcriptParser->loadString($transcriptContent)
+                ->parseSrt(),
+        };
 
         $tempFilePath = WRITEPATH . 'uploads/' . $this->file->getRandomName();
         file_put_contents($tempFilePath, $transcriptJson);

modules/MediaClipper/VideoClipper.php

@@ -543,9 +543,9 @@ class VideoClipper
 
         # find unique color
         do {
-            $r = rand(0, 255);
-            $g = rand(0, 255);
-            $b = rand(0, 255);
+            $r = random_int(0, 255);
+            $g = random_int(0, 255);
+            $b = random_int(0, 255);
         } while (imagecolorexact($src, $r, $g, $b) < 0);
 
         $ns = $s * $q;

modules/Platforms/Config/Routes.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\PremiumPodcasts\Config;
+
+use CodeIgniter\Router\RouteCollection;
+use Modules\Admin\Config\Admin;
+
+$routes->addPlaceholder('platformType', '\bpodcasting|\bsocial|\bfunding');
+
+/** @var RouteCollection $routes */
+
+// Admin routes for subscriptions
+$routes->group(
+    config(Admin::class)
+        ->gateway,
+    [
+        'namespace' => 'Modules\Platforms\Controllers',
+    ],
+    static function ($routes): void {
+        $routes->group('podcasts/(:num)/platforms', static function ($routes): void {
+            $routes->get(
+                '/',
+                'PlatformController::platforms/$1/podcasting',
+                [
+                    'as'     => 'platforms-podcasting',
+                    'filter' => 'permission:podcast#.manage-platforms',
+                ],
+            );
+            $routes->get(
+                'social',
+                'PlatformController::platforms/$1/social',
+                [
+                    'as'     => 'platforms-social',
+                    'filter' => 'permission:podcast#.manage-platforms',
+                ],
+            );
+            $routes->get(
+                'funding',
+                'PlatformController::platforms/$1/funding',
+                [
+                    'as'     => 'platforms-funding',
+                    'filter' => 'permission:podcast#.manage-platforms',
+                ],
+            );
+            $routes->post(
+                'save/(:platformType)',
+                'PlatformController::attemptPlatformsUpdate/$1/$2',
+                [
+                    'as'     => 'platforms-save',
+                    'filter' => 'permission:podcast#.manage-platforms',
+                ],
+            );
+            $routes->get(
+                '(:platformType)/(:slug)/podcast-platform-remove',
+                'PlatformController::removePlatform/$1/$2/$3',
+                [
+                    'as'     => 'podcast-platform-remove',
+                    'filter' => 'permission:podcast#.manage-platforms',
+                ],
+            );
+        });
+    }
+);

modules/Platforms/Controllers/PlatformController.php

@@ -8,18 +8,19 @@ declare(strict_types=1);
  * @link       https://castopod.org/
  */
 
-namespace Modules\Admin\Controllers;
+namespace Modules\Platforms\Controllers;
 
 use App\Entities\Podcast;
-use App\Models\PlatformModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\RedirectResponse;
 use Config\Services;
+use Modules\Admin\Controllers\BaseController;
+use Modules\Platforms\Models\PlatformModel;
 
-class PodcastPlatformController extends BaseController
+class PlatformController extends BaseController
 {
-    protected ?Podcast $podcast;
+    protected Podcast $podcast;
 
     public function _remap(string $method, string ...$params): mixed
     {
@@ -28,18 +29,20 @@ class PodcastPlatformController extends BaseController
         }
 
         if (
-            ($this->podcast = (new PodcastModel())->getPodcastById((int) $params[0])) instanceof Podcast
+            ! ($podcast = (new PodcastModel())->getPodcastById((int) $params[0])) instanceof Podcast
         ) {
-            unset($params[0]);
-            return $this->{$method}(...$params);
+            throw PageNotFoundException::forPageNotFound();
         }
 
-        throw PageNotFoundException::forPageNotFound();
+        $this->podcast = $podcast;
+
+        unset($params[0]);
+        return $this->{$method}(...$params);
     }
 
     public function index(): string
     {
-        return view('podcast/platforms\dashboard');
+        return view('podcast/platforms/dashboard');
     }
 
     public function platforms(string $platformType): string
@@ -49,7 +52,7 @@ class PodcastPlatformController extends BaseController
         $data = [
             'podcast'      => $this->podcast,
             'platformType' => $platformType,
-            'platforms'    => (new PlatformModel())->getPlatformsWithLinks($this->podcast->id, $platformType),
+            'platforms'    => (new PlatformModel())->getPlatformsWithData($this->podcast->id, $platformType),
         ];
 
         replace_breadcrumb_params([
@@ -64,8 +67,7 @@ class PodcastPlatformController extends BaseController
         $platformModel = new PlatformModel();
         $validation = Services::validation();
 
-        $podcastsPlatformsData = [];
-
+        $platformsData = [];
         foreach (
             $this->request->getPost('platforms')
             as $platformSlug => $podcastPlatform
@@ -80,30 +82,27 @@ class PodcastPlatformController extends BaseController
             }
 
             $podcastPlatformAccountId = trim((string) $podcastPlatform['account_id']);
-            $podcastsPlatformsData[] = [
-                'platform_slug' => $platformSlug,
-                'podcast_id'    => $this->podcast->id,
-                'link_url'      => $podcastPlatformUrl,
-                'account_id'    => $podcastPlatformAccountId === '' ? null : $podcastPlatformAccountId,
-                'is_visible'    => array_key_exists('visible', $podcastPlatform) &&
+            $platformsData[] = [
+                'podcast_id' => $this->podcast->id,
+                'type'       => $platformType,
+                'slug'       => $platformSlug,
+                'link_url'   => $podcastPlatformUrl,
+                'account_id' => $podcastPlatformAccountId === '' ? null : $podcastPlatformAccountId,
+                'is_visible' => array_key_exists('visible', $podcastPlatform) &&
                     $podcastPlatform['visible'] === 'yes',
-                'is_on_embed' => array_key_exists(
-                    'on_embed',
-                    $podcastPlatform
-                ) && $podcastPlatform['on_embed'] === 'yes',
             ];
         }
 
-        $platformModel->savePodcastPlatforms($this->podcast->id, $platformType, $podcastsPlatformsData);
+        $platformModel->savePlatforms($this->podcast->id, $platformType, $platformsData);
 
         return redirect()
             ->back()
             ->with('message', lang('Platforms.messages.updateSuccess'));
     }
 
-    public function removePodcastPlatform(string $platformSlug): RedirectResponse
+    public function removePlatform(string $platformType, string $platformSlug): RedirectResponse
     {
-        (new PlatformModel())->removePodcastPlatform($this->podcast->id, $platformSlug);
+        (new PlatformModel())->removePlatform($this->podcast->id, $platformType, $platformSlug);
 
         return redirect()
             ->back()

modules/Platforms/Entities/Platform.php

@@ -8,20 +8,20 @@ declare(strict_types=1);
  * @link       https://castopod.org/
  */
 
-namespace App\Entities;
+namespace Modules\Platforms\Entities;
 
 use CodeIgniter\Entity\Entity;
 
 /**
+ * @property int $podcast_id
  * @property string $slug
  * @property string $type
  * @property string $label
+ * @property string $link_url
+ * @property string|null $account_id
+ * @property bool $is_visible
  * @property string $home_url
  * @property string|null $submit_url
- * @property string|null $link_url
- * @property string|null $account_id
- * @property bool|null $is_visible
- * @property bool|null $is_on_embed
  */
 class Platform extends Entity
 {
@@ -29,14 +29,14 @@ class Platform extends Entity
      * @var array<string, string>
      */
     protected $casts = [
-        'slug'        => 'string',
-        'type'        => 'string',
-        'label'       => 'string',
-        'home_url'    => 'string',
-        'submit_url'  => '?string',
-        'link_url'    => '?string',
-        'account_id'  => '?string',
-        'is_visible'  => '?boolean',
-        'is_on_embed' => '?boolean',
+        'podcast_id' => 'int',
+        'slug'       => 'string',
+        'type'       => 'string',
+        'label'      => 'string',
+        'link_url'   => 'string',
+        'account_id' => '?string',
+        'is_visible' => 'boolean',
+        'home_url'   => 'string',
+        'submit_url' => '?string',
     ];
 }

modules/Platforms/Models/PlatformModel.php

@@ -0,0 +1,178 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Class PlatformModel Model for platforms table in database
+ *
+ * @copyright  2024 Ad Aures
+ * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
+ * @link       https://castopod.org/
+ */
+
+namespace Modules\Platforms\Models;
+
+use CodeIgniter\Model;
+use Modules\Platforms\Entities\Platform;
+use Modules\Platforms\Platforms;
+
+class PlatformModel extends Model
+{
+    /**
+     * @var string
+     */
+    protected $table = 'platforms';
+
+    /**
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * @var string[]
+     */
+    protected $allowedFields = ['podcast_id', 'type', 'slug', 'link_url', 'account_id', 'is_visible'];
+
+    /**
+     * @var string
+     */
+    protected $returnType = Platform::class;
+
+    /**
+     * @var bool
+     */
+    protected $useSoftDeletes = false;
+
+    /**
+     * @var bool
+     */
+    protected $useTimestamps = false;
+
+    /**
+     * @return Platform[]
+     */
+    public function getPlatformsWithData(int $podcastId, string $platformType): array
+    {
+        $cacheName = "podcast#{$podcastId}_platforms_{$platformType}_withData";
+        if (! ($found = cache($cacheName))) {
+            $platforms = new Platforms();
+
+            $found = $this->getPlatforms($podcastId, $platformType);
+            $platformsData = $platforms->getPlatformsByType($platformType);
+
+            $knownSlugs = [];
+            foreach ($found as $podcastPlatform) {
+                $knownSlugs[] = $podcastPlatform->slug;
+            }
+
+            foreach ($platformsData as $slug => $platform) {
+                if (! in_array($slug, $knownSlugs, true)) {
+                    $found[] = new Platform([
+                        'podcast_id' => $podcastId,
+                        'slug'       => $slug,
+                        'type'       => $platformType,
+                        'label'      => $platform['label'],
+                        'home_url'   => $platform['home_url'],
+                        'submit_url' => $platform['submit_url'],
+                        'link_url'   => '',
+                        'account_id' => null,
+                        'is_visible' => false,
+                    ]);
+                }
+            }
+
+            cache()
+                ->save($cacheName, $found, DECADE);
+        }
+
+        return $found;
+    }
+
+    /**
+     * @return Platform[]
+     */
+    public function getPlatforms(int $podcastId, string $platformType): array
+    {
+        $cacheName = "podcast#{$podcastId}_platforms_{$platformType}";
+        if (! ($found = cache($cacheName))) {
+            $platforms = new Platforms();
+
+            /** @var Platform[] $found */
+            $found = $this
+                ->where('podcast_id', $podcastId)
+                ->where('type', $platformType)
+                ->orderBy('slug')
+                ->findAll();
+
+            foreach ($found as $platform) {
+                $platformData = $platforms->findPlatformBySlug($platformType, $platform->slug);
+
+                if ($platformData === null) {
+                    // delete platform, it does not correspond to any existing one
+                    $this->delete($platform->id);
+
+                    continue;
+                }
+
+                $platform->type = $platformType;
+                $platform->label = $platformData['label'];
+                $platform->home_url = $platformData['home_url'];
+                $platform->submit_url = $platformData['submit_url'];
+            }
+
+            cache()
+                ->save($cacheName, $found, DECADE);
+        }
+
+        return $found;
+    }
+
+    /**
+     * @return int|false Number of rows inserted or FALSE on failure
+     */
+    public function savePlatforms(int $podcastId, string $platformType, array $data): int | false
+    {
+        $this->clearCache($podcastId);
+
+        $platforms = new Platforms();
+
+        $platformsData = $platforms->getPlatformsByType($platformType);
+
+        $this->builder()
+            ->whereIn('slug', array_keys($platformsData))
+            ->delete();
+
+        if ($data === []) {
+            // no rows inserted
+            return 0;
+        }
+
+        return $this->insertBatch($data);
+    }
+
+    public function removePlatform(int $podcastId, string $platformType, string $platformSlug): bool | string
+    {
+        $this->clearCache($podcastId);
+
+        return $this->builder()
+            ->delete([
+                'podcast_id' => $podcastId,
+                'type'       => $platformType,
+                'slug'       => $platformSlug,
+            ]);
+    }
+
+    public function clearCache(int $podcastId): void
+    {
+        cache()->deleteMatching("podcast#{$podcastId}_platforms_*");
+
+        // delete localized podcast page cache
+        cache()
+            ->deleteMatching("page_podcast#{$podcastId}*");
+        // delete post and episode comments pages cache
+        cache()
+            ->deleteMatching('page_post*');
+        cache()
+            ->deleteMatching('page_episode#*');
+    }
+}

modules/PodcastImport/Commands/PodcastImport.php

@@ -8,11 +8,9 @@ use AdAures\PodcastPersonsTaxonomy\ReversedTaxonomy;
 use App\Entities\Episode;
 use App\Entities\Location;
 use App\Entities\Person;
-use App\Entities\Platform;
 use App\Entities\Podcast;
 use App\Models\EpisodeModel;
 use App\Models\PersonModel;
-use App\Models\PlatformModel;
 use App\Models\PodcastModel;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
@@ -23,6 +21,8 @@ use Exception;
 use League\HTMLToMarkdown\HtmlConverter;
 use Modules\Auth\Config\AuthGroups;
 use Modules\Auth\Models\UserModel;
+use Modules\Platforms\Models\PlatformModel;
+use Modules\Platforms\Platforms;
 use Modules\PodcastImport\Entities\PodcastImportTask;
 use Modules\PodcastImport\Entities\TaskStatus;
 use PodcastFeed\PodcastFeed;
@@ -52,9 +52,9 @@ class PodcastImport extends BaseCommand
 
         $importQueue = get_import_tasks();
 
-        $currentImport = current(array_filter($importQueue, static function ($task): bool {
-            return $task->status === TaskStatus::Running;
-        }));
+        $currentImport = current(
+            array_filter($importQueue, static fn ($task): bool => $task->status === TaskStatus::Running)
+        );
 
         if ($currentImport instanceof PodcastImportTask) {
             $currentImport->syncWithProcess();
@@ -68,9 +68,7 @@ class PodcastImport extends BaseCommand
         }
 
         // Get the next queued import
-        $queuedImports = array_filter($importQueue, static function ($task): bool {
-            return $task->status === TaskStatus::Queued;
-        });
+        $queuedImports = array_filter($importQueue, static fn ($task): bool => $task->status === TaskStatus::Queued);
         $nextImport = end($queuedImports);
 
         if (! $nextImport instanceof PodcastImportTask) {
@@ -392,27 +390,32 @@ class PodcastImport extends BaseCommand
             ],
         ];
 
+        $platforms = new Platforms();
         $platformModel = new PlatformModel();
         foreach ($platformTypes as $platformType) {
-            $podcastsPlatformsData = [];
+            $platformsData = [];
             $currPlatformStep = 1; // for progress
             CLI::write($platformType['name'] . ' - ' . $platformType['count'] . ' elements');
             foreach ($platformType['elements'] as $platform) {
                 CLI::showProgress($currPlatformStep++, $platformType['count']);
-                $platformLabel = $platform->getAttribute('platform');
-                $platformSlug = slugify((string) $platformLabel);
-                if ($platformModel->getPlatform($platformSlug) instanceof Platform) {
-                    $podcastsPlatformsData[] = [
-                        'platform_slug' => $platformSlug,
-                        'podcast_id'    => $this->podcast->id,
-                        'link_url'      => $platform->getAttribute($platformType['account_url_key']),
-                        'account_id'    => $platform->getAttribute($platformType['account_id_key']),
-                        'is_visible'    => false,
-                    ];
+                $platformSlug = $platform->getAttribute('platform');
+                $platformData = $platforms->findPlatformBySlug($platformType['name'], $platformSlug);
+
+                if ($platformData === null) {
+                    continue;
                 }
+
+                $platformsData[] = [
+                    'podcast_id' => $this->podcast->id,
+                    'type'       => $platformType['name'],
+                    'slug'       => $platformSlug,
+                    'link_url'   => $platform->getAttribute($platformType['account_url_key']),
+                    'account_id' => $platform->getAttribute($platformType['account_id_key']),
+                    'is_visible' => false,
+                ];
             }
 
-            $platformModel->savePodcastPlatforms($this->podcast->id, $platformType['name'], $podcastsPlatformsData);
+            $platformModel->savePlatforms($this->podcast->id, $platformType['name'], $platformsData);
             CLI::showProgress(false);
         }
     }
@@ -522,9 +525,7 @@ class PodcastImport extends BaseCommand
             ->get()
             ->getResultArray();
 
-        return array_map(static function (array $element) {
-            return $element['guid'];
-        }, $result);
+        return array_map(static fn (array $element) => $element['guid'], $result);
     }
 
     /**