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

kenjis · kenjis · commit 448adc724de8 · 2023-04-19T16:59:06.000+09:00
diff --git a/public/index.php b/public/index.php
@@ -47,7 +47,7 @@
  * ---------------------------------------------------------------
  *
  * The CodeIgniter class contains the core functionality to make
- * the application run, and does all of the dirty work to get
+ * the application run, and does all the dirty work to get
  * the pieces all working together.
  */
 
@@ -60,7 +60,7 @@
  *---------------------------------------------------------------
  * LAUNCH THE APPLICATION
  *---------------------------------------------------------------
- * Now that everything is setup, it's time to actually fire
+ * Now that everything is set up, it's time to actually fire
  * up the engines and make this app do its thang.
  */
 
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -173,9 +173,9 @@ class BaseService
      *
      * $key must be a name matching a service.
      *
-     * @param mixed ...$params
+     * @param array|bool|float|int|object|string|null ...$params
      *
-     * @return mixed
+     * @return object
      */
     protected static function getSharedInstance(string $key, ...$params)
     {
@@ -239,7 +239,7 @@ public static function locator(bool $getShared = true)
      * Provides the ability to perform case-insensitive calling of service
      * names.
      *
-     * @return mixed
+     * @return object|null
      */
     public static function __callStatic(string $name, array $arguments)
     {
@@ -296,7 +296,7 @@ public static function resetSingle(string $name)
     /**
      * Inject mock object for testing.
      *
-     * @param mixed $mock
+     * @param object $mock
      */
     public static function injectMock(string $name, $mock)
     {
@@ -309,7 +309,7 @@ public static function injectMock(string $name, $mock)
      * looks for the service method in each, returning an instance of
      * the service, if available.
      *
-     * @return mixed
+     * @return object|null
      *
      * @deprecated
      *
diff --git a/system/Config/Config.php b/system/Config/Config.php
@@ -23,7 +23,7 @@ class Config
      * @param string $name      Configuration name
      * @param bool   $getShared Use shared instance
      *
-     * @return mixed|null
+     * @return object|null
      */
     public static function get(string $name, bool $getShared = true)
     {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -456,7 +456,8 @@ abstract protected function _close();
     /**
      * Create a persistent database connection.
      *
-     * @return mixed
+     * @return false|object|resource
+     * @phpstan-return false|TConnection
      */
     public function persistentConnect()
     {
@@ -558,7 +559,7 @@ abstract protected function execute(string $sql);
      * Should automatically handle different connections for read/write
      * queries if needed.
      *
-     * @param mixed ...$binds
+     * @param array|string|null $binds
      *
      * @return BaseResult|bool|Query BaseResult when “read” type query, bool when “write” type query, Query when prepared query
      * @phpstan-return BaseResult<TConnection, TResult>|bool|Query
@@ -1747,7 +1748,7 @@ protected function _enableForeignKeyChecks()
     /**
      * Accessor for properties if they exist.
      *
-     * @return mixed
+     * @return array|bool|float|int|object|resource|string|null
      */
     public function __get(string $key)
     {
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
@@ -62,7 +62,7 @@ public function getConnection(?string $alias = null);
     /**
      * Select a specific database table to use.
      *
-     * @return mixed
+     * @return bool
      */
     public function setDatabase(string $databaseName);
 
@@ -98,7 +98,7 @@ public function getVersion(): string;
      * Should automatically handle different connections for read/write
      * queries if needed.
      *
-     * @param mixed ...$binds
+     * @param array|string|null $binds
      *
      * @return BaseResult|bool|Query
      * @phpstan-return BaseResult<TConnection, TResult>|bool|Query
@@ -127,7 +127,7 @@ public function table($tableName);
     /**
      * Returns the last query's statement object.
      *
-     * @return mixed
+     * @return Query
      */
     public function getLastQuery();
 
@@ -150,7 +150,7 @@ public function escape($str);
      *
      * @param array ...$params
      *
-     * @return mixed
+     * @return array|bool|float|int|object|resource|string|null
      */
     public function callFunction(string $functionName, ...$params);
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -533,7 +533,7 @@ protected function _transRollback(): bool
      *
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
-     * @param mixed $sql
+     * @param string $sql
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
@@ -44,7 +44,7 @@ class Connection extends BaseConnection
      * FALSE or SQLSRV_CURSOR_FORWARD would increase performance,
      * but would disable num_rows() (and possibly insert_id())
      *
-     * @var mixed
+     * @var false|string
      */
     public $scrollable;
 
@@ -440,7 +440,7 @@ public function affectedRows(): int
     /**
      * Select a specific database table to use.
      *
-     * @return mixed
+     * @return bool
      */
     public function setDatabase(?string $databaseName = null)
     {
@@ -489,7 +489,7 @@ protected function execute(string $sql)
     /**
      * Returns the last error encountered by this connection.
      *
-     * @return mixed
+     * @return array<string, int|string>
      *
      * @deprecated Use `error()` instead.
      */
@@ -550,7 +550,7 @@ public function getVersion(): string
      *
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
-     * @param mixed $sql
+     * @param string $sql
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
@@ -34,7 +34,7 @@ abstract class BaseHandler implements SessionHandlerInterface
     /**
      * Lock placeholder.
      *
-     * @var mixed
+     * @var bool|string
      */
     protected $lock = false;
 
diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
@@ -31,7 +31,7 @@ protected function setSelect(BaseBuilder $builder)
     /**
      * Decodes column data
      *
-     * @param mixed $data
+     * @param string $data
      *
      * @return false|string
      */
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
@@ -172,7 +172,7 @@ protected function setSelect(BaseBuilder $builder)
     /**
      * Decodes column data
      *
-     * @param mixed $data
+     * @param string $data
      *
      * @return false|string
      */
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
@@ -37,8 +37,8 @@ public function destroy();
      * If $data is an array, it is expected to be an array of key/value pairs
      * to be set as session properties.
      *
-     * @param array|string $data  Property name or associative array of properties
-     * @param mixed        $value Property value if single key provided
+     * @param array|string                            $data  Property name or associative array of properties
+     * @param array|bool|float|int|object|string|null $value Property value if single key provided
      */
     public function set($data, $value = null);
 
@@ -53,7 +53,7 @@ public function set($data, $value = null);
      *
      * @param string $key Identifier of the session property to retrieve
      *
-     * @return mixed The property value(s)
+     * @return array|bool|float|int|object|string|null The property value(s)
      */
     public function get(?string $key = null);
 
@@ -135,9 +135,9 @@ public function getFlashKeys(): array;
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
      *
-     * @param array|string $data  Session data key or associative array of items
-     * @param mixed        $value Value to store
-     * @param int          $ttl   Time-to-live in seconds
+     * @param array|string                            $data  Session data key or associative array of items
+     * @param array|bool|float|int|object|string|null $value Value to store
+     * @param int                                     $ttl   Time-to-live in seconds
      */
     public function setTempdata($data, $value = null, int $ttl = 300);
 
@@ -147,7 +147,7 @@ public function setTempdata($data, $value = null, int $ttl = 300);
      *
      * @param string $key Session data key
      *
-     * @return mixed Session data value or null if not found.
+     * @return array|bool|float|int|object|string|null Session data value or null if not found.
      */
     public function getTempdata(?string $key = null);
 

Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,9 @@ class BaseService`
`173`	`173`	`*`
`174`	`174`	`* $key must be a name matching a service.`
`175`	`175`	`*`
`176`		`- * @param mixed ...$params`
	`176`	`+ * @param array\|bool\|float\|int\|object\|string\|null ...$params`
`177`	`177`	`*`
`178`		`- * @return mixed`
	`178`	`+ * @return object`
`179`	`179`	`*/`
`180`	`180`	`protected static function getSharedInstance(string $key, ...$params)`
`181`	`181`	`{`
`@@ -239,7 +239,7 @@ public static function locator(bool $getShared = true)`
`239`	`239`	`* Provides the ability to perform case-insensitive calling of service`
`240`	`240`	`* names.`
`241`	`241`	`*`
`242`		`- * @return mixed`
	`242`	`+ * @return object\|null`
`243`	`243`	`*/`
`244`	`244`	`public static function __callStatic(string $name, array $arguments)`
`245`	`245`	`{`
`@@ -296,7 +296,7 @@ public static function resetSingle(string $name)`
`296`	`296`	`/**`
`297`	`297`	`* Inject mock object for testing.`
`298`	`298`	`*`
`299`		`- * @param mixed $mock`
	`299`	`+ * @param object $mock`
`300`	`300`	`*/`
`301`	`301`	`public static function injectMock(string $name, $mock)`
`302`	`302`	`{`
`@@ -309,7 +309,7 @@ public static function injectMock(string $name, $mock)`
`309`	`309`	`* looks for the service method in each, returning an instance of`
`310`	`310`	`* the service, if available.`
`311`	`311`	`*`
`312`		`- * @return mixed`
	`312`	`+ * @return object\|null`
`313`	`313`	`*`
`314`	`314`	`* @deprecated`
`315`	`315`	`*`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class Config`
`23`	`23`	`* @param string $name Configuration name`
`24`	`24`	`* @param bool $getShared Use shared instance`
`25`	`25`	`*`
`26`		`- * @return mixed\|null`
	`26`	`+ * @return object\|null`
`27`	`27`	`*/`
`28`	`28`	`public static function get(string $name, bool $getShared = true)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,8 @@ abstract protected function _close();`
`456`	`456`	`/**`
`457`	`457`	`* Create a persistent database connection.`
`458`	`458`	`*`
`459`		`- * @return mixed`
	`459`	`+ * @return false\|object\|resource`
	`460`	`+ * @phpstan-return false\|TConnection`
`460`	`461`	`*/`
`461`	`462`	`public function persistentConnect()`
`462`	`463`	`{`
`@@ -558,7 +559,7 @@ abstract protected function execute(string $sql);`
`558`	`559`	`* Should automatically handle different connections for read/write`
`559`	`560`	`* queries if needed.`
`560`	`561`	`*`
`561`		`- * @param mixed ...$binds`
	`562`	`+ * @param array\|string\|null $binds`
`562`	`563`	`*`
`563`	`564`	`* @return BaseResult\|bool\|Query BaseResult when “read” type query, bool when “write” type query, Query when prepared query`
`564`	`565`	`* @phpstan-return BaseResult<TConnection, TResult>\|bool\|Query`
`@@ -1747,7 +1748,7 @@ protected function _enableForeignKeyChecks()`
`1747`	`1748`	`/**`
`1748`	`1749`	`* Accessor for properties if they exist.`
`1749`	`1750`	`*`
`1750`		`- * @return mixed`
	`1751`	`+ * @return array\|bool\|float\|int\|object\|resource\|string\|null`
`1751`	`1752`	`*/`
`1752`	`1753`	`public function __get(string $key)`
`1753`	`1754`	`{`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function getConnection(?string $alias = null);`
`62`	`62`	`/**`
`63`	`63`	`* Select a specific database table to use.`
`64`	`64`	`*`
`65`		`- * @return mixed`
	`65`	`+ * @return bool`
`66`	`66`	`*/`
`67`	`67`	`public function setDatabase(string $databaseName);`
`68`	`68`
`@@ -98,7 +98,7 @@ public function getVersion(): string;`
`98`	`98`	`* Should automatically handle different connections for read/write`
`99`	`99`	`* queries if needed.`
`100`	`100`	`*`
`101`		`- * @param mixed ...$binds`
	`101`	`+ * @param array\|string\|null $binds`
`102`	`102`	`*`
`103`	`103`	`* @return BaseResult\|bool\|Query`
`104`	`104`	`* @phpstan-return BaseResult<TConnection, TResult>\|bool\|Query`
`@@ -127,7 +127,7 @@ public function table($tableName);`
`127`	`127`	`/**`
`128`	`128`	`* Returns the last query's statement object.`
`129`	`129`	`*`
`130`		`- * @return mixed`
	`130`	`+ * @return Query`
`131`	`131`	`*/`
`132`	`132`	`public function getLastQuery();`
`133`	`133`
`@@ -150,7 +150,7 @@ public function escape($str);`
`150`	`150`	`*`
`151`	`151`	`* @param array ...$params`
`152`	`152`	`*`
`153`		`- * @return mixed`
	`153`	`+ * @return array\|bool\|float\|int\|object\|resource\|string\|null`
`154`	`154`	`*/`
`155`	`155`	`public function callFunction(string $functionName, ...$params);`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ protected function _transRollback(): bool`
`533`	`533`	`*`
`534`	`534`	`* Overrides BaseConnection::isWriteType, adding additional read query types.`
`535`	`535`	`*`
`536`		`- * @param mixed $sql`
	`536`	`+ * @param string $sql`
`537`	`537`	`*/`
`538`	`538`	`public function isWriteType($sql): bool`
`539`	`539`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Connection extends BaseConnection`
`44`	`44`	`* FALSE or SQLSRV_CURSOR_FORWARD would increase performance,`
`45`	`45`	`* but would disable num_rows() (and possibly insert_id())`
`46`	`46`	`*`
`47`		`- * @var mixed`
	`47`	`+ * @var false\|string`
`48`	`48`	`*/`
`49`	`49`	`public $scrollable;`
`50`	`50`
`@@ -440,7 +440,7 @@ public function affectedRows(): int`
`440`	`440`	`/**`
`441`	`441`	`* Select a specific database table to use.`
`442`	`442`	`*`
`443`		`- * @return mixed`
	`443`	`+ * @return bool`
`444`	`444`	`*/`
`445`	`445`	`public function setDatabase(?string $databaseName = null)`
`446`	`446`	`{`
`@@ -489,7 +489,7 @@ protected function execute(string $sql)`
`489`	`489`	`/**`
`490`	`490`	`* Returns the last error encountered by this connection.`
`491`	`491`	`*`
`492`		`- * @return mixed`
	`492`	`+ * @return array<string, int\|string>`
`493`	`493`	`*`
`494`	`494`	* @deprecated Use `error()` instead.
`495`	`495`	`*/`
`@@ -550,7 +550,7 @@ public function getVersion(): string`
`550`	`550`	`*`
`551`	`551`	`* Overrides BaseConnection::isWriteType, adding additional read query types.`
`552`	`552`	`*`
`553`		`- * @param mixed $sql`
	`553`	`+ * @param string $sql`
`554`	`554`	`*/`
`555`	`555`	`public function isWriteType($sql): bool`
`556`	`556`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ abstract class BaseHandler implements SessionHandlerInterface`
`34`	`34`	`/**`
`35`	`35`	`* Lock placeholder.`
`36`	`36`	`*`
`37`		`- * @var mixed`
	`37`	`+ * @var bool\|string`
`38`	`38`	`*/`
`39`	`39`	`protected $lock = false;`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ protected function setSelect(BaseBuilder $builder)`
`31`	`31`	`/**`
`32`	`32`	`* Decodes column data`
`33`	`33`	`*`
`34`		`- * @param mixed $data`
	`34`	`+ * @param string $data`
`35`	`35`	`*`
`36`	`36`	`* @return false\|string`
`37`	`37`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ protected function setSelect(BaseBuilder $builder)`
`172`	`172`	`/**`
`173`	`173`	`* Decodes column data`
`174`	`174`	`*`
`175`		`- * @param mixed $data`
	`175`	`+ * @param string $data`
`176`	`176`	`*`
`177`	`177`	`* @return false\|string`
`178`	`178`	`*/`