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

Author: kenjis

phpstan-baseline.php

@@ -2581,11 +2581,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Model.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(int\\|object\\|string\\|false\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\) should be covariant with return type \\(bool\\|int\\|string\\) of method CodeIgniter\\\\BaseModel\\:\\:insert\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Model.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Accessing offset mixed directly on \\$_GET is discouraged\\.$#',
 	'count' => 1,

system/BaseModel.php

@@ -720,10 +720,12 @@ public function getInsertID()
      * Inserts data into the database. If an object is provided,
      * it will attempt to convert it to an array.
      *
-     * @param array|object|null $data     Data
-     * @param bool              $returnID Whether insert ID should be returned or not.
+     * @param array|object|null $data Data
+     * @phpstan-param row_array|object|null $data
+     * @param bool $returnID Whether insert ID should be returned or not.
      *
      * @return bool|int|string insert ID or true on success. false on failure.
+     * @phpstan-return ($returnID is true ? int|string|false : bool)
      *
      * @throws ReflectionException
      */

system/Model.php

@@ -680,9 +680,11 @@ protected function shouldUpdate($data): bool
      * it will attempt to convert it to an array.
      *
      * @param array|object|null $data
-     * @param bool              $returnID Whether insert ID should be returned or not.
+     * @phpstan-param row_array|object|null $data
+     * @param bool $returnID Whether insert ID should be returned or not.
      *
-     * @return BaseResult|false|int|object|string
+     * @return false|int|object|string
+     * @phpstan-return ($returnID is true ? int|string|false : bool)
      *
      * @throws ReflectionException
      */