rdelaage
/
castopod
mirror of https://code.castopod.org/adaures/castopod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: remove all empty declarations + add missing type declarations 

update composer dependencies
This commit is contained in:
Yassine Doghri 2021-05-18 17:16:36 +00:00
parent 93e605b406
commit fb3593f828
No known key found for this signature in database
GPG Key ID: 3E7F89498B960C9F
103 changed files with 750 additions and 1292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Config/ActivityPub.php
View File

@ -10,32 +10,21 @@ class ActivityPub extends ActivityPubBase
* --------------------------------------------------------------------
* ActivityPub Objects
* --------------------------------------------------------------------
* @var string
*/
public $actorObject = PodcastActor::class;
/**
* @var string
*/
public $noteObject = NoteObject::class;
public string $actorObject = PodcastActor::class;
public string $noteObject = NoteObject::class;
/**
* --------------------------------------------------------------------
* Default avatar and cover images
* --------------------------------------------------------------------
* @var string
*/
public $defaultAvatarImagePath = 'assets/images/castopod-avatar-default.jpg';
/**
* @var string
*/
public $defaultAvatarImageMimetype = 'image/jpeg';
public string $defaultAvatarImagePath = 'assets/images/castopod-avatar-default.jpg';
/**
* @var string
*/
public $defaultCoverImagePath = 'assets/images/castopod-cover-default.jpg';
/**
* @var string
*/
public $defaultCoverImageMimetype = 'image/jpeg';
public string $defaultAvatarImageMimetype = 'image/jpeg';
public string $defaultCoverImagePath = 'assets/images/castopod-cover-default.jpg';
public string $defaultCoverImageMimetype = 'image/jpeg';
}

3
app/Config/Analytics.php
View File

