Merge remote-tracking branch 'upstream/develop' into 4.5

Author: kenjis

composer.json

@@ -33,7 +33,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.6",
+        "rector/rector": "0.18.8",
         "vimeo/psalm": "^5.0"
     },
     "suggest": {

psalm-baseline.xml

@@ -10,11 +10,6 @@
       <code>public $plugins = [];</code>
     </UndefinedDocblockClass>
   </file>
-  <file src="system/Cache/FactoriesCache/FileVarExportHandler.php">
-    <UndefinedVariable>
-      <code>$val</code>
-    </UndefinedVariable>
-  </file>
   <file src="system/Cache/Handlers/MemcachedHandler.php">
     <UndefinedClass>
       <code>Memcache</code>
@@ -39,9 +34,9 @@
   </file>
   <file src="system/Config/View.php">
     <UndefinedDocblockClass>
-      <code><![CDATA[array<string, ParserCallableString>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, parser_callable_string>]]></code>
       <code><![CDATA[protected $coreFilters = [
         'abs'            => '\abs',
         'capitalize'     => '\CodeIgniter\View\Filters::capitalize',
@@ -144,8 +139,8 @@
   </file>
   <file src="system/View/Parser.php">
     <UndefinedDocblockClass>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
-      <code><![CDATA[array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
+      <code><![CDATA[array<string, array<parser_callable_string>|parser_callable_string|parser_callable>]]></code>
       <code>protected $plugins = [];</code>
       <code>protected $plugins = [];</code>
     </UndefinedDocblockClass>

system/Config/View.php

@@ -16,8 +16,8 @@
 /**
  * View configuration
  *
- * @phpstan-type ParserCallable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  */
 class View extends BaseConfig
 {
@@ -40,7 +40,7 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @phpstan-var array<string, parser_callable_string>
      */
     public $filters = [];
 
@@ -52,15 +52,15 @@ class View extends BaseConfig
      * @psalm-suppress UndefinedDocblockClass
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     public $plugins = [];
 
     /**
      * Built-in View filters.
      *
      * @var array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @phpstan-var array<string, parser_callable_string>
      */
     protected $coreFilters = [
         'abs'            => '\abs',
@@ -90,7 +90,7 @@ class View extends BaseConfig
      * Built-in View plugins.
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     protected $corePlugins = [
         'csp_script_nonce'  => '\CodeIgniter\View\Plugins::cspScriptNonce',

system/View/Parser.php

@@ -20,8 +20,8 @@
 /**
  * Class for parsing pseudo-vars
  *
- * @phpstan-type ParserCallable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable (callable(mixed): mixed)
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
  *
  * @see \CodeIgniter\View\ParserTest
  */
@@ -64,7 +64,7 @@ class Parser extends View
      * Stores any plugins registered at run-time.
      *
      * @var array<string, array<string>|callable|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, array<parser_callable_string>|parser_callable_string|parser_callable>
      */
     protected $plugins = [];