@ -10,9 +10,8 @@ class Analytics extends AnalyticsBase
* --------------------------------------------------------------------
* Route filters options
* --------------------------------------------------------------------
* @var array<string, string>
*/
public $routeFilters = [
public array $routeFilters = [
'analytics-full-data' => 'permission:podcasts-view,podcast-view',
'analytics-data' => 'permission:podcasts-view,podcast-view',
'analytics-filtered-data' => 'permission:podcasts-view,podcast-view',

115
app/Config/App.php
View File

@ -22,9 +22,8 @@ class App extends BaseConfig
* explicitly and never rely on auto-guessing, especially in production
* environments.
*
* @var string
*/
public $baseURL = 'http://localhost:8080/';
public string $baseURL = 'http://localhost:8080/';
/**
* --------------------------------------------------------------------------
@ -36,9 +35,8 @@ class App extends BaseConfig
*
* http://cdn.example.com/
*
* @var string
*/
public $mediaBaseURL = 'http://127.0.0.2:8080/';
public string $mediaBaseURL = 'http://127.0.0.2:8080/';
/**
* --------------------------------------------------------------------------
@ -49,9 +47,8 @@ class App extends BaseConfig
* something else. If you are using mod_rewrite to remove the page set this
* variable so that it is blank.
*
* @var string
*/
public $indexPage = '';
public string $indexPage = '';
/**
* --------------------------------------------------------------------------
@ -68,9 +65,8 @@ class App extends BaseConfig
*
* WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
*
* @var string
*/
public $uriProtocol = 'REQUEST_URI';
public string $uriProtocol = 'REQUEST_URI';
/**
* --------------------------------------------------------------------------
@ -82,9 +78,8 @@ class App extends BaseConfig
* strings (like currency markers, numbers, etc), that your program
* should run under for this request.
*
* @var string
*/
public $defaultLocale = 'en';
public string $defaultLocale = 'en';
/**
* --------------------------------------------------------------------------
@ -95,10 +90,8 @@ class App extends BaseConfig
* language to use based on the value of the Accept-Language header.
*
* If false, no automatic detection will be performed.
*
* @var boolean
*/
public $negotiateLocale = true;
public bool $negotiateLocale = true;
/**
* --------------------------------------------------------------------------
@ -111,7 +104,7 @@ class App extends BaseConfig
*
* @var string[]
*/
public $supportedLocales = ['en', 'fr'];
public array $supportedLocales = ['en', 'fr'];
/**
* --------------------------------------------------------------------------
@ -121,9 +114,8 @@ class App extends BaseConfig
* The default timezone that will be used in your application to display
* dates with the date helper, and can be retrieved through app_timezone()
*
* @var string
*/
public $appTimezone = 'UTC';
public string $appTimezone = 'UTC';
/**
* --------------------------------------------------------------------------
@ -135,9 +127,8 @@ class App extends BaseConfig
*
* @see http://php.net/htmlspecialchars for a list of supported charsets.
*
* @var string
*/
public $charset = 'UTF-8';
public string $charset = 'UTF-8';
/**
* --------------------------------------------------------------------------
@ -149,9 +140,8 @@ class App extends BaseConfig
* secure, the user will be redirected to a secure version of the page
* and the HTTP Strict Transport Security header will be set.
*
* @var boolean
*/
public $forceGlobalSecureRequests = true;
public bool $forceGlobalSecureRequests = true;
/**
* --------------------------------------------------------------------------
@ -164,9 +154,8 @@ class App extends BaseConfig
* - `CodeIgniter\Session\Handlers\MemcachedHandler`
* - `CodeIgniter\Session\Handlers\RedisHandler`
*
* @var string
*/
public $sessionDriver = FileHandler::class;
public string $sessionDriver = FileHandler::class;
/**
* --------------------------------------------------------------------------
@ -175,9 +164,8 @@ class App extends BaseConfig
*
* The session cookie name, must contain only [0-9a-z_-] characters
*
* @var string
*/
public $sessionCookieName = 'ci_session';
public string $sessionCookieName = 'ci_session';
/**
* --------------------------------------------------------------------------
@ -187,9 +175,8 @@ class App extends BaseConfig
* The number of SECONDS you want the session to last.
* Setting to 0 (zero) means expire when the browser is closed.
*
* @var integer
*/
public $sessionExpiration = 7200;
public int $sessionExpiration = 7200;
/**
* --------------------------------------------------------------------------
@ -206,9 +193,8 @@ class App extends BaseConfig
*
* IMPORTANT: You are REQUIRED to set a valid save path!
*
* @var string
*/
public $sessionSavePath = WRITEPATH . 'session';
public string $sessionSavePath = WRITEPATH . 'session';
/**
* --------------------------------------------------------------------------
@ -220,9 +206,8 @@ class App extends BaseConfig
* WARNING: If you're using the database driver, don't forget to update
* your session table's PRIMARY KEY when changing this setting.
*
* @var boolean
*/
public $sessionMatchIP = false;
public bool $sessionMatchIP = false;
/**
* --------------------------------------------------------------------------
@ -231,9 +216,8 @@ class App extends BaseConfig
*
* How many seconds between CI regenerating the session ID.
*
* @var integer
*/
public $sessionTimeToUpdate = 300;
public int $sessionTimeToUpdate = 300;
/**
* --------------------------------------------------------------------------
@ -244,9 +228,8 @@ class App extends BaseConfig
* when auto-regenerating the session ID. When set to FALSE, the data
* will be later deleted by the garbage collector.
*
* @var boolean
*/
public $sessionRegenerateDestroy = false;
public bool $sessionRegenerateDestroy = false;
/**
* --------------------------------------------------------------------------
@ -259,7 +242,7 @@ class App extends BaseConfig
*
* @deprecated use Config\Cookie::$prefix property instead.
*/
public $cookiePrefix = '';
public string $cookiePrefix = '';
/**
* --------------------------------------------------------------------------
@ -272,7 +255,7 @@ class App extends BaseConfig
*
* @deprecated use Config\Cookie::$domain property instead.
*/
public $cookieDomain = '';
public string $cookieDomain = '';
/**
* --------------------------------------------------------------------------
@ -285,7 +268,7 @@ class App extends BaseConfig
*
* @deprecated use Config\Cookie::$path property instead.
*/
public $cookiePath = '/';
public string $cookiePath = '/';
/**
* --------------------------------------------------------------------------
@ -294,11 +277,11 @@ class App extends BaseConfig
*
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var boolean
* @var bool
*
* @deprecated use Config\Cookie::$secure property instead.
*/
public $cookieSecure = false;
public bool $cookieSecure = false;
/**
* --------------------------------------------------------------------------
@ -311,7 +294,7 @@ class App extends BaseConfig
*
* @deprecated use Config\Cookie::$httponly property instead.
*/
public $cookieHTTPOnly = true;
public bool $cookieHTTPOnly = true;
/**
* --------------------------------------------------------------------------
@ -337,7 +320,7 @@ class App extends BaseConfig
*
* @deprecated use Config\Cookie::$samesite property instead.
*/
public $cookieSameSite = 'Lax';
public string $cookieSameSite = 'Lax';
/**
* --------------------------------------------------------------------------
@ -357,7 +340,7 @@ class App extends BaseConfig
*
* @var string|string[]
*/
public $proxyIPs = '';
public string|array $proxyIPs = '';
/**
* --------------------------------------------------------------------------
@ -367,10 +350,8 @@ class App extends BaseConfig
* The token name.
*
* @deprecated Use `Config\Security` $tokenName property instead of using this property.
*
* @var string
*/
public $CSRFTokenName = 'csrf_test_name';
public string $CSRFTokenName = 'csrf_test_name';
/**
* --------------------------------------------------------------------------
@ -380,10 +361,8 @@ class App extends BaseConfig
* The header name.
*
* @deprecated Use `Config\Security` $headerName property instead of using this property.
*
* @var string
*/
public $CSRFHeaderName = 'X-CSRF-TOKEN';
public string $CSRFHeaderName = 'X-CSRF-TOKEN';
/**
* --------------------------------------------------------------------------
@ -393,10 +372,8 @@ class App extends BaseConfig
* The cookie name.
*
* @deprecated Use `Config\Security` $cookieName property instead of using this property.
*
* @var string
*/
public $CSRFCookieName = 'csrf_cookie_name';
public string $CSRFCookieName = 'csrf_cookie_name';
/**
* --------------------------------------------------------------------------
@ -406,10 +383,8 @@ class App extends BaseConfig
* The number in seconds the token should expire.
*
* @deprecated Use `Config\Security` $expire property instead of using this property.
*
* @var integer
*/
public $CSRFExpire = 7200;
public int $CSRFExpire = 7200;
/**
* --------------------------------------------------------------------------
@ -419,10 +394,8 @@ class App extends BaseConfig
* Regenerate token on every submission?
*
* @deprecated Use `Config\Security` $regenerate property instead of using this property.
*
* @var boolean
*/
public $CSRFRegenerate = true;
public bool $CSRFRegenerate = true;
/**
* --------------------------------------------------------------------------
@ -432,10 +405,8 @@ class App extends BaseConfig
* Redirect to previous page with error on failure?
*
* @deprecated Use `Config\Security` $redirect property instead of using this property.
*
* @var boolean
*/
public $CSRFRedirect = true;
public bool $CSRFRedirect = true;
/**
* --------------------------------------------------------------------------
@ -453,10 +424,8 @@ class App extends BaseConfig
* @see https://portswigger.net/web-security/csrf/samesite-cookies
*
* @deprecated Use `Config\Security` $samesite property instead of using this property.
*
* @var string
*/
public $CSRFSameSite = 'Lax';
public string $CSRFSameSite = 'Lax';
/**
* --------------------------------------------------------------------------
@ -473,48 +442,38 @@ class App extends BaseConfig
*
* @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
* @see http://www.w3.org/TR/CSP/
*
* @var boolean
*/
public $CSPEnabled = false;
public bool $CSPEnabled = false;
/**
* --------------------------------------------------------------------------
* Media root folder
* --------------------------------------------------------------------------
* Defines the root folder for media files storage
*
* @var string
*/
public $mediaRoot = 'media';
public string $mediaRoot = 'media';
/**
* --------------------------------------------------------------------------
* Admin gateway
* --------------------------------------------------------------------------
* Defines a base route for all admin pages
*
* @var string
*/
public $adminGateway = 'cp-admin';
public string $adminGateway = 'cp-admin';
/**
* --------------------------------------------------------------------------
* Auth gateway
* --------------------------------------------------------------------------
* Defines a base route for all authentication related pages
*
* @var string
*/
public $authGateway = 'cp-auth';
public string $authGateway = 'cp-auth';
/**
* --------------------------------------------------------------------------
* Install gateway
* --------------------------------------------------------------------------
* Defines a base route for instance installation
*
* @var string
*/
public $installGateway = 'cp-install';
public string $installGateway = 'cp-install';
}

23
app/Config/Cache.php
View File

@ -20,9 +20,8 @@ class Cache extends BaseConfig
* The name of the preferred handler that should be used. If for some reason
* it is not available, the $backupHandler will be used in its place.
*
* @var string
*/
public $handler = 'file';
public string $handler = 'file';
/**
* --------------------------------------------------------------------------
@ -33,9 +32,8 @@ class Cache extends BaseConfig
* unreachable. Often, 'file' is used here since the filesystem is
* always available, though that's not always practical for the app.
*
* @var string
*/
public $backupHandler = 'dummy';
public string $backupHandler = 'dummy';
/**
* --------------------------------------------------------------------------
@ -45,11 +43,9 @@ class Cache extends BaseConfig
* The path to where cache files should be stored, if using a file-based
* system.
*
* @var string
*
* @deprecated Use the driver-specific variant under $file
*/
public $storePath = WRITEPATH . 'cache/';
public string $storePath = WRITEPATH . 'cache/';
/**
* --------------------------------------------------------------------------
@ -68,7 +64,7 @@ class Cache extends BaseConfig
*
* @var boolean|string[]
*/
public $cacheQueryString = false;
public bool|array $cacheQueryString = false;
/**
* --------------------------------------------------------------------------
@ -78,9 +74,8 @@ class Cache extends BaseConfig
* This string is added to all cache item names to help avoid collisions
* if you run multiple applications with the same cache engine.
*
* @var string
*/
public $prefix = '';
public string $prefix = '';
/**
* --------------------------------------------------------------------------
@ -91,7 +86,7 @@ class Cache extends BaseConfig
*
* @var array<string, string|int|null>
*/
public $file = [
public array $file = [
'storePath' => WRITEPATH . 'cache/',
'mode' => 0640,
];
@ -107,7 +102,7 @@ class Cache extends BaseConfig
*
* @var array<string, string|int|boolean>
*/
public $memcached = [
public array $memcached = [
'host' => '127.0.0.1',
'port' => 11211,
'weight' => 1,
@ -123,7 +118,7 @@ class Cache extends BaseConfig
*
* @var array<string, string|int|null>
*/
public $redis = [
public array $redis = [
'host' => '127.0.0.1',
'password' => null,
'port' => 6379,
@ -141,7 +136,7 @@ class Cache extends BaseConfig
*
* @var array<string, string>
*/
public $validHandlers = [
public array $validHandlers = [
'dummy' => DummyHandler::class,
'file' => FileHandler::class,
'memcached' => MemcachedHandler::class,

38
app/Config/ContentSecurityPolicy.php
View File

@ -22,9 +22,8 @@ class ContentSecurityPolicy extends BaseConfig
/**
* Default CSP report context
*
* @var boolean
*/
public $reportOnly = false;
public bool $reportOnly = false;
/**
* Specifies a URL where a browser will send reports
@ -32,16 +31,15 @@ class ContentSecurityPolicy extends BaseConfig
*
* @var string|null
*/
public $reportURI;
public ?string $reportURI = null;
/**
* Instructs user agents to rewrite URL schemes, changing
* HTTP to HTTPS. This directive is for websites with
* large numbers of old URLs that need to be rewritten.
*
* @var boolean
*/
public $upgradeInsecureRequests = false;
public bool $upgradeInsecureRequests = false;
//-------------------------------------------------------------------------
// Sources allowed
@ -53,28 +51,28 @@ class ContentSecurityPolicy extends BaseConfig
*
* @var string|string[]|null
*/
public $defaultSrc;
public string|array|null $defaultSrc;
/**
* Lists allowed scripts' URLs.
*
* @var string|string[]
*/
public $scriptSrc = 'self';
public string|array $scriptSrc = 'self';
/**
* Lists allowed stylesheets' URLs.
*
* @var string|string[]
*/
public $styleSrc = 'self';
public string|array $styleSrc = 'self';
/**
* Defines the origins from which images can be loaded.
*
* @var string|string[]
*/
public $imageSrc = 'self';
public string|array $imageSrc = 'self';
/**
* Restricts the URLs that can appear in a page's `<base>` element.
@ -83,14 +81,14 @@ class ContentSecurityPolicy extends BaseConfig
*
* @var string|string[]|null
*/
public $baseURI;
public string|array|null $baseURI;
/**
* Lists the URLs for workers and embedded frame contents
*
* @var string|string[]
*/
public $childSrc = 'self';
public string|array $childSrc = 'self';
/**
* Limits the origins that you can connect to (via XHR,
@ -98,21 +96,21 @@ class ContentSecurityPolicy extends BaseConfig
*
* @var string|string[]
*/
public $connectSrc = 'self';
public string|array $connectSrc = 'self';
/**
* Specifies the origins that can serve web fonts.
*
* @var string|string[]
*/
public $fontSrc;
public string|array $fontSrc;
/**
* Lists valid endpoints for submission from `<form>` tags.
*
* @var string|string[]
*/
public $formAction = 'self';
public string|array $formAction = 'self';
/**
* Specifies the sources that can embed the current page.
@ -122,38 +120,38 @@ class ContentSecurityPolicy extends BaseConfig
*
* @var string|string[]|null
*/
public $frameAncestors;
public string|array|null $frameAncestors;
/**
* Restricts the origins allowed to deliver video and audio.
*
* @var string|string[]|null
*/
public $mediaSrc;
public string|array|null $mediaSrc;
/**
* Allows control over Flash and other plugins.
*
* @var string|string[]
*/
public $objectSrc = 'self';
public string|array $objectSrc = 'self';
/**
* @var string|string[]|null
*/
public $manifestSrc;
public string|array|null $manifestSrc;
/**
* Limits the kinds of plugins a page may invoke.
*
* @var string|string[]|null
*/
public $pluginTypes;
public string|array|null $pluginTypes;
/**
* List of actions allowed.
*
* @var string|string[]|null
*/
public $sandbox;
public string|array|null $sandbox;
}

25
app/Config/Cookie.php
View File

@ -14,9 +14,8 @@ class Cookie extends BaseConfig
*
* Set a cookie name prefix if you need to avoid collisions.
*
* @var string
*/
public $prefix = '';
public string $prefix = '';
/**
* --------------------------------------------------------------------------
@ -27,9 +26,8 @@ class Cookie extends BaseConfig
* cookie will not have the `Expires` attribute and will behave as a session
* cookie.
*
* @var DateTimeInterface|integer|string
*/
public $expires = 0;
public DateTimeInterface|int|string $expires = 0;
/**
* --------------------------------------------------------------------------
@ -38,9 +36,8 @@ class Cookie extends BaseConfig
*
* Typically will be a forward slash.
*
* @var string
*/
public $path = '/';
public string $path = '/';
/**
* --------------------------------------------------------------------------
@ -49,9 +46,8 @@ class Cookie extends BaseConfig
*
* Set to `.your-domain.com` for site-wide cookies.
*
* @var string
*/
public $domain = '';
public string $domain = '';
/**
* --------------------------------------------------------------------------
@ -60,9 +56,8 @@ class Cookie extends BaseConfig
*
* Cookie will only be set if a secure HTTPS connection exists.
*
* @var boolean
*/
public $secure = false;
public bool $secure = false;
/**
* --------------------------------------------------------------------------
@ -71,9 +66,8 @@ class Cookie extends BaseConfig
*
* Cookie will only be accessible via HTTP(S) (no JavaScript).
*
* @var boolean
*/
public $httponly = true;
public bool $httponly = true;
/**
* --------------------------------------------------------------------------
@ -95,9 +89,8 @@ class Cookie extends BaseConfig
* (empty string) means default SameSite attribute set by browsers (`Lax`)
* will be set on cookies. If set to `None`, `$secure` must also be set.
*
* @var string
*/
public $samesite = 'Lax';
public string $samesite = 'Lax';
/**
* --------------------------------------------------------------------------
@ -110,10 +103,8 @@ class Cookie extends BaseConfig
* If this is set to `true`, cookie names should be compliant of RFC 2616's
* list of allowed characters.
*
* @var boolean
*
* @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
* @see https://tools.ietf.org/html/rfc2616#section-2.2
*/
public $raw = false;
public bool $raw = false;
}

3
app/Config/Database.php
View File

@ -50,6 +50,8 @@ class Database extends Config
* This database connection is used when
* running PHPUnit database tests.
*
* @noRector StringClassNameToClassConstantRector
*
* @var array<string, string|bool|int|array>
*/
public array $tests = [
@ -58,7 +60,6 @@ class Database extends Config
'username' => '',
'password' => '',
'database' => ':memory:',
/** @noRector StringClassNameToClassConstantRector */
'DBDriver' => 'SQLite3',
'DBPrefix' => 'db_', // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
'pConnect' => false,

2
app/Config/DocTypes.php
View File

@ -9,7 +9,7 @@ class DocTypes
*
* @var array<string, string>
*/
public $list = [
public array $list = [
'xhtml11' =>
'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
'xhtml1-strict' =>

78
app/Config/Email.php
View File

@ -6,165 +6,135 @@ use CodeIgniter\Config\BaseConfig;
class Email extends BaseConfig
{
/**
* @var string
*/
public $fromEmail;
public string $fromEmail;
/**
* @var string
*/
public $fromName;
public string $fromName;
/**
* @var string
*/
public $recipients;
public string $recipients;
/**
* The "user agent"
*
* @var string
*/
public $userAgent = 'CodeIgniter';
public string $userAgent = 'CodeIgniter';
/**
* The mail sending protocol: mail, sendmail, smtp
*
* @var string
*/
public $protocol = 'mail';
public string $protocol = 'mail';
/**
* The server path to Sendmail.
*
* @var string
*/
public $mailPath = '/usr/sbin/sendmail';
public string $mailPath = '/usr/sbin/sendmail';
/**
* SMTP Server Address
*
* @var string
*/
public $SMTPHost;
public string $SMTPHost;
/**
* SMTP Username
*
* @var string
*/
public $SMTPUser;
public string $SMTPUser;
/**
* SMTP Password
*
* @var string
*/
public $SMTPPass;
public string $SMTPPass;
/**
* SMTP Port
*
* @var integer
*/
public $SMTPPort = 25;
public int $SMTPPort = 25;
/**
* SMTP Timeout (in seconds)
*
* @var integer
*/
public $SMTPTimeout = 5;
public int $SMTPTimeout = 5;
/**
* Enable persistent SMTP connections
*
* @var boolean
*/
public $SMTPKeepAlive = false;
public bool $SMTPKeepAlive = false;
/**
* SMTP Encryption. Either tls or ssl
*
* @var string
*/
public $SMTPCrypto = 'tls';
public string $SMTPCrypto = 'tls';
/**
* Enable word-wrap
*
* @var boolean
*/
public $wordWrap = true;
public bool $wordWrap = true;
/**
* Character count to wrap at
*
* @var integer
*/
public $wrapChars = 76;
public int $wrapChars = 76;
/**
* Type of mail, either 'text' or 'html'
*
* @var string
*/
public $mailType = 'text';
public string $mailType = 'text';
/**
* Character set (utf-8, iso-8859-1, etc.)
*
* @var string
*/
public $charset = 'UTF-8';
public string $charset = 'UTF-8';
/**
* Whether to validate the email address
*
* @var boolean
*/
public $validate = false;
public bool $validate = false;
/**
* Email Priority. 1 = highest. 5 = lowest. 3 = normal
*
* @var integer
*/
public $priority = 3;
public int $priority = 3;
/**
* Newline character. (Use “\r\n” to comply with RFC 822)
*
* @var string
*/
public $CRLF = "\r\n";
public string $CRLF = "\r\n";
/**
* Newline character. (Use “\r\n” to comply with RFC 822)
*
* @var string
*/
public $newline = "\r\n";
public string $newline = "\r\n";
/**
* Enable BCC Batch Mode.
*
* @var boolean
*/
public $BCCBatchMode = false;
public bool $BCCBatchMode = false;
/**
* Number of emails in each BCC batch
*
* @var integer
*/
public $BCCBatchSize = 200;
public int $BCCBatchSize = 200;
/**
* Enable notify message from server
*
* @var boolean
*/
public $DSN = false;
public bool $DSN = false;
}

12
app/Config/Encryption.php
View File

@ -21,9 +21,8 @@ class Encryption extends BaseConfig
* You need to ensure it is long enough for the cipher and mode you plan to use.
* See the user guide for more info.
*
* @var string
*/
public $key = '';
public string $key = '';
/**
* --------------------------------------------------------------------------
@ -36,9 +35,8 @@ class Encryption extends BaseConfig
* - OpenSSL
* - Sodium
*
* @var string
*/
public $driver = 'OpenSSL';
public string $driver = 'OpenSSL';
/**
* --------------------------------------------------------------------------
@ -50,9 +48,8 @@ class Encryption extends BaseConfig
*
* See the user guide for more information on padding.
*
* @var integer
*/
public $blockSize = 16;
public int $blockSize = 16;
/**
* --------------------------------------------------------------------------
@ -61,7 +58,6 @@ class Encryption extends BaseConfig
*
* HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
*
* @var string
*/
public $digest = 'SHA512';
public string $digest = 'SHA512';
}

8
app/Config/Exceptions.php
View File

@ -18,9 +18,8 @@ class Exceptions extends BaseConfig
*
* Default: true
*
* @var boolean
*/
public $log = true;
public bool $log = true;
/**
* --------------------------------------------------------------------------
@ -31,7 +30,7 @@ class Exceptions extends BaseConfig
*
* @var int[]
*/
public $ignoreCodes = [404];
public array $ignoreCodes = [404];
/**
* --------------------------------------------------------------------------
@ -42,7 +41,6 @@ class Exceptions extends BaseConfig
*
* Default: APPPATH.'Views/errors'
*
* @var string
*/
public $errorViewPath = APPPATH . 'Views/errors';
public string $errorViewPath = APPPATH . 'Views/errors';
}

8
app/Config/Filters.php
View File

@ -19,7 +19,7 @@ class Filters extends BaseConfig
*
* @var array<string, string>
*/
public $aliases = [
public array $aliases = [
'csrf' => CSRF::class,
'toolbar' => DebugToolbar::class,
'honeypot' => Honeypot::class,
@ -35,7 +35,7 @@ class Filters extends BaseConfig
*
* @var array<string, string[]>
*/
public $globals = [
public array $globals = [
'before' => [
// 'honeypot',
// 'csrf',
@ -55,7 +55,7 @@ class Filters extends BaseConfig
*
* @var array<string, string[]>
*/
public $methods = [];
public array $methods = [];
/**
* List of filter aliases that should run on any
@ -66,7 +66,7 @@ class Filters extends BaseConfig
*
* @var array<string, array<string, string[]>>
*/
public $filters = [];
public array $filters = [];
public function __construct()
{

6
app/Config/Format.php
View File

@ -24,7 +24,7 @@ class Format extends BaseConfig
*
* @var string[]
*/
public $supportedResponseFormats = [
public array $supportedResponseFormats = [
'application/json',
'application/xml', // machine-readable XML
'text/xml', // human-readable XML
@ -41,7 +41,7 @@ class Format extends BaseConfig
*
* @var array<string, string>
*/
public $formatters = [
public array $formatters = [
'application/json' => JSONFormatter::class,
'application/xml' => XMLFormatter::class,
'text/xml' => XMLFormatter::class,
@ -57,7 +57,7 @@ class Format extends BaseConfig
*
* @var array<string, int>
*/
public $formatterOptions = [
public array $formatterOptions = [
'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
'application/xml' => 0,
'text/xml' => 0,

2
app/Config/Generators.php
View File

@ -25,7 +25,7 @@ class Generators extends BaseConfig
*
* @var array<string, string>
*/
public $views = [
public array $views = [
'make:command' =>
'CodeIgniter\Commands\Generators\Views\command.tpl.php',
'make:controller' =>

15
app/Config/Honeypot.php
View File

@ -9,35 +9,30 @@ class Honeypot extends BaseConfig
/**
* Makes Honeypot visible or not to human
*
* @var boolean
*/
public $hidden = true;
public bool $hidden = true;
/**
* Honeypot Label Content
*
* @var string
*/
public $label = 'Fill This Field';
public string $label = 'Fill This Field';
/**
* Honeypot Field Name
*
* @var string
*/
public $name = 'honeypot';
public string $name = 'honeypot';
/**
* Honeypot HTML Template
*
* @var string
*/
public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
public string $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
/**
* Honeypot container
*
* @var string
*/
public $container = '<div style="display:none">{template}</div>';
public string $container = '<div style="display:none">{template}</div>';
}

58
app/Config/Images.php
View File

@ -11,24 +11,22 @@ class Images extends BaseConfig
/**
* Default handler used if no other handler is specified.
*
* @var string
*/
public $defaultHandler = 'gd';
public string $defaultHandler = 'gd';
/**
* The path to the image library.
* Required for ImageMagick, GraphicsMagick, or NetPBM.
*
* @var string
*/
public $libraryPath = '/usr/local/bin/convert';
public string $libraryPath = '/usr/local/bin/convert';
/**
* The available handler classes.
*
* @var array<string, string>
*/
public $handlers = [
public array $handlers = [
'gd' => GDHandler::class,
'imagick' => ImageMagickHandler::class,
];
@ -41,34 +39,19 @@ class Images extends BaseConfig
| All uploaded images are of 1:1 ratio (width and height are the same).
*/
/**
* @var integer
*/
public $thumbnailSize = 150;
/**
* @var integer
*/
public $mediumSize = 320;
/**
* @var integer
*/
public $largeSize = 1024;
public int $thumbnailSize = 150;
public int $mediumSize = 320;
public int $largeSize = 1024;
/**
* Size of images linked in the rss feed (should be between 1400 and 3000)
*
* @var integer
*/
public $feedSize = 1400;
public int $feedSize = 1400;
/**
* Size for ID3 tag cover art (should be between 300 and 800)
*
* @var integer
*/
public $id3Size = 500;
public int $id3Size = 500;
/*
|--------------------------------------------------------------------------
@ -77,28 +60,13 @@ class Images extends BaseConfig
| The properties listed below set the name extensions for the resized images
*/
/**
* @var string
*/
public $thumbnailSuffix = '_thumbnail';
public string $thumbnailSuffix = '_thumbnail';
/**
* @var string
*/
public $mediumSuffix = '_medium';
public string $mediumSuffix = '_medium';
/**
* @var string
*/
public $largeSuffix = '_large';
public string $largeSuffix = '_large';
/**
* @var string
*/
public $feedSuffix = '_feed';
public string $feedSuffix = '_feed';
/**
* @var string
*/
public $id3Suffix = '_id3';
public string $id3Suffix = '_id3';
}

57
app/Config/Kint.php
View File

@ -26,52 +26,35 @@ class Kint extends BaseConfig
/**
* @var string[]
*/
public $plugins = [];
public array $plugins = [];
/**
* @var int
*/
public $maxDepth = 6;
public int $maxDepth = 6;
/**
* @var bool
*/
public $displayCalledFrom = true;
public bool $displayCalledFrom = true;
/**
* @var bool
*/
public $expanded = false;
public bool $expanded = false;
/*
|--------------------------------------------------------------------------
| RichRenderer Settings
|--------------------------------------------------------------------------
*/
/**
* @var string
*/
public $richTheme = 'aante-light.css';
/**
* @var bool
*/
public $richFolder = false;
public string $richTheme = 'aante-light.css';
/**
* @var int
*/
public $richSort = Renderer::SORT_FULL;
public bool $richFolder = false;
public int $richSort = Renderer::SORT_FULL;
/**
* @var string[]
*/
public $richObjectPlugins = [];
public array $richObjectPlugins = [];
/**
* @var string[]
*/
public $richTabPlugins = [];
public array $richTabPlugins = [];
/*
|--------------------------------------------------------------------------
@ -79,23 +62,11 @@ class Kint extends BaseConfig
|--------------------------------------------------------------------------
*/
/**
* @var bool
*/
public $cliColors = true;
public bool $cliColors = true;
/**
* @var bool
*/
public $cliForceUTF8 = false;
public bool $cliForceUTF8 = false;
/**
* @var bool
*/
public $cliDetectWidth = true;
public bool $cliDetectWidth = true;
/**
* @var int
*/
public $cliMinWidth = 40;
public int $cliMinWidth = 40;
}

16
app/Config/Logger.php
View File

@ -36,7 +36,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 integer|int[]
* @var int|int[]
*/
public int|array $threshold = 4;
@ -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, string|int|array<string, string>>
* @var array<string, mixed>
*/
public array $handlers = [
/*
@ -123,17 +123,5 @@ class Logger extends BaseConfig
*/
'path' => '',
],
/**
* The ChromeLoggerHandler requires the use of the Chrome web browser
* and the ChromeLogger extension. Uncomment this block to use it.
*/
// 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
// /*
// * The log levels that this handler will handle.
// */
// 'handles' => ['critical', 'alert', 'emergency', 'debug',
// 'error', 'info', 'notice', 'warning'],
// ]
];
}

9
app/Config/Migrations.php
View File

@ -16,9 +16,8 @@ class Migrations extends BaseConfig
* You should enable migrations whenever you intend to do a schema migration
* and disable it back when you're done.
*
* @var boolean
*/
public $enabled = true;
public bool $enabled = true;
/**
* --------------------------------------------------------------------------
@ -31,9 +30,8 @@ class Migrations extends BaseConfig
* table to the $config['migration_version'] if they are not the same it
* will migrate up. This must be set.
*
* @var string
*/
public $table = 'migrations';
public string $table = 'migrations';
/**
* --------------------------------------------------------------------------
@ -49,7 +47,6 @@ class Migrations extends BaseConfig
* - Y-m-d-His_
* - Y_m_d_His_
*
* @var string
*/
public $timestampFormat = 'Y-m-d-His_';
public string $timestampFormat = 'Y-m-d-His_';
}

5
app/Config/Pager.php
View File

@ -20,7 +20,7 @@ class Pager extends BaseConfig
*
* @var array<string, string>
*/
public $templates = [
public array $templates = [
'default_full' => 'App\Views\pager\default_full',
'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
'default_head' => 'CodeIgniter\Pager\Views\default_head',
@ -33,7 +33,6 @@ class Pager extends BaseConfig
*
* The default number of results shown in a single page.
*
* @var integer
*/
public $perPage = 20;
public int $perPage = 20;
}

15
app/Config/Paths.php
View File

@ -24,9 +24,8 @@ class Paths
* This must contain the name of your "system" folder. Include
* the path if the folder is not in the same directory as this file.
*
* @var string
*/
public $systemDirectory =
public string $systemDirectory =
__DIR__ . '/../../vendor/codeigniter4/codeigniter4/system';
/**
* ---------------------------------------------------------------
@ -40,9 +39,8 @@ class Paths
*
* @see http://codeigniter.com/user_guide/general/managing_apps.html
*
* @var string
*/
public $appDirectory = __DIR__ . '/..';
public string $appDirectory = __DIR__ . '/..';
/**
* ---------------------------------------------------------------
@ -55,9 +53,8 @@ class Paths
* for maximum security, keeping it out of the app and/or
* system directories.
*
* @var string
*/
public $writableDirectory = __DIR__ . '/../../writable';
public string $writableDirectory = __DIR__ . '/../../writable';
/**
* ---------------------------------------------------------------
@ -66,9 +63,8 @@ class Paths
*
* This variable must contain the name of your "tests" directory.
*
* @var string
*/
public $testsDirectory = __DIR__ . '/../../tests';
public string $testsDirectory = __DIR__ . '/../../tests';
/**
* ---------------------------------------------------------------
@ -80,7 +76,6 @@ class Paths
* default this is in `app/Views`. This value
* is used when no value is provided to `Services::renderer()`.
*
* @var string
*/
public $viewDirectory = __DIR__ . '/../Views';
public string $viewDirectory = __DIR__ . '/../Views';
}

20
app/Config/Security.php
View File

@ -13,9 +13,8 @@ class Security extends BaseConfig
*
* Token name for Cross Site Request Forgery protection cookie.
*
* @var string
*/
public $tokenName = 'csrf_test_name';
public string $tokenName = 'csrf_test_name';
/**
* --------------------------------------------------------------------------
@ -24,9 +23,8 @@ class Security extends BaseConfig
*
* Token name for Cross Site Request Forgery protection cookie.
*
* @var string
*/
public $headerName = 'X-CSRF-TOKEN';
public string $headerName = 'X-CSRF-TOKEN';
/**
* --------------------------------------------------------------------------
@ -35,9 +33,8 @@ class Security extends BaseConfig
*
* Cookie name for Cross Site Request Forgery protection cookie.
*
* @var string
*/
public $cookieName = 'csrf_cookie_name';
public string $cookieName = 'csrf_cookie_name';
/**
* --------------------------------------------------------------------------
@ -48,9 +45,8 @@ class Security extends BaseConfig
*
* Defaults to two hours (in seconds).
*
* @var integer
*/
public $expires = 7200;
public int $expires = 7200;
/**
* --------------------------------------------------------------------------
@ -59,9 +55,8 @@ class Security extends BaseConfig
*
* Regenerate CSRF Token on every request.
*
* @var boolean
*/
public $regenerate = true;
public bool $regenerate = true;
/**
* --------------------------------------------------------------------------
@ -70,9 +65,8 @@ class Security extends BaseConfig
*
* Redirect to previous page with error on failure.
*
* @var boolean
*/
public $redirect = true;
public bool $redirect = true;
/**
* --------------------------------------------------------------------------
@ -88,5 +82,5 @@ class Security extends BaseConfig
*
* @var string 'Lax'|'None'|'Strict'
*/
public $samesite = 'Lax';
public string $samesite = 'Lax';
}

11
app/Config/Toolbar.php
View File

@ -33,7 +33,7 @@ class Toolbar extends BaseConfig
*
* @var string[]
*/
public $collectors = [
public array $collectors = [
Timers::class,
Database::class,
Logs::class,
@ -53,9 +53,8 @@ class Toolbar extends BaseConfig
* helping to conserve file space used to store them. You can set it to
* 0 (zero) to not have any history stored, or -1 for unlimited history.
*
* @var integer
*/
public $maxHistory = 20;
public int $maxHistory = 20;
/**
* --------------------------------------------------------------------------
@ -65,9 +64,8 @@ class Toolbar extends BaseConfig
* The full path to the the views that are used by the toolbar.
* This MUST have a trailing slash.
*
* @var string
*/
public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
public string $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
/**
* --------------------------------------------------------------------------
@ -81,7 +79,6 @@ class Toolbar extends BaseConfig
*
* `$maxQueries` defines the maximum amount of queries that will be stored.
*
* @var integer
*/
public $maxQueries = 100;
public int $maxQueries = 100;
}

8
app/Config/UserAgents.php
View File

@ -22,7 +22,7 @@ class UserAgents extends BaseConfig
*
* @var array<string, string>
*/
public $platforms = [
public array $platforms = [
'windows nt 10.0' => 'Windows 10',
'windows nt 6.3' => 'Windows 8.1',
'windows nt 6.2' => 'Windows 8',
@ -77,7 +77,7 @@ class UserAgents extends BaseConfig
*
* @var array<string, string>
*/
public $browsers = [
public array $browsers = [
'OPR' => 'Opera',
'Flock' => 'Flock',
'Edge' => 'Spartan',
@ -118,7 +118,7 @@ class UserAgents extends BaseConfig
*
* @var array<string, string>
*/
public $mobiles = [
public array $mobiles = [
// legacy array, old values commented out
'mobileexplorer' => 'Mobile Explorer',
// 'openwave' => 'Open Wave',
@ -227,7 +227,7 @@ class UserAgents extends BaseConfig
*
* @var array<string, string>
*/
public $robots = [
public array $robots = [
'googlebot' => 'Googlebot',
'msnbot' => 'MSNBot',
'baiduspider' => 'Baiduspider',

4
app/Config/Validation.php
View File

@ -22,7 +22,7 @@ class Validation
*
* @var string[]
*/
public $ruleSets = [
public array $ruleSets = [
Rules::class,
FormatRules::class,
FileRules::class,
@ -38,7 +38,7 @@ class Validation
*
* @var array<string, string>
*/
public $templates = [
public array $templates = [
'list' => 'CodeIgniter\Validation\Views\list',
'single' => 'CodeIgniter\Validation\Views\single',
];

11
app/Controllers/Admin/ContributorController.php
View File

@ -19,15 +19,8 @@ use CodeIgniter\HTTP\RedirectResponse;
class ContributorController extends BaseController
{
/**
* @var Podcast
*/
protected $podcast;
/**
* @var User|null
*/
protected $user;
protected Podcast $podcast;
protected ?User $user;
public function _remap(string $method, string ...$params): mixed
{

11
app/Controllers/Admin/EpisodeController.php
View File

@ -23,15 +23,8 @@ use CodeIgniter\I18n\Time;
class EpisodeController extends BaseController
{
/**
* @var Podcast
*/
protected $podcast;
/**
* @var Episode|null
*/
protected $episode;
protected Podcast $podcast;
protected ?Episode $episode;
public function _remap(string $method, string ...$params): mixed
{

5
app/Controllers/Admin/PageController.php
View File

@ -15,10 +15,7 @@ use App\Models\PageModel;
class PageController extends BaseController
{
/**
* @var Page|null
*/
protected $page;
protected ?Page $page;
public function _remap(string $method, string ...$params): mixed
{

5
app/Controllers/Admin/PersonController.php
View File

@ -16,10 +16,7 @@ use App\Models\PersonModel;
class PersonController extends BaseController
{
/**
* @var Person|null
*/
protected $person;
protected ?Person $person;
public function _remap(string $method, string ...$params): mixed
{

2
app/Controllers/Admin/PodcastController.php
View File

@ -25,7 +25,7 @@ class PodcastController extends BaseController
/**
* @var Podcast
*/
protected $podcast;
protected Podcast $podcast;
public function _remap(string $method, string ...$params): mixed
{

30
app/Controllers/Admin/PodcastImportController.php
View File

@ -32,7 +32,7 @@ class PodcastImportController extends BaseController
/**
* @var Podcast|null
*/
protected $podcast;
protected ?Podcast $podcast;
public function _remap(string $method, string ...$params): mixed
{
@ -122,7 +122,7 @@ class PodcastImportController extends BaseController
try {
if (
isset($nsItunes->image) &&
property_exists($nsItunes, 'image') && $nsItunes->image !== null &&
$nsItunes->image->attributes()['href'] !== null
) {
$imageFile = download_file(
@ -135,7 +135,7 @@ class PodcastImportController extends BaseController
}
$location = null;
if (isset($nsPodcast->location)) {
if (property_exists($nsPodcast, 'location') && $nsPodcast->location !== null) {
$location = new Location(
(string) $nsPodcast->location,
(string) $nsPodcast->location->attributes()['geo'],
@ -160,7 +160,7 @@ class PodcastImportController extends BaseController
'language_code' => $this->request->getPost('language'),
'category_id' => $this->request->getPost('category'),
'parental_advisory' =>
isset($nsItunes->explicit)
property_exists($nsItunes, 'explicit') && $nsItunes->explicit !== null
? (in_array((string) $nsItunes->explicit, ['yes', 'true'])
? 'explicit'
: (in_array((string) $nsItunes->explicit, ['no', 'false'])
@ -170,16 +170,12 @@ class PodcastImportController extends BaseController
'owner_name' => (string) $nsItunes->owner->name,
'owner_email' => (string) $nsItunes->owner->email,
'publisher' => (string) $nsItunes->author,
'type' => isset($nsItunes->type) ? (string) $nsItunes->type : 'episodic',
'type' => property_exists($nsItunes, 'type') && $nsItunes->type !== null ? (string) $nsItunes->type : 'episodic',
'copyright' => (string) $feed->channel[0]->copyright,
'is_blocked' =>
isset($nsItunes->block)
? (string) $nsItunes->block === 'yes'
: false,
property_exists($nsItunes, 'block') && $nsItunes->block !== null && (string) $nsItunes->block === 'yes',
'is_completed' =>
isset($nsItunes->complete)
? (string) $nsItunes->complete === 'yes'
: false,
property_exists($nsItunes, 'complete') && $nsItunes->complete !== null && (string) $nsItunes->complete === 'yes',
'location' => $location,
'created_by' => user_id(),
'updated_by' => user_id(),
@ -337,7 +333,7 @@ class PodcastImportController extends BaseController
};
if (
isset($nsItunes->image) &&
property_exists($nsItunes, 'image') && $nsItunes->image !== null &&
$nsItunes->image->attributes()['href'] !== null
) {
$episodeImage = new Image(
@ -350,7 +346,7 @@ class PodcastImportController extends BaseController
}
$location = null;
if (isset($nsPodcast->location)) {
if (property_exists($nsPodcast, 'location') && $nsPodcast->location !== null) {
$location = new Location(
(string) $nsPodcast->location,
(string) $nsPodcast->location->attributes()['geo'],
@ -372,7 +368,7 @@ class PodcastImportController extends BaseController
'description_html' => $itemDescriptionHtml,
'image' => $episodeImage,
'parental_advisory' =>
isset($nsItunes->explicit)
property_exists($nsItunes, 'explicit') && $nsItunes->explicit !== null
? (in_array((string) $nsItunes->explicit, ['yes', 'true'])
? 'explicit'
: (in_array((string) $nsItunes->explicit, ['no', 'false'])
@ -387,12 +383,10 @@ class PodcastImportController extends BaseController
$this->request->getPost('season_number') === null
? $nsItunes->season
: $this->request->getPost('season_number'),
'type' => isset($nsItunes->episodeType)
'type' => property_exists($nsItunes, 'episodeType') && $nsItunes->episodeType !== null
? (string) $nsItunes->episodeType
: 'full',
'is_blocked' => isset($nsItunes->block)
? (string) $nsItunes->block === 'yes'
: false,
'is_blocked' => property_exists($nsItunes, 'block') && $nsItunes->block !== null && (string) $nsItunes->block === 'yes',
'location' => $location,
'created_by' => user_id(),
'updated_by' => user_id(),

2
app/Controllers/Admin/PodcastPersonController.php
View File

@ -19,7 +19,7 @@ class PodcastPersonController extends BaseController
/**
* @var Podcast
*/
protected $podcast;
protected Podcast $podcast;
public function _remap(string $method, string ...$params): mixed
{

2
app/Controllers/Admin/PodcastPlatformController.php
View File

@ -20,7 +20,7 @@ class PodcastPlatformController extends BaseController
/**
* @var Podcast|null
*/
protected $podcast;
protected ?Podcast $podcast;
public function _remap(string $method, string ...$params): mixed
{

5
app/Controllers/Admin/UserController.php
View File

@ -17,10 +17,7 @@ use Config\Services;
class UserController extends BaseController
{
/**
* @var User|null
*/
protected $user;
protected ?User $user;
public function _remap(string $method, string ...$params): mixed
{

10
app/Controllers/EpisodeController.php
View File

@ -22,15 +22,9 @@ class EpisodeController extends BaseController
{
use AnalyticsTrait;
/**
* @var Podcast
*/
protected $podcast;
protected Podcast $podcast;
/**
* @var Episode
*/
protected $episode;
protected Episode $episode;
public function _remap(string $method, string ...$params): mixed
{

12
app/Controllers/NoteController.php
View File

@ -25,15 +25,8 @@ class NoteController extends ActivityPubNoteController
{
use AnalyticsTrait;
/**
* @var Podcast
*/
protected $podcast;
/**
* @var Actor
*/
protected $actor;
protected Podcast $podcast;
protected Actor $actor;
/**
* @var string[]
@ -219,6 +212,7 @@ class NoteController extends ActivityPubNoteController
}
$action = $this->request->getPost('action');
/** @phpstan-ignore-next-line */
switch ($action) {
case 'favourite':
return $this->attemptFavourite();

5
app/Controllers/PageController.php
View File

@ -16,10 +16,7 @@ use App\Models\PodcastModel;
class PageController extends BaseController
{
/**
* @var Page|null
*/
protected $page;
protected ?Page $page;
public function _remap(string $method, string ...$params): mixed
{

2
app/Controllers/PodcastController.php
View File

@ -22,7 +22,7 @@ class PodcastController extends BaseController
/**
* @var Podcast
*/
protected $podcast;
protected Podcast $podcast;
public function _remap(string $method, string ...$params): mixed
{

2
app/Database/Migrations/2020-12-25-140000_add_episodes_persons.php
View File

@ -44,7 +44,7 @@ class AddEpisodesPersons extends Migration
'constraint' => 32,
],
]);
$this->forge->addPrimaryKey('id', true);
$this->forge->addPrimaryKey('id');
$this->forge->addUniqueKey([
'podcast_id',
'episode_id',

4
app/Database/Seeds/AuthSeeder.php
View File

@ -18,7 +18,7 @@ class AuthSeeder extends Seeder
/**
* @var array<string, string>[]
*/
protected $groups = [
protected array $groups = [
[
'name' => 'superadmin',
'description' =>
@ -43,7 +43,7 @@ class AuthSeeder extends Seeder
*
* @var array<string, array<string, string|array>[]>
*/
protected $permissions = [
protected array $permissions = [
'users' => [
[
'name' => 'create',

4
app/Database/Seeds/FakePodcastsAnalyticsSeeder.php
View File

@ -114,11 +114,11 @@ class FakePodcastsAnalyticsSeeder extends Seeder
try {
$city = $cityReader->city($fakeIp);
$countryCode = empty($city->country->isoCode)
$countryCode = $city->country->isoCode === null
? 'N/A'
: $city->country->isoCode;
$regionCode = empty($city->subdivisions[0]->isoCode)
$regionCode = $city->subdivisions[0]->isoCode === null
? 'N/A'
: $city->subdivisions[0]->isoCode;
$latitude = round($city->location->latitude, 3);

6
app/Database/Seeds/FakeWebsiteAnalyticsSeeder.php
View File

@ -21,7 +21,7 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
/**
* @var string[]
*/
protected $keywords = [
protected array $keywords = [
'all the smoke podcast',
'apple podcast',
'bad friends podcast',
@ -77,7 +77,7 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
/**
* @var string[]
*/
protected $domains = [
protected array $domains = [
'360.cn ',
'adobe.com ',
'aliexpress.com ',
@ -133,7 +133,7 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
/**
* @var string[]
*/
protected $browsers = [
protected array $browsers = [
'Android Browser',
'Avast Secure Browser',
'BlackBerry Browser',

2
app/Entities/Category.php
View File

@ -36,7 +36,7 @@ class Category extends Entity
public function getParent(): ?Category
{
if (empty($this->parent_id)) {
if ($this->parent_id === null) {
return null;
}

24
app/Entities/Episode.php
View File

@ -95,19 +95,19 @@ class Episode extends Entity
protected File $chapters_file;
/**
* @var Person[]
* @var Person[]|null
*/
protected $persons = [];
protected ?array $persons = null;
/**
* @var Soundbite[]
* @var Soundbite[]|null
*/
protected $soundbites = [];
protected ?array $soundbites = null;
/**
* @var Note[]
* @var Note[]|null
*/
protected $notes = [];
protected ?array $notes = null;
protected ?Location $location = null;
protected string $custom_rss_string;
@ -348,13 +348,13 @@ class Episode extends Entity
*/
public function getPersons(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Episode must be created before getting persons.',
);
}
if (empty($this->persons)) {
if ($this->persons === null) {
$this->persons = (new PersonModel())->getEpisodePersons(
$this->podcast_id,
$this->id,
@ -371,13 +371,13 @@ class Episode extends Entity
*/
public function getSoundbites(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Episode must be created before getting soundbites.',
);
}
if (empty($this->soundbites)) {
if ($this->soundbites === null) {
$this->soundbites = (new SoundbiteModel())->getEpisodeSoundbites(
$this->getPodcast()->id,
$this->id,
@ -392,13 +392,13 @@ class Episode extends Entity
*/
public function getNotes(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Episode must be created before getting soundbites.',
);
}
if (empty($this->notes)) {
if ($this->notes === null) {
$this->notes = (new NoteModel())->getEpisodeNotes($this->id);
}

8
app/Entities/Location.php
View File

@ -61,10 +61,8 @@ class Location extends Entity
/**
* Fetches places from Nominatim OpenStreetMap
*
* @return array<string, string>|null
*/
public function fetchOsmLocation(): self
public function fetchOsmLocation(): static
{
$client = Services::curlrequest();
@ -93,11 +91,11 @@ class Location extends Entity
return $this;
}
if (isset($places[0]->lat, $places[0]->lon)) {
if (property_exists($places[0], 'lat') && $places[0]->lat !== null && (property_exists($places[0], 'lon') && $places[0]->lon !== null)) {
$this->attributes['geo'] = "geo:{$places[0]->lat},{$places[0]->lon}";
}
if (isset($places[0]->osm_type, $places[0]->osm_id)) {
if (property_exists($places[0], 'osm_type') && $places[0]->osm_type !== null && (property_exists($places[0], 'osm_id') && $places[0]->osm_id !== null)) {
$this->attributes['osm'] = strtoupper(substr($places[0]->osm_type, 0, 1)) . $places[0]->osm_id;
}

12
app/Entities/Person.php
View File

@ -22,14 +22,16 @@ use RuntimeException;
* @property string $image_mimetype
* @property int $created_by
* @property int $updated_by
* @property string[]|null $roles
* @property object[]|null $roles
*/
class Person extends Entity
{
protected Image $image;
protected ?int $podcast_id = null;
protected ?int $episode_id = null;
/**
* @var string[]|null
* @var object[]|null
*/
protected ?array $roles = null;
@ -75,17 +77,17 @@ class Person extends Entity
}
/**
* @return stdClass[]
* @return object[]
*/
public function getRoles(): array {
if ($this->podcast_id === null) {
if ($this->attributes['podcast_id'] === null) {
throw new RuntimeException(
'Person must have a podcast_id before getting roles.',
);
}
if ($this->roles === null) {
$this->roles = (new PersonModel())->getPersonRoles($this->id, $this->podcast_id, $this->episode_id);
$this->roles = (new PersonModel())->getPersonRoles($this->id, $this->attributes['podcast_id'], $this->episode_id);
}
return $this->roles;

68
app/Entities/Podcast.php
View File

@ -84,44 +84,44 @@ class Podcast extends Entity
protected ?Category $category = null;
/**
* @var Category[]
* @var Category[]|null
*/
protected $other_categories = [];
protected ?array $other_categories = null;
/**
* @var string[]
* @var string[]|null
*/
protected $other_categories_ids = [];
protected ?array $other_categories_ids = null;
/**
* @var Episode[]
* @var Episode[]|null
*/
protected $episodes = [];
protected ?array $episodes = null;
/**
* @var Person[]
* @var Person[]|null
*/
protected $persons = [];
protected ?array $persons = null;
/**
* @var User[]
* @var User[]|null
*/
protected $contributors = [];
protected ?array $contributors = null;
/**
* @var Platform[]
* @var Platform[]|null
*/
protected $podcasting_platforms = [];
protected ?array $podcasting_platforms = null;
/**
* @var Platform[]
* @var Platform[]|null
*/
protected $social_platforms = [];
protected ?array $social_platforms = null;
/**
* @var Platform[]
* @var Platform[]|null
*/
protected $funding_platforms = [];
protected ?array $funding_platforms = null;
protected ?Location $location = null;
protected string $custom_rss_string;
@ -216,13 +216,13 @@ class Podcast extends Entity
*/
public function getEpisodes(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting episodes.',
);
}
if (empty($this->episodes)) {
if ($this->episodes === null) {
$this->episodes = (new EpisodeModel())->getPodcastEpisodes(
$this->id,
$this->type,
@ -239,13 +239,13 @@ class Podcast extends Entity
*/
public function getPersons(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting persons.',
);
}
if (empty($this->persons)) {
if ($this->persons === null) {
$this->persons = (new PersonModel())->getPodcastPersons($this->id);
}
@ -279,13 +279,13 @@ class Podcast extends Entity
*/
public function getContributors(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcasts must be created before getting contributors.',
);
}
if (empty($this->contributors)) {
if ($this->contributors === null) {
$this->contributors = (new UserModel())->getPodcastContributors(
$this->id,
);
@ -351,13 +351,13 @@ class Podcast extends Entity
*/
public function getPodcastingPlatforms(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting podcasting platform links.',
);
}
if (empty($this->podcasting_platforms)) {
if ($this->podcasting_platforms === null) {
$this->podcasting_platforms = (new PlatformModel())->getPodcastPlatforms(
$this->id,
'podcasting',
@ -374,13 +374,13 @@ class Podcast extends Entity
*/
public function getSocialPlatforms(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting social platform links.',
);
}
if (empty($this->social_platforms)) {
if ($this->social_platforms === null) {
$this->social_platforms = (new PlatformModel())->getPodcastPlatforms(
$this->id,
'social',
@ -397,13 +397,13 @@ class Podcast extends Entity
*/
public function getFundingPlatforms(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting funding platform links.',
);
}
if (empty($this->funding_platforms)) {
if ($this->funding_platforms === null) {
$this->funding_platforms = (new PlatformModel())->getPodcastPlatforms(
$this->id,
'funding',
@ -418,13 +418,13 @@ class Podcast extends Entity
*/
public function getOtherCategories(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Podcast must be created before getting other categories.',
);
}
if (empty($this->other_categories)) {
if ($this->other_categories === null) {
$this->other_categories = (new CategoryModel())->getPodcastCategories(
$this->id,
);
@ -434,11 +434,11 @@ class Podcast extends Entity
}
/**
* @return array<int>
* @return int[]
*/
public function getOtherCategoriesIds(): array
{
if (empty($this->other_categories_ids)) {
if ($this->other_categories_ids === null) {
$this->other_categories_ids = array_column(
$this->getOtherCategories(),
'id',
@ -497,7 +497,7 @@ class Podcast extends Entity
*/
function getCustomRssString(): string
{
if (empty($this->attributes['custom_rss'])) {
if ($this->attributes['custom_rss'] === null) {
return '';
}
@ -521,7 +521,7 @@ class Podcast extends Entity
*/
function setCustomRssString(string $customRssString): static
{
if (empty($customRssString)) {
if ($customRssString === '') {
return $this;
}

2
app/Filters/PermissionFilter.php
View File

@ -28,7 +28,7 @@ class PermissionFilter implements FilterInterface
{
helper('auth');
if (empty($params)) {
if ($params === null) {
return;
}

5
app/Helpers/components_helper.php
View File

@ -78,7 +78,7 @@ if (!function_exists('button')) {
' ' .
$variantClass[$options['variant']];
if (!empty($customAttributes['class'])) {
if (array_key_exists('class', $customAttributes)) {
$buttonClass .= ' ' . $customAttributes['class'];
unset($customAttributes['class']);
}
@ -298,6 +298,7 @@ if (!function_exists('publication_button')) {
int $episodeId,
string $publicationStatus
): string {
/** @phpstan-ignore-next-line */
switch ($publicationStatus) {
case 'not_published':
$label = lang('Episode.publish');
@ -406,7 +407,7 @@ if (!function_exists('location_link')) {
[
'class' =>
'inline-flex items-baseline hover:underline' .
(empty($class) ? '' : " {$class}"),
($class === '' ? '' : " {$class}"),
'target' => '_blank',
'rel' => 'noreferrer noopener',
],

6
app/Helpers/id3_helper.php
View File

@ -62,7 +62,7 @@ if (!function_exists('write_audio_file_tags')) {
$TagData = [
'title' => [$episode->title],
'artist' => [
empty($episode->podcast->publisher)
$episode->podcast->publisher === null
? $episode->podcast->owner_name
: $episode->podcast->publisher,
],
@ -77,7 +77,7 @@ if (!function_exists('write_audio_file_tags')) {
'track_number' => [(string) $episode->number],
'copyright_message' => [$episode->podcast->copyright],
'publisher' => [
empty($episode->podcast->publisher)
$episode->podcast->publisher === null
? $episode->podcast->owner_name
: $episode->podcast->publisher,
],
@ -103,7 +103,7 @@ if (!function_exists('write_audio_file_tags')) {
// write tags
if ($tagwriter->WriteTags()) {
echo 'Successfully wrote tags<br>';
if (!empty($tagwriter->warnings)) {
if ($tagwriter->warnings !== []) {
echo 'There were some warnings:<br>' .
implode('<br><br>', $tagwriter->warnings);
}

9
app/Helpers/misc_helper.php
View File

@ -10,16 +10,13 @@ if (!function_exists('get_browser_language')) {
/**
* Gets the browser default language using the request header key `HTTP_ACCEPT_LANGUAGE`
*
* @return string|null ISO 639-1 language code or null
* @return string ISO 639-1 language code
*/
function get_browser_language(string $httpAcceptLanguage): ?string
function get_browser_language(string $httpAcceptLanguage): string
{
$langs = explode(',', $httpAcceptLanguage);
if (!empty($langs)) {
return substr($langs[0], 0, 2);
}
return null;
return substr($langs[0], 0, 2);
}
}

107
app/Helpers/rss_helper.php
View File

@ -181,53 +181,45 @@ if (!function_exists('get_rss_feed')) {
}
}
foreach ($podcast->persons as $podcastPerson) {
$podcastPersonElement = $channel->addChild(
'person',
htmlspecialchars($podcastPerson->full_name),
$podcastNamespace,
);
foreach ($podcast->persons as $person) {
foreach ($person->roles as $role) {
$personElement = $channel->addChild(
'person',
htmlspecialchars($person->full_name),
$podcastNamespace,
);
if (
$podcastPerson->role !== null &&
$podcastPerson->role !== null
) {
$podcastPersonElement->addAttribute(
$personElement->addAttribute('img', $person->image->large_url);
if ($person->information_url !== null) {
$personElement->addAttribute(
'href',
$person->information_url,
);
}
$personElement->addAttribute(
'role',
htmlspecialchars(
lang(
"PersonsTaxonomy.persons.{$podcastPerson->group}.roles.{$podcastPerson->role}.label",
"PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label",
[],
'en',
),
),
);
}
if ($podcastPerson->group !== null) {
$podcastPersonElement->addAttribute(
$personElement->addAttribute(
'group',
htmlspecialchars(
lang(
"PersonsTaxonomy.persons.{$podcastPerson->group}.label",
"PersonsTaxonomy.persons.{$role->group}.label",
[],
'en',
),
),
);
}
$podcastPersonElement->addAttribute(
'img',
$podcastPerson->image->large_url,
);
if ($podcastPerson->information_url !== null) {
$podcastPersonElement->addAttribute(
'href',
$podcastPerson->information_url,
);
}
}
// set main category first, then other categories as apple
@ -399,7 +391,7 @@ if (!function_exists('get_rss_feed')) {
foreach ($episode->soundbites as $soundbite) {
$soundbiteElement = $item->addChild(
'soundbite',
empty($soundbite->label) ? null : $soundbite->label,
$soundbite->label,
$podcastNamespace,
);
$soundbiteElement->addAttribute(
@ -412,55 +404,54 @@ if (!function_exists('get_rss_feed')) {
);
}
foreach ($episode->persons as $episodePerson) {
$episodePersonElement = $item->addChild(
'person',
htmlspecialchars($episodePerson->full_name),
$podcastNamespace,
);
if (
!empty($episodePerson->role) &&
!empty($episodePerson->group)
) {
$episodePersonElement->addAttribute(
foreach ($episode->persons as $person) {
foreach ($person->roles as $role) {
$personElement = $item->addChild(
'person',
htmlspecialchars($person->full_name),
$podcastNamespace,
);
$personElement->addAttribute(
'role',
htmlspecialchars(
lang(
"PersonsTaxonomy.persons.{$episodePerson->group}.roles.{$episodePerson->role}.label",
"PersonsTaxonomy.persons.{$role->group}.roles.{$role->role}.label",
[],
'en',
),
),
);
}
if (!empty($episodePerson->person_group)) {
$episodePersonElement->addAttribute(
$personElement->addAttribute(
'group',
htmlspecialchars(
lang(
"PersonsTaxonomy.persons.{$episodePerson->group}.label",
"PersonsTaxonomy.persons.{$role->group}.label",
[],
'en',
),
),
);
}
$episodePersonElement->addAttribute(
'img',
$episodePerson->image->large_url,
);
if (!empty($episodePerson->information_url)) {
$episodePersonElement->addAttribute(
'href',
$episodePerson->information_url,
$personElement->addAttribute(
'img',
$person->image->large_url,
);
if ($person->information_url !== null) {
$personElement->addAttribute(
'href',
$person->information_url,
);
}
}
}
$episode->is_blocked &&
$item->addChild('block', 'Yes', $itunesNamespace);
if (!empty($episode->custom_rss)) {
if ($episode->custom_rss !== null) {
array_to_rss(
[
'elements' => $episode->custom_rss,
@ -557,9 +548,9 @@ if (!function_exists('array_to_rss')) {
$childXmlNode = $xmlNode->addChild(
$childArrayNode['name'],
$childArrayNode['content'] ?? null,
empty($childArrayNode['namespace'])
? null
: current($childArrayNode['namespace']),
array_key_exists('namespace', $childArrayNode)
? current($childArrayNode['namespace'])
: null,
);
if (array_key_exists('attributes', $childArrayNode)) {
foreach (

2
app/Helpers/url_helper.php
View File

@ -16,7 +16,7 @@ if (!function_exists('host_url')) {
{
if (isset($_SERVER['HTTP_HOST'])) {
$protocol =
(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ||
$_SERVER['SERVER_PORT'] == 443
? 'https://'
: 'http://';

5
app/Libraries/ActivityPub/Activities/AcceptActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class AcceptActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Accept';
protected string $type = 'Accept';
}

5
app/Libraries/ActivityPub/Activities/AnnounceActivity.php
View File

@ -18,10 +18,7 @@ use ActivityPub\Entities\Note;
class AnnounceActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Announce';
protected string $type = 'Announce';
public function __construct(Note $reblogNote)
{

5
app/Libraries/ActivityPub/Activities/CreateActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class CreateActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Create';
protected string $type = 'Create';
}

5
app/Libraries/ActivityPub/Activities/DeleteActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class DeleteActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Delete';
protected string $type = 'Delete';
}

5
app/Libraries/ActivityPub/Activities/FollowActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class FollowActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Follow';
protected string $type = 'Follow';
}

5
app/Libraries/ActivityPub/Activities/LikeActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class LikeActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Like';
protected string $type = 'Like';
}

5
app/Libraries/ActivityPub/Activities/UndoActivity.php
View File

@ -17,8 +17,5 @@ use ActivityPub\Core\Activity;
class UndoActivity extends Activity
{
/**
* @var string
*/
protected $type = 'Undo';
protected string $type = 'Undo';
}

19
app/Libraries/ActivityPub/ActivityRequest.php
View File

@ -18,25 +18,14 @@ use phpseclib\Crypt\RSA;
class ActivityRequest
{
/**
* @var CURLRequest
*/
protected $request;
/**
* @var URI
*/
protected $uri;
/**
* @var Activity|null
*/
protected $activity;
protected CURLRequest $request;
protected URI $uri;
protected ?Activity $activity;
/**
* @var array<string, string[]>
*/
protected $options = [
protected array $options = [
'headers' => [
'Content-Type' => 'application/activity+json',
'Accept' => 'application/activity+json', // TODO: outgoing and incoming requests

29
app/Libraries/ActivityPub/Config/ActivityPub.php
View File

@ -18,43 +18,28 @@ class ActivityPub extends BaseConfig
* --------------------------------------------------------------------
* ActivityPub Objects
* --------------------------------------------------------------------
* @var string
*/
public $actorObject = ActorObject::class;
public string $actorObject = ActorObject::class;
/**
* @var string
*/
public $noteObject = NoteObject::class;
public string $noteObject = NoteObject::class;
/**
* --------------------------------------------------------------------
* Default avatar and cover images
* --------------------------------------------------------------------
* @var string
*/
public $defaultAvatarImagePath = 'assets/images/avatar-default.jpg';
public string $defaultAvatarImagePath = 'assets/images/avatar-default.jpg';
/**
* @var string
*/
public $defaultAvatarImageMimetype = 'image/jpeg';
public string $defaultAvatarImageMimetype = 'image/jpeg';
/**
* @var string
*/
public $defaultCoverImagePath = 'assets/images/cover-default.jpg';
public string $defaultCoverImagePath = 'assets/images/cover-default.jpg';
/**
* @var string
*/
public $defaultCoverImageMimetype = 'image/jpeg';
public string $defaultCoverImageMimetype = 'image/jpeg';
/**
* --------------------------------------------------------------------
* Cache options
* --------------------------------------------------------------------
* @var string
*/
public $cachePrefix = 'ap_';
public string $cachePrefix = 'ap_';
}

13
app/Libraries/ActivityPub/Controllers/ActorController.php
View File

@ -26,15 +26,8 @@ class ActorController extends Controller
*/
protected $helpers = ['activitypub'];
/**
* @var Actor
*/
protected $actor;
/**
* @var ActivityPub
*/
protected $config;
protected Actor $actor;
protected ActivityPub $config;
public function __construct()
{
@ -87,6 +80,7 @@ class ActorController extends Controller
);
// switch/case on activity type
/** @phpstan-ignore-next-line */
switch ($payload->type) {
case 'Create':
if ($payload->object->type == 'Note') {
@ -168,6 +162,7 @@ class ActorController extends Controller
return $this->response->setStatusCode(200)->setJSON([]);
case 'Undo':
// switch/case on the type of activity to undo
/** @phpstan-ignore-next-line */
switch ($payload->object->type) {
case 'Follow':
// revert side-effect by removing follow from database

11
app/Libraries/ActivityPub/Controllers/NoteController.php
View File

@ -26,15 +26,8 @@ class NoteController extends Controller
*/
protected $helpers = ['activitypub'];
/**
* @var Note
*/
protected $note;
/**
* @var ActivityPub
*/
protected $config;
protected Note $note;
protected ActivityPub $config;
public function __construct()
{

17
app/Libraries/ActivityPub/Core/Activity.php
View File

@ -15,18 +15,7 @@ namespace ActivityPub\Core;
class Activity extends ObjectType
{
/**
* @var string
*/
protected $type = 'Activity';
/**
* @var string
*/
protected $actor;
/**
* @var string|ObjectType
*/
protected $object;
protected string $type = 'Activity';
protected string $actor;
protected string|ObjectType $object;
}

30
app/Libraries/ActivityPub/Core/ObjectType.php
View File

@ -18,35 +18,19 @@ class ObjectType extends AbstractObject
/**
* @var string|string[]
*/
protected $context = 'https://www.w3.org/ns/activitystreams';
/**
* @var string
*/
protected $id;
/**
* @var string
*/
protected $type = 'Object';
/**
* @var string
*/
protected $content;
/**
* @var string
*/
protected $published;
protected string|array $context = 'https://www.w3.org/ns/activitystreams';
protected string $id;
protected string $type = 'Object';
protected string $content;
protected string $published;
/**
* @var string[]
*/
protected $to = ['https://www.w3.org/ns/activitystreams#Public'];
protected array $to = ['https://www.w3.org/ns/activitystreams#Public'];
/**
* @var string[]
*/
protected $cc = [];
protected array $cc = [];
}

29
app/Libraries/ActivityPub/Entities/Activity.php
View File

@ -27,20 +27,9 @@ use Michalsn\Uuid\UuidEntity;
*/
class Activity extends UuidEntity
{
/**
* @var Actor
*/
protected $actor;
/**
* @var Actor|null
*/
protected $target_actor;
/**
* @var Note|null
*/
protected $note;
protected ?Actor $actor;
protected ?Actor $target_actor;
protected ?Note $note;
/**
* @var string[]
@ -67,13 +56,13 @@ class Activity extends UuidEntity
public function getActor(): Actor
{
if (empty($this->actor_id)) {
if ($this->actor_id === null) {
throw new RuntimeException(
'Activity must have an actor_id before getting the actor.',
);
}
if (empty($this->actor)) {
if ($this->actor === null) {
$this->actor = model('ActorModel')->getActorById($this->actor_id);
}
@ -82,13 +71,13 @@ class Activity extends UuidEntity
public function getTargetActor(): Actor
{
if (empty($this->target_actor_id)) {
if ($this->target_actor_id === null) {
throw new RuntimeException(
'Activity must have a target_actor_id before getting the target actor.',
);
}
if (empty($this->target_actor)) {
if ($this->target_actor === null) {
$this->target_actor = model('ActorModel')->getActorById(
$this->target_actor_id,
);
@ -99,13 +88,13 @@ class Activity extends UuidEntity
public function getNote(): Note
{
if (empty($this->note_id)) {
if ($this->note_id === null) {
throw new RuntimeException(
'Activity must have a note_id before getting note.',
);
}
if (empty($this->note)) {
if ($this->note === null) {
$this->note = model('NoteModel')->getNoteById($this->note_id);
}

25
app/Libraries/ActivityPub/Entities/Actor.php
View File

@ -37,20 +37,13 @@ use CodeIgniter\Entity\Entity;
*/
class Actor extends Entity
{
/**
* @var string
*/
protected $public_key_id;
protected string $public_key_id;
/**
* @var Actor[]
*/
protected $followers = [];
/**
* @var boolean
*/
protected $is_local = false;
protected ?array $followers = null;
protected bool $is_local = false;
/**
* @var array<string, string>
@ -100,13 +93,13 @@ class Actor extends Entity
*/
public function getFollowers(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Actor must be created before getting followers.',
);
}
if (empty($this->followers)) {
if ($this->followers === null) {
$this->followers = (array) model('ActorModel')->getFollowers(
$this->id,
);
@ -117,7 +110,7 @@ class Actor extends Entity
public function getAvatarImageUrl(): string
{
if (empty($this->attributes['avatar_image_url'])) {
if ($this->attributes['avatar_image_url'] === null) {
return base_url(config('ActivityPub')->defaultAvatarImagePath);
}
@ -126,7 +119,7 @@ class Actor extends Entity
public function getAvatarImageMimetype(): string
{
if (empty($this->attributes['avatar_image_mimetype'])) {
if ($this->attributes['avatar_image_mimetype'] === null) {
return config('ActivityPub')->defaultAvatarImageMimetype;
}
@ -135,7 +128,7 @@ class Actor extends Entity
public function getCoverImageUrl(): string
{
if (empty($this->attributes['cover_image_url'])) {
if ($this->attributes['cover_image_url'] === null) {
return base_url(config('ActivityPub')->defaultCoverImagePath);
}
@ -144,7 +137,7 @@ class Actor extends Entity
public function getCoverImageMimetype(): string
{
if (empty($this->attributes['cover_image_mimetype'])) {
if ($this->attributes['cover_image_mimetype'] === null) {
return config('ActivityPub')->defaultCoverImageMimetype;
}

84
app/Libraries/ActivityPub/Entities/Note.php
View File

@ -40,55 +40,25 @@ use Michalsn\Uuid\UuidEntity;
*/
class Note extends UuidEntity
{
/**
* @var Actor
*/
protected $actor;
protected ?Actor $actor = null;
protected bool $is_reply = false;
protected ?Note $reply_to_note = null;
protected bool $is_reblog = false;
protected ?Note $reblog_of_note = null;
protected ?PreviewCard $preview_card = null;
protected bool $has_preview_card = false;
/**
* @var boolean
* @var Note[]|null
*/
protected $is_reply = false;
protected ?array $replies = null;
protected bool $has_replies = false;
/**
* @var Note
* @var Note[]|null
*/
protected $reply_to_note;
/**
* @var boolean
*/
protected $is_reblog = false;
/**
* @var Note
*/
protected $reblog_of_note;
/**
* @var PreviewCard|null
*/
protected $preview_card;
/**
* @var boolean
*/
protected $has_preview_card = false;
/**
* @var Note[]
*/
protected $replies = [];
/**
* @var boolean
*/
protected $has_replies = false;
/**
* @var Note[]
*/
protected $reblogs = [];
protected ?array $reblogs = null;
/**
* @var string[]
@ -121,13 +91,13 @@ class Note extends UuidEntity
*/
public function getActor(): Actor
{
if (empty($this->actor_id)) {
if ($this->actor_id === null) {
throw new RuntimeException(
'Note must have an actor_id before getting actor.',
);
}
if (empty($this->actor)) {
if ($this->actor === null) {
$this->actor = model('ActorModel')->getActorById($this->actor_id);
}
@ -136,13 +106,13 @@ class Note extends UuidEntity
public function getPreviewCard(): ?PreviewCard
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Note must be created before getting preview_card.',
);
}
if (empty($this->preview_card)) {
if ($this->preview_card === null) {
$this->preview_card = model('PreviewCardModel')->getNotePreviewCard(
$this->id,
);
@ -153,7 +123,7 @@ class Note extends UuidEntity
public function getHasPreviewCard(): bool
{
return !empty($this->getPreviewCard());
return $this->getPreviewCard() !== null;
}
public function getIsReply(): bool
@ -168,13 +138,13 @@ class Note extends UuidEntity
*/
public function getReplies(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Note must be created before getting replies.',
);
}
if (empty($this->replies)) {
if ($this->replies === null) {
$this->replies = (array) model('NoteModel')->getNoteReplies(
$this->id,
);
@ -185,16 +155,16 @@ class Note extends UuidEntity
public function getHasReplies(): bool
{
return !empty($this->getReplies());
return $this->getReplies() !== null;
}
public function getReplyToNote(): Note
{
if (empty($this->in_reply_to_id)) {
if ($this->in_reply_to_id === null) {
throw new RuntimeException('Note is not a reply.');
}
if (empty($this->reply_to_note)) {
if ($this->reply_to_note === null) {
$this->reply_to_note = model('NoteModel')->getNoteById(
$this->in_reply_to_id,
);
@ -208,13 +178,13 @@ class Note extends UuidEntity
*/
public function getReblogs(): array
{
if (empty($this->id)) {
if ($this->id === null) {
throw new RuntimeException(
'Note must be created before getting reblogs.',
);
}
if (empty($this->reblogs)) {
if ($this->reblogs === null) {
$this->reblogs = (array) model('NoteModel')->getNoteReblogs(
$this->id,
);
@ -230,11 +200,11 @@ class Note extends UuidEntity
public function getReblogOfNote(): Note
{
if (empty($this->reblog_of_id)) {
if ($this->reblog_of_id === null) {
throw new RuntimeException('Note is not a reblog.');
}
if (empty($this->reblog_of_note)) {
if ($this->reblog_of_note === null) {
$this->reblog_of_note = model('NoteModel')->getNoteById(
$this->reblog_of_id,
);

5
app/Libraries/ActivityPub/Filters/ActivityPubFilter.php
View File

@ -28,7 +28,7 @@ class ActivityPubFilter implements FilterInterface
*/
public function before(RequestInterface $request, $params = null)
{
if (empty($params)) {
if ($params === null) {
return;
}
@ -40,8 +40,7 @@ class ActivityPubFilter implements FilterInterface
'application/activity+json',
];
if (empty($negotiate->media($allowedContentTypes))) {
// return $this->response->setStatusCode(415)->setJSON([]);
if ($negotiate->media($allowedContentTypes) === '') {
throw PageNotFoundException::forPageNotFound();
}
}

1
app/Libraries/ActivityPub/Helpers/activitypub_helper.php
View File

@ -361,6 +361,7 @@ if (!function_exists('linkify')) {
// Extract text links for each protocol
foreach ($protocols as $protocol) {
/** @phpstan-ignore-next-line */
switch ($protocol) {
case 'http':
case 'https':

2
app/Libraries/ActivityPub/Models/NoteModel.php
View File

@ -238,7 +238,7 @@ class NoteModel extends UuidModel
$messageUrls = extract_urls_from_message($note->message);
if (
!empty($messageUrls) &&
$messageUrls !== [] &&
($previewCard = get_or_create_preview_card_from_url(
new URI($messageUrls[0]),
)) &&

63
app/Libraries/ActivityPub/Objects/ActorObject.php
View File

@ -16,65 +16,34 @@ class ActorObject extends ObjectType
/**
* @var string|string[]
*/
protected $context = [
protected string|array $context = [
'https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1',
];
/**
* @var string
*/
protected $type = 'Person';
/**
* @var string
*/
protected $name;
/**
* @var string
*/
protected $preferredUsername;
/**
* @var string
*/
protected $summary;
/**
* @var string
*/
protected $inbox;
/**
* @var string
*/
protected $outbox;
/**
* @var string
*/
protected $followers;
/**
* @var string
*/
protected $url;
/**
* @var array<string, string>|null
*/
protected $image;
protected string $type = 'Person';
protected string $name;
protected string $preferredUsername;
protected string $summary;
protected string $inbox;
protected string $outbox;
protected string $followers;
protected string $url;
/**
* @var array<string, string>
*/
protected $icon = [];
protected array $image = [];
/**
* @var array<string, string>
*/
protected $publicKey = [];
protected array $icon = [];
/**
* @var array<string, string>
*/
protected array $publicKey = [];
public function __construct(Actor $actor)
{

23
app/Libraries/ActivityPub/Objects/NoteObject.php
View File

@ -18,25 +18,10 @@ use ActivityPub\Core\ObjectType;
class NoteObject extends ObjectType
{
/**
* @var string
*/
protected $type = 'Note';
/**
* @var string
*/
protected $attributedTo;
/**
* @var string
*/
protected $inReplyTo;
/**
* @var string
*/
protected $replies;
protected string $type = 'Note';
protected string $attributedTo;
protected string $inReplyTo;
protected string $replies;
public function __construct(Note $note)
{

29
app/Libraries/ActivityPub/Objects/OrderedCollectionObject.php
View File

@ -16,30 +16,11 @@ use ActivityPub\Core\ObjectType;
class OrderedCollectionObject extends ObjectType
{
/**
* @var string
*/
protected $type = 'OrderedCollection';
/**
* @var integer
*/
protected $totalItems;
/**
* @var string|null
*/
protected $first;
/**
* @var string|null
*/
protected $current;
/**
* @var string|null
*/
protected $last;
protected string $type = 'OrderedCollection';
protected int $totalItems;
protected ?string $first;
protected ?string $current;
protected ?string $last;
/**
* @param ObjectType[] $orderedItems

23
app/Libraries/ActivityPub/Objects/OrderedCollectionPage.php
View File

@ -14,25 +14,10 @@ namespace ActivityPub\Objects;
use CodeIgniter\Pager\Pager;
class OrderedCollectionPage extends OrderedCollectionObject
{
/**
* @var string
*/
protected $type = 'OrderedCollectionPage';
/**
* @var string
*/
protected $partOf;
/**
* @var string|null
*/
protected $prev;
/**
* @var string|null
*/
protected $next;
protected string $type = 'OrderedCollectionPage';
protected string $partOf;
protected ?string $prev;
protected ?string $next;
public function __construct(Pager $pager, ?array $orderedItems = null)
{

5
app/Libraries/ActivityPub/Objects/TombstoneObject.php
View File

@ -12,8 +12,5 @@ use ActivityPub\Core\ObjectType;
class TombstoneObject extends ObjectType
{
/**
* @var string
*/
protected $type = 'Tombstone';
protected string $type = 'Tombstone';
}

27
app/Libraries/ActivityPub/WebFinger.php
View File

@ -17,35 +17,20 @@ class WebFinger
*/
const RESOURCE_PATTERN = '/^acct:(?P<username>([\w_]+))@(?P<domain>([\w\-\.]+[\w]+)(:[\d]+)?)$/x';
/**
* @var string
*/
protected $username;
/**
* @var string
*/
protected $domain;
/**
* @var string
*/
protected $host;
/**
* @var string
*/
protected $port;
protected string $username;
protected string $domain;
protected string $host;
protected string $port;
/**
* @var string[]
*/
protected $aliases = [];
protected array $aliases = [];
/**
* @var array<array<string, string>>
*/
protected $links = [];
protected array $links = [];
public function __construct(protected string $subject)
{

9
app/Libraries/Analytics/AnalyticsTrait.php
View File

@ -29,11 +29,12 @@ trait AnalyticsTrait
$db = Database::connect();
$referer = $session->get('referer');
$domain = empty(parse_url($referer, PHP_URL_HOST))
? '- Direct -'
: parse_url($referer, PHP_URL_HOST);
$domain =
parse_url($referer, PHP_URL_HOST) === null
? '- Direct -'
: parse_url($referer, PHP_URL_HOST);
parse_str(parse_url($referer, PHP_URL_QUERY), $queries);
$keywords = empty($queries['q']) ? null : $queries['q'];
$keywords = array_key_exists('q', $queries) ? null : $queries['q'];
$procedureName = $db->prefixTable('analytics_website');
$db->query("call {$procedureName}(?,?,?,?,?,?)", [

6
app/Libraries/Analytics/Config/Analytics.php
View File

@ -9,10 +9,8 @@ class Analytics extends BaseConfig
/**
* Gateway to analytic routes.
* By default, all analytics routes will be under `/analytics` path
*
* @var string
*/
public $gateway = 'analytics';
public string $gateway = 'analytics';
/**
* --------------------------------------------------------------------
@ -20,7 +18,7 @@ class Analytics extends BaseConfig
* --------------------------------------------------------------------
* @var array<string, string>
*/
public $routeFilters = [
public array $routeFilters = [
'analytics-full-data' => '',
'analytics-data' => '',
'analytics-filtered-data' => '',

25
app/Libraries/Analytics/Controllers/AnalyticsController.php
View File

@ -11,31 +11,25 @@ namespace Analytics\Controllers;
use CodeIgniter\HTTP\ResponseInterface;
use CodeIgniter\Exceptions\PageNotFoundException;
use CodeIgniter\Controller;
use CodeIgniter\Model;
class AnalyticsController extends Controller
{
/**
* @var string
*/
protected $className;
/**
* @var string
*/
protected $methodName;
protected Model $analyticsModel;
protected string $methodName = '';
public function _remap(string $method, string ...$params): mixed
{
if (!isset($params[1])) {
if (count($params) < 2) {
throw PageNotFoundException::forPageNotFound();
}
$this->className = model('Analytics' . $params[1] . 'Model');
$this->methodName = 'getData' . (empty($params[2]) ? '' : $params[2]);
$this->analyticsModel = model('Analytics' . $params[1] . 'Model');
$this->methodName = 'getData' . (count($params) >= 3 ? $params[2] : '');
return $this->$method(
$params[0],
isset($params[3]) ? $params[3] : null,
count($params) >= 4 ? $params[3] : null,
);
}
@ -43,17 +37,16 @@ class AnalyticsController extends Controller
int $podcastId,
?int $episodeId = null
): ResponseInterface {
$analyticsModel = new $this->className();
$methodName = $this->methodName;
if ($episodeId === null) {
return $this->response->setJSON(
$analyticsModel->$methodName($podcastId),
$this->analyticsModel->$methodName($podcastId),
);
}
return $this->response->setJSON(
$analyticsModel->$methodName($podcastId, $episodeId),
$this->analyticsModel->$methodName($podcastId, $episodeId),
);
}
}

8
app/Libraries/Analytics/Controllers/EpisodeAnalyticsController.php
View File

@ -27,10 +27,8 @@ class EpisodeAnalyticsController extends Controller
*/
protected $helpers = ['analytics'];
/**
* @var Analytics
*/
protected $config;
protected Analytics $config;
/**
* Constructor.
*/
@ -65,7 +63,7 @@ class EpisodeAnalyticsController extends Controller
$serviceName = '';
if (isset($_GET['_from'])) {
$serviceName = $_GET['_from'];
} elseif (!empty($session->get('embeddable_player_domain'))) {
} elseif ($session->get('embeddable_player_domain') !== null) {
$serviceName = $session->get('embeddable_player_domain');
} elseif ($session->get('referer') !== '- Direct -') {
$serviceName = parse_url($session->get('referer'), PHP_URL_HOST);

11
app/Libraries/Analytics/Controllers/EpisodeController.php
View File

@ -22,15 +22,8 @@ class EpisodeController extends BaseController
{
use AnalyticsTrait;
/**
* @var Podcast
*/
protected $podcast;
/**
* @var Episode
*/
protected $episode;
protected Podcast $podcast;
protected Episode $episode;
public function _remap(string $method, string ...$params): mixed
{

9
app/Libraries/Analytics/Helpers/analytics_helper.php
View File

@ -1,6 +1,5 @@
<?php
use CodeIgniter\I18n\Time;
use Config\Services;
use Podlibre\Ipcat\IpDb;
use GeoIp2\Database\Reader;
@ -122,10 +121,10 @@ if (!function_exists('set_user_session_location')) {
$city = $cityReader->city($_SERVER['REMOTE_ADDR']);
$location = [
'countryCode' => empty($city->country->isoCode)
'countryCode' => $city->country->isoCode === null
? 'N/A'
: $city->country->isoCode,
'regionCode' => empty($city->subdivisions[0]->isoCode)
'regionCode' => $city->subdivisions[0]->isoCode === null
? 'N/A'
: $city->subdivisions[0]->isoCode,
'latitude' => round($city->location->latitude, 3),
@ -330,10 +329,10 @@ if (!function_exists('podcast_hit')) {
$ranges = explode(',', substr($httpRange, 6));
foreach ($ranges as $range) {
$parts = explode('-', $range);
$downloadedBytes += empty($parts[1])
$downloadedBytes += array_key_exists(1, $parts)
? $fileSize
: (int) $parts[1] -
(empty($parts[0]) ? 0 : (int) $parts[0]);
(array_key_exists(0, $parts) ? 0 : (int) $parts[0]);
}
}
// We save the number of downloaded bytes for this user and this episode:

2
app/Libraries/Breadcrumb.php
View File

@ -22,7 +22,7 @@ class Breadcrumb
*
* @var array<array<string, string>>
*/
protected $links = [];
protected array $links = [];
/**
* Initializes the Breadcrumb object using the segments from

5
app/Libraries/PodcastActor.php
View File

@ -14,10 +14,7 @@ use App\Models\PodcastModel;
class PodcastActor extends ActorObject
{
/**
* @var string
*/
protected $rss;
protected string $rss;
public function __construct(Actor $actor)
{

7
app/Libraries/Router.php
View File

@ -36,7 +36,7 @@ class Router extends CodeIgniterRouter
);
// Don't waste any time
if (empty($routes)) {
if ($routes === []) {
return false;
}
@ -178,10 +178,7 @@ class Router extends CodeIgniterRouter
str_replace('/', '\\', $replacekey),
$val,
);
} elseif (
str_contains($val, '$') &&
str_contains($key, '(')
) {
} elseif (str_contains($val, '$') && str_contains($key, '(')) {
$val = preg_replace('#^' . $key . '$#u', $val, $uri);
} elseif (str_contains($val, '/')) {
[$controller, $method] = explode('::', $val);

8
app/Models/CategoryModel.php
View File

@ -83,11 +83,11 @@ class CategoryModel extends Model
/**
* Sets categories for a given podcast
*
* @param int[] $categories
* @param int[] $categoriesIds
*
* @return int|false Number of rows inserted or FALSE on failure
*/
public function setPodcastCategories(int $podcastId, array $categories): int|false
public function setPodcastCategories(int $podcastId, array $categoriesIds = []): int|false
{
cache()->delete("podcast#{$podcastId}_categories");
@ -96,14 +96,14 @@ class CategoryModel extends Model
->table('podcasts_categories')
->delete(['podcast_id' => $podcastId]);
if (empty($categories)) {
if ($categoriesIds === []) {
// no row has been inserted after deletion
return 0;
}
// prepare data for `podcasts_categories` table
$data = array_reduce(
$categories,
$categoriesIds,
function (array $result, int $categoryId) use ($podcastId): array {
$result[] = [
'podcast_id' => $podcastId,

6
app/Models/PersonModel.php
View File

@ -100,7 +100,7 @@ class PersonModel extends Model
}
/**
* @return stdClass[]
* @return object[]
*/
public function getPersonRoles(int $personId, int $podcastId, ?int $episodeId): array {
if ($episodeId) {
@ -276,7 +276,7 @@ class PersonModel extends Model
* Add persons to podcast
*
* @param array<string> $persons
* @param array<string, string> $groupsRoles
* @param array<string, string> $roles
*
* @return bool|int Number of rows inserted or FALSE on failure
*/
@ -342,7 +342,7 @@ class PersonModel extends Model
array $personIds,
array $groupsRoles
): bool|int {
if (!empty($personIds)) {
if ($personIds !== []) {
(new EpisodeModel())->clearCache(['id' => $episodeId]);
$data = [];

69
app/Models/PodcastModel.php
View File

@ -93,29 +93,29 @@ class PodcastModel extends Model
'created_by' => 'required',
'updated_by' => 'required',
];
/**
* @var mixed[]
*/
protected $validationMessages = [];
/**
* @var string[]
*/
protected $beforeInsert = ['createPodcastActor'];
/**
* @var string[]
*/
protected $afterInsert = ['setActorAvatar'];
/**
* @var string[]
*/
protected $afterUpdate = ['updatePodcastActor'];
// clear cache before update if by any chance, the podcast name changes, so will the podcast link
/**
* clear cache before update if by any chance, the podcast name changes, so will the podcast link
*
* @var string[]
*/
protected $beforeUpdate = ['clearCache'];
/**
* @var string[]
*/
@ -336,7 +336,7 @@ class PodcastModel extends Model
if (!($defaultQuery = cache($cacheName))) {
$seasons = $this->getSeasons($podcastId);
if (!empty($seasons)) {
if ($seasons !== []) {
// get latest season
$defaultQuery = ['type' => 'season', 'data' => end($seasons)];
} else {
@ -348,6 +348,34 @@ class PodcastModel extends Model
}
return $defaultQuery;
}
/**
* @param mixed[] $data
*
* @return mixed[]
*/
public function clearCache(array $data): array
{
$podcast = (new PodcastModel())->getPodcastById(
is_array($data['id']) ? $data['id'][0] : $data['id'],
);
// delete cache all podcast pages
cache()->deleteMatching("page_podcast#{$podcast->id}*");
// delete all cache for podcast actor
cache()->deleteMatching(
config('ActivityPub')->cachePrefix . "actor#{$podcast->actor_id}*",
);
// delete model requests cache, includes feed / query / episode lists, etc.
cache()->deleteMatching("podcast#{$podcast->id}*");
cache()->delete("podcast-{$podcast->name}");
// clear cache for every credit page
cache()->deleteMatching('page_credits_*');
return $data;
}
/**
* Creates an actor linked to the podcast
@ -440,33 +468,4 @@ class PodcastModel extends Model
return $data;
}
/**
* @param mixed[] $data
*
* @return mixed[]
*/
public function clearCache(array $data): array
{
$podcast = (new PodcastModel())->getPodcastById(
is_array($data['id']) ? $data['id'][0] : $data['id'],
);
// delete cache all podcast pages
cache()->deleteMatching("page_podcast#{$podcast->id}*");
// delete all cache for podcast actor
cache()->deleteMatching(
config('ActivityPub')->cachePrefix . "actor#{$podcast->actor_id}*",
);
// delete model requests cache, includes feed / query / episode lists, etc.
cache()->deleteMatching("podcast#{$podcast->id}*");
cache()->delete("podcast-{$podcast->name}");
// clear cache for every credit page
cache()->deleteMatching('page_credits_*');
return $data;
}
}

1
app/Views/admin/episode/soundbites.php
View File

@ -148,7 +148,6 @@
'data-soundbite-id' => '0',
'data-type' => 'soundbite-field',
'data-field-type' => 'duration',
'min' => '0',
],
) ?></td>
<td class="px-1 py-4 font-medium bg-white border border-light-blue-500"><?= form_input(

2
app/Views/admin/person/list.php
View File

@ -20,7 +20,7 @@
<?= $this->section('content') ?>
<div class="flex flex-wrap">
<?php if (!empty($persons)): ?>
<?php if ($persons !== null): ?>
<?php foreach ($persons as $person): ?>
<article class="w-48 h-full mb-4 mr-4 overflow-hidden bg-white border rounded shadow">
<img

2
app/Views/admin/podcast/list.php
View File

@ -25,7 +25,7 @@
<?= $this->section('content') ?>
<div class="grid gap-4 grid-cols-podcasts">
<?php if (!empty($podcasts)): ?>
<?php if ($podcasts !== null): ?>
<?php foreach ($podcasts as $podcast): ?>
<article class="h-full overflow-hidden bg-white border shadow rounded-xl">
<img

2
app/Views/credits.php
View File

@ -22,7 +22,7 @@
<span class="text-lg font-semibold text-gray-700 md:text-xl">
<?= $persons['full_name'] ?>
</span>
<?php if (!empty($persons['information_url'])): ?>
<?php if ($persons['information_url'] !== null): ?>
<a href="<?= $persons[
'information_url'
] ?>" class="text-sm text-blue-800 hover:underline" target="_blank" rel="noreferrer noopener"><?= $persons[

2
app/Views/errors/html/error_404.php
View File

@ -13,7 +13,7 @@
<h1 class="text-3xl font-bold font-display md:text-4xl lg:text-5xl">404 - File Not Found</h1>
<p class="mb-6 text-lg text-gray-600 md:text-xl lg:text-2xl">
<?php if (!empty($message) && $message !== '(null)'): ?>
<?php if (isset($message) && $message !== '(null)'): ?>
<?= esc($message) ?>
<?php else: ?>
Sorry! Cannot seem to find the page you were looking for.

14
app/Views/errors/html/error_exception.php
View File

@ -102,7 +102,7 @@ $errorId = uniqid('error', true);
&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc(
$row['class'] . $row['type'] . $row['function'],
) ?>
<?php if (!empty($row['args'])): ?>
<?php if (array_key_exists('args', $row)): ?>
<?php $argsId = $errorId . 'args' . $index; ?>
( <a href="#" onclick="return toggle('<?= esc(
$argsId,
@ -266,13 +266,9 @@ $errorId = uniqid('error', true);
<?php $empty = true; ?>
<?php foreach (['_GET', '_POST', '_COOKIE'] as $var): ?>
if (empty($GLOBALS[$var])) {
continue;
}
if (!is_array($GLOBALS[$var])) {
continue;
} ?>
<?php if (empty($GLOBALS[$var]) || !is_array($GLOBALS[$var])) {
continue;
} ?>
<?php $empty = false; ?>
@ -358,7 +354,7 @@ $errorId = uniqid('error', true);
</table>
<?php $headers = $response->getHeaders(); ?>
<?php if (!empty($headers)): ?>
<?php if ($headers !== []): ?>
<?php natsort($headers); ?>
<h3>Headers</h3>

2
app/Views/install/instance_config.php
View File

@ -17,7 +17,7 @@
'class' => 'form-input mb-4',
'value' => old(
'hostname',
empty(host_url()) ? config('App')->baseURL : host_url(),
host_url( === null) ? config('App')->baseURL : host_url(),
),
'required' => 'required',
]) ?>

31
app/Views/podcast/episode_authenticated.php
View File

@ -111,35 +111,8 @@
],
) ?>
</div>
<?php if ($episode->location !== null): ?>
<?= location_link($episode->location, 'text-sm mb-4') ?>
<?php endif; ?>
<?php if ($episodePersons): ?>
<div class="flex w-full space-x-2 overflow-y-auto">
<?php foreach ($episodePersons as $person): ?>
<?php if ($person['information_url']): ?>
<a href="<?= $person[
'information_url'
] ?>" target="_blank" rel="noreferrer noopener" class="flex-shrink-0">
<img src="<?= $person[
'thumbnail_url'
] ?>" alt="<?= $person[
'full_name'
] ?>" class="object-cover w-12 h-12 rounded-full" data-toggle="tooltip" data-placement="bottom" title="[<?= $person[
'full_name'
] ?>] <?= $person['roles'] ?>" /></a>
<?php else: ?>
<img src="<?= $person[
'thumbnail_url'
] ?>" alt="<?= $person[
'full_name'
] ?>" class="object-cover w-12 h-12 rounded-full" data-toggle="tooltip" data-placement="bottom" title="[<?= $person[
'full_name'
] ?>] <?= $person['roles'] ?>" />
<?php endif; ?>
<?php endforeach; ?>
</div>
<?php endif; ?>
<?= location_link($episode->location, 'text-sm mb-4') ?>
<?= person_list($episode->persons) ?>
</div>
</div>
<audio controls preload="none" class="w-full mt-auto">

3
composer.json
View File

@ -31,7 +31,8 @@
"captainhook/plugin-composer": "^5.2",
"phpstan/phpstan": "^0.12.85",
"phpstan/extension-installer": "^1.1.0",
"rector/rector-phpstan-rules": "^0.2.6"
"rector/rector-phpstan-rules": "^0.2.6",
"symplify/phpstan-extensions": "^9.3"
},
"autoload": {
"psr-4": {

399
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "d5423c58c26549da4a5a20bfa4e65909",
"content-hash": "2aefa52a0dcd46108a616d943b4aa739",
"packages": [
{
"name": "brick/math",
@ -68,12 +68,12 @@
"source": {
"type": "git",
"url": "https://github.com/codeigniter4/CodeIgniter4.git",
"reference": "43e0e9611b7e527a4b927127fc6f26a1c6d123a5"
"reference": "10067ebb5a4a148888e989ce8481df23589bc004"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/codeigniter4/CodeIgniter4/zipball/43e0e9611b7e527a4b927127fc6f26a1c6d123a5",
"reference": "43e0e9611b7e527a4b927127fc6f26a1c6d123a5",
"url": "https://api.github.com/repos/codeigniter4/CodeIgniter4/zipball/10067ebb5a4a148888e989ce8481df23589bc004",
"reference": "10067ebb5a4a148888e989ce8481df23589bc004",
"shasum": ""
},
"require": {
@ -84,26 +84,19 @@
"kint-php/kint": "^3.3",
"laminas/laminas-escaper": "^2.6",
"php": "^7.3 || ^8.0",
"psr/cache": "^1.0",
"psr/log": "^1.1",
"psr/simple-cache": "^1.0"
},
"provide": {
"psr/cache-implementation": "^1.0",
"psr/simple-cache-implementation": "^1.0"
"psr/log": "^1.1"
},
"require-dev": {
"cache/integration-tests": "^0.17.0",
"codeigniter4/codeigniter4-standard": "^1.0",
"fakerphp/faker": "^1.9",
"mikey179/vfsstream": "^1.6",
"nexusphp/tachycardia": "^1.0",
"nikic/php-parser": "4.10.4",
"phpstan/phpstan": "0.12.85",
"phpstan/phpstan": "0.12.86",
"phpunit/phpunit": "^9.1",
"predis/predis": "^1.1",
"rector/rector": "0.10.22",
"squizlabs/php_codesniffer": "^3.3"
"rector/rector": "0.11.2",
"squizlabs/php_codesniffer": "^3.3",
"symplify/package-builder": "^9.3"
},
"suggest": {
"ext-fileinfo": "Improves mime type detection for files"
@ -152,7 +145,7 @@
"slack": "https://codeigniterchat.slack.com",
"issues": "https://github.com/codeigniter4/CodeIgniter4/issues"
},
"time": "2021-05-13T17:30:38+00:00"
"time": "2021-05-18T02:06:22+00:00"
},
{
"name": "composer/ca-bundle",
@ -1196,12 +1189,12 @@
"source": {
"type": "git",
"url": "https://github.com/lonnieezell/myth-auth.git",
"reference": "c7f79d1b938e371cfafdc7e3c59c810f2c672727"
"reference": "d3df41fb24b19c1362a163da4167b07efcff69e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/lonnieezell/myth-auth/zipball/c7f79d1b938e371cfafdc7e3c59c810f2c672727",
"reference": "c7f79d1b938e371cfafdc7e3c59c810f2c672727",
"url": "https://api.github.com/repos/lonnieezell/myth-auth/zipball/d3df41fb24b19c1362a163da4167b07efcff69e4",
"reference": "d3df41fb24b19c1362a163da4167b07efcff69e4",
"shasum": ""
},
"require": {
@ -1262,7 +1255,7 @@
"type": "patreon"
}
],
"time": "2021-05-13T18:19:37+00:00"
"time": "2021-05-15T03:29:54+00:00"
},
{
"name": "opawg/user-agents-php",
@ -1646,57 +1639,6 @@
},
"time": "2021-05-03T11:20:27+00:00"
},
{
"name": "psr/simple-cache",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/simple-cache.git",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\SimpleCache\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interfaces for simple caching",
"keywords": [
"cache",
"caching",
"psr",
"psr-16",
"simple-cache"
],
"support": {
"source": "https://github.com/php-fig/simple-cache/tree/master"
},
"time": "2017-10-23T01:57:42+00:00"
},
{
"name": "ramsey/collection",
"version": "1.1.3",
@ -2256,16 +2198,16 @@
"packages-dev": [
{
"name": "captainhook/captainhook",
"version": "5.9.0",
"version": "5.10.0",
"source": {
"type": "git",
"url": "https://github.com/captainhookphp/captainhook.git",
"reference": "76987f60c5c77d106ec6b589e4d658d7a2a7d6f5"
"reference": "2ee0cc1e356b95b3482be304bb31c68fe72d8ad6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/captainhookphp/captainhook/zipball/76987f60c5c77d106ec6b589e4d658d7a2a7d6f5",
"reference": "76987f60c5c77d106ec6b589e4d658d7a2a7d6f5",
"url": "https://api.github.com/repos/captainhookphp/captainhook/zipball/2ee0cc1e356b95b3482be304bb31c68fe72d8ad6",
"reference": "2ee0cc1e356b95b3482be304bb31c68fe72d8ad6",
"shasum": ""
},
"require": {
@ -2327,7 +2269,7 @@
],
"support": {
"issues": "https://github.com/captainhookphp/captainhook/issues",
"source": "https://github.com/captainhookphp/captainhook/tree/5.9.0"
"source": "https://github.com/captainhookphp/captainhook/tree/5.10.0"
},
"funding": [
{
@ -2335,7 +2277,7 @@
"type": "github"
}
],
"time": "2021-05-05T12:43:16+00:00"
"time": "2021-05-15T12:39:06+00:00"
},
{
"name": "captainhook/plugin-composer",
@ -4893,16 +4835,16 @@
},
{
"name": "rector/rector-phpstan-rules",
"version": "0.2.8",
"version": "0.2.9",
"source": {
"type": "git",
"url": "https://github.com/rectorphp/phpstan-rules.git",
"reference": "765d8bf702a3928a155be02d3b7413a16b46bf95"
"reference": "c53f5fad720fba2c13ab09d885f7be006523458f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rectorphp/phpstan-rules/zipball/765d8bf702a3928a155be02d3b7413a16b46bf95",
"reference": "765d8bf702a3928a155be02d3b7413a16b46bf95",
"url": "https://api.github.com/repos/rectorphp/phpstan-rules/zipball/c53f5fad720fba2c13ab09d885f7be006523458f",
"reference": "c53f5fad720fba2c13ab09d885f7be006523458f",
"shasum": ""
},
"require": {
@ -4914,8 +4856,8 @@
"require-dev": {
"phpstan/extension-installer": "^1.1",
"phpunit/phpunit": "^9.5",
"symplify/easy-coding-standard": "^9.2.22",
"symplify/phpstan-extensions": "^9.2.22"
"symplify/easy-coding-standard": "^9.3",
"symplify/phpstan-extensions": "^9.3"
},
"type": "phpstan-extension",
"extra": {
@ -4937,9 +4879,9 @@
"description": "PHPStan rules for Rector projects - with focus on static reflection, constant re-use and Rector design patterns",
"support": {
"issues": "https://github.com/rectorphp/phpstan-rules/issues",
"source": "https://github.com/rectorphp/phpstan-rules/tree/0.2.8"
"source": "https://github.com/rectorphp/phpstan-rules/tree/0.2.9"
},
"time": "2021-05-14T08:39:51+00:00"
"time": "2021-05-15T10:37:29+00:00"
},
{
"name": "rector/rector-phpunit",
@ -7755,16 +7697,16 @@
},
{
"name": "symplify/astral",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/astral.git",
"reference": "4934e1f0fef054051441db7ecaa267bd80231e4f"
"reference": "8b704cb02702e8519a404aa775ef4d53c4c74037"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/astral/zipball/4934e1f0fef054051441db7ecaa267bd80231e4f",
"reference": "4934e1f0fef054051441db7ecaa267bd80231e4f",
"url": "https://api.github.com/repos/symplify/astral/zipball/8b704cb02702e8519a404aa775ef4d53c4c74037",
"reference": "8b704cb02702e8519a404aa775ef4d53c4c74037",
"shasum": ""
},
"require": {
@ -7773,12 +7715,12 @@
"php": ">=7.3",
"symfony/dependency-injection": "^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/autowire-array-parameter": "^9.3.11",
"symplify/package-builder": "^9.3.11"
"symplify/autowire-array-parameter": "^9.3.12",
"symplify/package-builder": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symplify/easy-testing": "^9.3.11"
"symplify/easy-testing": "^9.3.12"
},
"type": "library",
"extra": {
@ -7797,7 +7739,7 @@
],
"description": "Toolking for smart daily work with AST",
"support": {
"source": "https://github.com/symplify/astral/tree/v9.3.11"
"source": "https://github.com/symplify/astral/tree/v9.3.12"
},
"funding": [
{
@ -7809,27 +7751,27 @@
"type": "github"
}
],
"time": "2021-05-13T11:33:59+00:00"
"time": "2021-05-17T20:54:14+00:00"
},
{
"name": "symplify/autowire-array-parameter",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/autowire-array-parameter.git",
"reference": "269fcb76ed64ca1e9dd0abe6c13273be8dfba64c"
"reference": "7fb6af895aacb9dbd48eaa24c0d9dc3294a82068"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/autowire-array-parameter/zipball/269fcb76ed64ca1e9dd0abe6c13273be8dfba64c",
"reference": "269fcb76ed64ca1e9dd0abe6c13273be8dfba64c",
"url": "https://api.github.com/repos/symplify/autowire-array-parameter/zipball/7fb6af895aacb9dbd48eaa24c0d9dc3294a82068",
"reference": "7fb6af895aacb9dbd48eaa24c0d9dc3294a82068",
"shasum": ""
},
"require": {
"nette/utils": "^3.2",
"php": ">=7.3",
"symfony/dependency-injection": "^5.2",
"symplify/package-builder": "^9.3.11"
"symplify/package-builder": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -7851,7 +7793,7 @@
],
"description": "Autowire array parameters for your Symfony applications",
"support": {
"source": "https://github.com/symplify/autowire-array-parameter/tree/v9.3.11"
"source": "https://github.com/symplify/autowire-array-parameter/tree/v9.3.12"
},
"funding": [
{
@ -7863,20 +7805,20 @@
"type": "github"
}
],
"time": "2021-05-13T11:33:56+00:00"
"time": "2021-05-17T20:54:14+00:00"
},
{
"name": "symplify/composer-json-manipulator",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/composer-json-manipulator.git",
"reference": "87a675a761aa5df90f5d5cf2c7d49d1e7e7a91be"
"reference": "932727993137ac6be539cb637590b0b487111924"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/composer-json-manipulator/zipball/87a675a761aa5df90f5d5cf2c7d49d1e7e7a91be",
"reference": "87a675a761aa5df90f5d5cf2c7d49d1e7e7a91be",
"url": "https://api.github.com/repos/symplify/composer-json-manipulator/zipball/932727993137ac6be539cb637590b0b487111924",
"reference": "932727993137ac6be539cb637590b0b487111924",
"shasum": ""
},
"require": {
@ -7886,8 +7828,8 @@
"symfony/dependency-injection": "^5.2",
"symfony/filesystem": "^4.4|^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/package-builder": "^9.3.11",
"symplify/smart-file-system": "^9.3.11"
"symplify/package-builder": "^9.3.12",
"symplify/smart-file-system": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -7909,7 +7851,7 @@
],
"description": "Package to load, merge and save composer.json file(s)",
"support": {
"source": "https://github.com/symplify/composer-json-manipulator/tree/v9.3.11"
"source": "https://github.com/symplify/composer-json-manipulator/tree/v9.3.12"
},
"funding": [
{
@ -7921,20 +7863,20 @@
"type": "github"
}
],
"time": "2021-05-13T11:33:58+00:00"
"time": "2021-05-17T20:54:16+00:00"
},
{
"name": "symplify/console-color-diff",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/console-color-diff.git",
"reference": "7b97c8e124eb790a24b2e3319e3795abeffef557"
"reference": "e6b1e2179b0dbd38f0f324c6a0c8f8ca2114b5f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/console-color-diff/zipball/7b97c8e124eb790a24b2e3319e3795abeffef557",
"reference": "7b97c8e124eb790a24b2e3319e3795abeffef557",
"url": "https://api.github.com/repos/symplify/console-color-diff/zipball/e6b1e2179b0dbd38f0f324c6a0c8f8ca2114b5f9",
"reference": "e6b1e2179b0dbd38f0f324c6a0c8f8ca2114b5f9",
"shasum": ""
},
"require": {
@ -7944,7 +7886,7 @@
"symfony/console": "^4.4|^5.2",
"symfony/dependency-injection": "^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/package-builder": "^9.3.11"
"symplify/package-builder": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -7966,7 +7908,7 @@
],
"description": "Package to print diffs in console with colors",
"support": {
"source": "https://github.com/symplify/console-color-diff/tree/v9.3.11"
"source": "https://github.com/symplify/console-color-diff/tree/v9.3.12"
},
"funding": [
{
@ -7978,32 +7920,32 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:04+00:00"
"time": "2021-05-17T20:54:14+00:00"
},
{
"name": "symplify/console-package-builder",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/console-package-builder.git",
"reference": "4fd36633c3607f74a21eee5bd32c00f24130261f"
"reference": "f6c964c83de064b5c4fd6fc238bec75fbcd20221"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/console-package-builder/zipball/4fd36633c3607f74a21eee5bd32c00f24130261f",
"reference": "4fd36633c3607f74a21eee5bd32c00f24130261f",
"url": "https://api.github.com/repos/symplify/console-package-builder/zipball/f6c964c83de064b5c4fd6fc238bec75fbcd20221",
"reference": "f6c964c83de064b5c4fd6fc238bec75fbcd20221",
"shasum": ""
},
"require": {
"php": ">=7.3",
"symfony/console": "^4.4|^5.2",
"symfony/dependency-injection": "^5.2",
"symplify/symplify-kernel": "^9.3.11"
"symplify/symplify-kernel": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/package-builder": "^9.3.11"
"symplify/package-builder": "^9.3.12"
},
"type": "library",
"extra": {
@ -8022,22 +7964,22 @@
],
"description": "Package to speed up building command line applications",
"support": {
"source": "https://github.com/symplify/console-package-builder/tree/v9.3.11"
"source": "https://github.com/symplify/console-package-builder/tree/v9.3.12"
},
"time": "2021-05-13T11:33:59+00:00"
"time": "2021-05-17T20:54:15+00:00"
},
{
"name": "symplify/easy-testing",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/easy-testing.git",
"reference": "5662ac6e55dca7d7ae7df0b47e84a165573359ed"
"reference": "f2a0e79a3893920b56dce110fb684c1760db8a74"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/easy-testing/zipball/5662ac6e55dca7d7ae7df0b47e84a165573359ed",
"reference": "5662ac6e55dca7d7ae7df0b47e84a165573359ed",
"url": "https://api.github.com/repos/symplify/easy-testing/zipball/f2a0e79a3893920b56dce110fb684c1760db8a74",
"reference": "f2a0e79a3893920b56dce110fb684c1760db8a74",
"shasum": ""
},
"require": {
@ -8047,10 +7989,10 @@
"symfony/dependency-injection": "^5.2",
"symfony/finder": "^4.4|^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/console-package-builder": "^9.3.11",
"symplify/package-builder": "^9.3.11",
"symplify/smart-file-system": "^9.3.11",
"symplify/symplify-kernel": "^9.3.11"
"symplify/console-package-builder": "^9.3.12",
"symplify/package-builder": "^9.3.12",
"symplify/smart-file-system": "^9.3.12",
"symplify/symplify-kernel": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -8075,7 +8017,7 @@
],
"description": "Testing made easy",
"support": {
"source": "https://github.com/symplify/easy-testing/tree/v9.3.11"
"source": "https://github.com/symplify/easy-testing/tree/v9.3.12"
},
"funding": [
{
@ -8087,20 +8029,20 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:12+00:00"
"time": "2021-05-17T20:54:29+00:00"
},
{
"name": "symplify/package-builder",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/package-builder.git",
"reference": "479752e9b19efbd0470aba8e92b9d6a01722430b"
"reference": "748eade6acc32798013e41203ab362f6ce77a024"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/package-builder/zipball/479752e9b19efbd0470aba8e92b9d6a01722430b",
"reference": "479752e9b19efbd0470aba8e92b9d6a01722430b",
"url": "https://api.github.com/repos/symplify/package-builder/zipball/748eade6acc32798013e41203ab362f6ce77a024",
"reference": "748eade6acc32798013e41203ab362f6ce77a024",
"shasum": ""
},
"require": {
@ -8112,8 +8054,8 @@
"symfony/dependency-injection": "^5.2",
"symfony/finder": "^4.4|^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/easy-testing": "^9.3.11",
"symplify/symplify-kernel": "^9.3.11"
"symplify/easy-testing": "^9.3.12",
"symplify/symplify-kernel": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -8135,7 +8077,7 @@
],
"description": "Dependency Injection, Console and Kernel toolkit for Symplify packages.",
"support": {
"source": "https://github.com/symplify/package-builder/tree/v9.3.11"
"source": "https://github.com/symplify/package-builder/tree/v9.3.12"
},
"funding": [
{
@ -8147,20 +8089,80 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:38+00:00"
"time": "2021-05-17T20:54:52+00:00"
},
{
"name": "symplify/phpstan-rules",
"version": "v9.3.11",
"name": "symplify/phpstan-extensions",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/phpstan-rules.git",
"reference": "e556dc413fc10804706d57b324e9aa14513c5f57"
"url": "https://github.com/symplify/phpstan-extensions.git",
"reference": "21a5766407aba2013b65da53020dfc7fdc7fb495"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/e556dc413fc10804706d57b324e9aa14513c5f57",
"reference": "e556dc413fc10804706d57b324e9aa14513c5f57",
"url": "https://api.github.com/repos/symplify/phpstan-extensions/zipball/21a5766407aba2013b65da53020dfc7fdc7fb495",
"reference": "21a5766407aba2013b65da53020dfc7fdc7fb495",
"shasum": ""
},
"require": {
"php": ">=7.3",
"phpstan/phpstan": "0.12.86",
"symplify/astral": "^9.3.12",
"symplify/package-builder": "^9.3.12",
"symplify/smart-file-system": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
},
"type": "phpstan-extension",
"extra": {
"branch-alias": {
"dev-main": "9.4-dev"
},
"phpstan": {
"includes": [
"config/config.neon"
]
}
},
"autoload": {
"psr-4": {
"Symplify\\PHPStanExtensions\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Pre-escaped error messages in 'symplify' error format, container aware test case and other useful extensions for PHPStan",
"support": {
"source": "https://github.com/symplify/phpstan-extensions/tree/v9.3.12"
},
"funding": [
{
"url": "https://www.paypal.me/rectorphp",
"type": "custom"
},
{
"url": "https://github.com/tomasvotruba",
"type": "github"
}
],
"time": "2021-05-17T20:54:58+00:00"
},
{
"name": "symplify/phpstan-rules",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/phpstan-rules.git",
"reference": "420dd5876ce7374e403f0a8b1d798ea22676e601"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/420dd5876ce7374e403f0a8b1d798ea22676e601",
"reference": "420dd5876ce7374e403f0a8b1d798ea22676e601",
"shasum": ""
},
"require": {
@ -8169,11 +8171,11 @@
"php": ">=7.3",
"phpstan/phpdoc-parser": "^0.5",
"phpstan/phpstan": "0.12.86",
"symplify/astral": "^9.3.11",
"symplify/composer-json-manipulator": "^9.3.11",
"symplify/package-builder": "^9.3.11",
"symplify/rule-doc-generator-contracts": "^9.3.11",
"symplify/smart-file-system": "^9.3.11",
"symplify/astral": "^9.3.12",
"symplify/composer-json-manipulator": "^9.3.12",
"symplify/package-builder": "^9.3.12",
"symplify/rule-doc-generator-contracts": "^9.3.12",
"symplify/smart-file-system": "^9.3.12",
"webmozart/assert": "^1.9"
},
"require-dev": {
@ -8181,9 +8183,9 @@
"nette/forms": "^3.1",
"phpunit/phpunit": "^9.5",
"symfony/framework-bundle": "^4.4|^5.2",
"symplify/easy-testing": "^9.3.11",
"symplify/phpstan-extensions": "^9.3.11",
"symplify/rule-doc-generator": "^9.3.11"
"symplify/easy-testing": "^9.3.12",
"symplify/phpstan-extensions": "^9.3.12",
"symplify/rule-doc-generator": "^9.3.12"
},
"type": "phpstan-extension",
"extra": {
@ -8211,7 +8213,7 @@
],
"description": "Set of Symplify rules for PHPStan",
"support": {
"source": "https://github.com/symplify/phpstan-rules/tree/v9.3.11"
"source": "https://github.com/symplify/phpstan-rules/tree/v9.3.12"
},
"funding": [
{
@ -8223,11 +8225,11 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:44+00:00"
"time": "2021-05-17T20:54:27+00:00"
},
{
"name": "symplify/rule-doc-generator-contracts",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/rule-doc-generator-contracts.git",
@ -8260,7 +8262,7 @@
],
"description": "Contracts for production code of RuleDocGenerator",
"support": {
"source": "https://github.com/symplify/rule-doc-generator-contracts/tree/v9.3.11"
"source": "https://github.com/symplify/rule-doc-generator-contracts/tree/v9.3.12"
},
"funding": [
{
@ -8276,16 +8278,16 @@
},
{
"name": "symplify/set-config-resolver",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/set-config-resolver.git",
"reference": "cced883469d32b45f83471c17443faf18a3c2e75"
"reference": "d20fd0d7ad5ca57747299666e934d3868ecfe620"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/set-config-resolver/zipball/cced883469d32b45f83471c17443faf18a3c2e75",
"reference": "cced883469d32b45f83471c17443faf18a3c2e75",
"url": "https://api.github.com/repos/symplify/set-config-resolver/zipball/d20fd0d7ad5ca57747299666e934d3868ecfe620",
"reference": "d20fd0d7ad5ca57747299666e934d3868ecfe620",
"shasum": ""
},
"require": {
@ -8296,8 +8298,8 @@
"symfony/dependency-injection": "^5.2",
"symfony/filesystem": "^4.4|^5.2",
"symfony/finder": "^4.4|^5.2",
"symplify/smart-file-system": "^9.3.11",
"symplify/symplify-kernel": "^9.3.11"
"symplify/smart-file-system": "^9.3.12",
"symplify/symplify-kernel": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -8319,7 +8321,7 @@
],
"description": "Resolve config and sets from configs and cli opptions for CLI applications",
"support": {
"source": "https://github.com/symplify/set-config-resolver/tree/v9.3.11"
"source": "https://github.com/symplify/set-config-resolver/tree/v9.3.12"
},
"funding": [
{
@ -8331,20 +8333,21 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:45+00:00"
"abandoned": true,
"time": "2021-05-17T20:55:05+00:00"
},
{
"name": "symplify/simple-php-doc-parser",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/simple-php-doc-parser.git",
"reference": "e70450dfaa94db70e34a4d2252891a43bc57f956"
"reference": "09478c31e9cd0cecedf6c82c13901d661318ab6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/simple-php-doc-parser/zipball/e70450dfaa94db70e34a4d2252891a43bc57f956",
"reference": "e70450dfaa94db70e34a4d2252891a43bc57f956",
"url": "https://api.github.com/repos/symplify/simple-php-doc-parser/zipball/09478c31e9cd0cecedf6c82c13901d661318ab6a",
"reference": "09478c31e9cd0cecedf6c82c13901d661318ab6a",
"shasum": ""
},
"require": {
@ -8353,11 +8356,11 @@
"symfony/config": "^4.4|^5.2",
"symfony/dependency-injection": "^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/package-builder": "^9.3.11"
"symplify/package-builder": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symplify/easy-testing": "^9.3.11"
"symplify/easy-testing": "^9.3.12"
},
"type": "library",
"extra": {
@ -8376,7 +8379,7 @@
],
"description": "Service integration of phpstan/phpdoc-parser, with few extra goodies for practical simple use",
"support": {
"source": "https://github.com/symplify/simple-php-doc-parser/tree/v9.3.11"
"source": "https://github.com/symplify/simple-php-doc-parser/tree/v9.3.12"
},
"funding": [
{
@ -8388,20 +8391,20 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:46+00:00"
"time": "2021-05-17T20:55:06+00:00"
},
{
"name": "symplify/skipper",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/skipper.git",
"reference": "3b446ce9c78f0d455788d9bfd92915eac6da1054"
"reference": "6124002225f261d865ce9df2bf68bc8d58c6b0b3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/skipper/zipball/3b446ce9c78f0d455788d9bfd92915eac6da1054",
"reference": "3b446ce9c78f0d455788d9bfd92915eac6da1054",
"url": "https://api.github.com/repos/symplify/skipper/zipball/6124002225f261d865ce9df2bf68bc8d58c6b0b3",
"reference": "6124002225f261d865ce9df2bf68bc8d58c6b0b3",
"shasum": ""
},
"require": {
@ -8411,9 +8414,9 @@
"symfony/dependency-injection": "^5.2",
"symfony/filesystem": "^4.4|^5.2",
"symfony/finder": "^4.4|^5.2",
"symplify/package-builder": "^9.3.11",
"symplify/smart-file-system": "^9.3.11",
"symplify/symplify-kernel": "^9.3.11"
"symplify/package-builder": "^9.3.12",
"symplify/smart-file-system": "^9.3.12",
"symplify/symplify-kernel": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -8435,7 +8438,7 @@
],
"description": "Skip files by rule class, directory, file or fnmatch",
"support": {
"source": "https://github.com/symplify/skipper/tree/v9.3.11"
"source": "https://github.com/symplify/skipper/tree/v9.3.12"
},
"funding": [
{
@ -8447,11 +8450,11 @@
"type": "github"
}
],
"time": "2021-05-13T11:34:52+00:00"
"time": "2021-05-17T20:55:10+00:00"
},
{
"name": "symplify/smart-file-system",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/smart-file-system.git",
@ -8490,7 +8493,7 @@
],
"description": "Sanitized FileInfo with safe getRealPath() and other handy methods",
"support": {
"source": "https://github.com/symplify/smart-file-system/tree/v9.3.11"
"source": "https://github.com/symplify/smart-file-system/tree/v9.3.12"
},
"funding": [
{
@ -8552,16 +8555,16 @@
},
{
"name": "symplify/symplify-kernel",
"version": "v9.3.11",
"version": "v9.3.12",
"source": {
"type": "git",
"url": "https://github.com/symplify/symplify-kernel.git",
"reference": "d79a26c90ebd292d8b474dbee26b602379be3f66"
"reference": "213455059541e8a707b716c5759982876e4e1118"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symplify/symplify-kernel/zipball/d79a26c90ebd292d8b474dbee26b602379be3f66",
"reference": "d79a26c90ebd292d8b474dbee26b602379be3f66",
"url": "https://api.github.com/repos/symplify/symplify-kernel/zipball/213455059541e8a707b716c5759982876e4e1118",
"reference": "213455059541e8a707b716c5759982876e4e1118",
"shasum": ""
},
"require": {
@ -8569,10 +8572,10 @@
"symfony/console": "^4.4|^5.2",
"symfony/dependency-injection": "^5.2",
"symfony/http-kernel": "^4.4|^5.2",
"symplify/autowire-array-parameter": "^9.3.11",
"symplify/composer-json-manipulator": "^9.3.11",
"symplify/package-builder": "^9.3.11",
"symplify/smart-file-system": "^9.3.11"
"symplify/autowire-array-parameter": "^9.3.12",
"symplify/composer-json-manipulator": "^9.3.12",
"symplify/package-builder": "^9.3.12",
"symplify/smart-file-system": "^9.3.12"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
@ -8594,9 +8597,9 @@
],
"description": "Internal Kernel for Symplify packages",
"support": {
"source": "https://github.com/symplify/symplify-kernel/tree/v9.3.11"
"source": "https://github.com/symplify/symplify-kernel/tree/v9.3.12"
},
"time": "2021-05-13T11:35:17+00:00"
"time": "2021-05-17T20:54:52+00:00"
},
{
"name": "theseer/tokenizer",

Some files were not shown because too many files have changed in this diff Show More