Release v4.6.4

Author: actions-user

app/Config/Database.php

@@ -182,6 +182,7 @@ class Database extends Config
         'port'        => 3306,
         'foreignKeys' => true,
         'busyTimeout' => 1000,
+        'synchronous' => null,
         'dateFormat'  => [
             'date'     => 'Y-m-d',
             'datetime' => 'Y-m-d H:i:s',

app/Controllers/BaseController.php

@@ -3,56 +3,43 @@
 namespace App\Controllers;
 
 use CodeIgniter\Controller;
-use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class BaseController
- *
  * BaseController provides a convenient place for loading components
  * and performing functions that are needed by all your controllers.
+ *
  * Extend this class in any new controllers:
+ * ```
  *     class Home extends BaseController
+ * ```
  *
- * For security be sure to declare any new methods as protected or private.
+ * For security, be sure to declare any new methods as protected or private.
  */
 abstract class BaseController extends Controller
 {
-    /**
-     * Instance of the main Request object.
-     *
-     * @var CLIRequest|IncomingRequest
-     */
-    protected $request;
-
-    /**
-     * An array of helpers to be loaded automatically upon
-     * class instantiation. These helpers will be available
-     * to all other controllers that extend BaseController.
-     *
-     * @var list<string>
-     */
-    protected $helpers = [];
-
     /**
      * Be sure to declare properties for any property fetch you initialized.
      * The creation of dynamic property is deprecated in PHP 8.2.
      */
+
     // protected $session;
 
     /**
      * @return void
      */
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
-        // Do Not Edit This Line
+        // Load here all helpers you want to be available in your controllers that extend BaseController.
+        // Caution: Do not put the this below the parent::initController() call below.
+        // $this->helpers = ['form', 'url'];
+
+        // Caution: Do not edit this line.
         parent::initController($request, $response, $logger);
 
         // Preload any models, libraries, etc, here.
-
-        // E.g.: $this->session = service('session');
+        // $this->session = service('session');
     }
 }

composer.json

@@ -20,7 +20,7 @@
         "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.24",
         "friendsofphp/php-cs-fixer": "^3.47.1",
-        "kint-php/kint": "^6.0",
+        "kint-php/kint": "^6.1",
         "mikey179/vfsstream": "^1.6.12",
         "nexusphp/cs-config": "^3.6",
         "phpunit/phpunit": "^10.5.16 || ^11.2",

preload.php

@@ -101,7 +101,9 @@ public function load(): void
                 }
 
                 require_once $file[0];
-                echo 'Loaded: ' . $file[0] . "\n";
+                // Uncomment only for debugging (to inspect which files are included).
+                // Never use this in production - preload scripts must not generate output.
+                // echo 'Loaded: ' . $file[0] . "\n";
             }
         }
     }

system/API/ResponseTrait.php

@@ -15,19 +15,19 @@
 
 use CodeIgniter\Format\Format;
 use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\IncomingRequest;
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 
 /**
  * Provides common, more readable, methods to provide
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
  *
- * @property RequestInterface  $request
- * @property ResponseInterface $response
- * @property bool              $stringAsHtml Whether to treat string data as HTML in JSON response.
- *                                           Setting `true` is only for backward compatibility.
+ * @property CLIRequest|IncomingRequest $request
+ * @property ResponseInterface          $response
+ * @property bool                       $stringAsHtml Whether to treat string data as HTML in JSON response.
+ *                                                    Setting `true` is only for backward compatibility.
  */
 trait ResponseTrait
 {
@@ -122,9 +122,9 @@ protected function respond($data = null, ?int $status = null, string $message =
     /**
      * Used for generic failures that no custom methods exist for.
      *
-     * @param list<string>|string $messages
-     * @param int                 $status   HTTP status code
-     * @param string|null         $code     Custom, API-specific, error code
+     * @param array<array-key, string>|string $messages
+     * @param int                             $status   HTTP status code
+     * @param string|null                     $code     Custom, API-specific, error code
      *
      * @return ResponseInterface
      */
@@ -230,7 +230,7 @@ protected function failNotFound(string $description = 'Not Found', ?string $code
     /**
      * Used when the data provided by the client cannot be validated on one or more fields.
      *
-     * @param list<string>|string $errors
+     * @param array<array-key, string>|string $errors
      *
      * @return ResponseInterface
      */

system/BaseModel.php

@@ -769,7 +769,7 @@ protected function shouldUpdate($row): bool
     {
         $id = $this->getIdValue($row);
 
-        return ! ($id === null || $id === [] || $id === '');
+        return ! in_array($id, [null, [], ''], true);
     }
 
     /**
@@ -909,22 +909,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
         if (is_array($set)) {
             foreach ($set as &$row) {
-                // If $row is using a custom class with public or protected
-                // properties representing the collection elements, we need to grab
-                // them as an array.
-                if (is_object($row) && ! $row instanceof stdClass) {
-                    $row = $this->objectToArray($row, false, true);
-                }
-
-                // If it's still a stdClass, go ahead and convert to
-                // an array so doProtectFields and other model methods
-                // don't have to do special checks.
-                if (is_object($row)) {
-                    $row = (array) $row;
-                }
-
-                // Convert any Time instances to appropriate $dateFormat
-                $row = $this->timeToString($row);
+                $row = $this->transformDataRowToArray($row);
 
                 // Validate every row.
                 if (! $this->skipValidation && ! $this->validate($row)) {
@@ -1051,21 +1036,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
     {
         if (is_array($set)) {
             foreach ($set as &$row) {
-                // If $row is using a custom class with public or protected
-                // properties representing the collection elements, we need to grab
-                // them as an array.
-                if (is_object($row) && ! $row instanceof stdClass) {
-                    // For updates the index field is needed even if it is not changed.
-                    // So set $onlyChanged to false.
-                    $row = $this->objectToArray($row, false, true);
-                }
-
-                // If it's still a stdClass, go ahead and convert to
-                // an array so doProtectFields and other model methods
-                // don't have to do special checks.
-                if (is_object($row)) {
-                    $row = (array) $row;
-                }
+                $row = $this->transformDataRowToArray($row);
 
                 // Validate data before saving.
                 if (! $this->skipValidation && ! $this->validate($row)) {
@@ -1220,7 +1191,9 @@ public function replace(?array $row = null, bool $returnSQL = false)
             return false;
         }
 
-        $row = $this->setUpdatedField((array) $row, $this->setDate());
+        $row = (array) $row;
+        $row = $this->setCreatedField($row, $this->setDate());
+        $row = $this->setUpdatedField($row, $this->setDate());
 
         return $this->doReplace($row, $returnSQL);
     }
@@ -1694,6 +1667,52 @@ protected function trigger(string $event, array $eventData)
         return $eventData;
     }
 
+    /**
+     * If the model is using casts, this will convert the data
+     * in $row according to the rules defined in `$casts`.
+     *
+     * @param object|row_array|null $row Row data
+     *
+     * @return object|row_array|null Converted row data
+     *
+     * @used-by insertBatch()
+     * @used-by updateBatch()
+     *
+     * @throws ReflectionException
+     * @deprecated Since 4.6.4, temporary solution - will be removed in 4.7
+     */
+    protected function transformDataRowToArray(array|object|null $row): array|object|null
+    {
+        // If casts are used, convert the data first
+        if ($this->useCasts()) {
+            if (is_array($row)) {
+                $row = $this->converter->toDataSource($row);
+            } elseif ($row instanceof stdClass) {
+                $row = (array) $row;
+                $row = $this->converter->toDataSource($row);
+            } elseif ($row instanceof Entity) {
+                $row = $this->converter->extract($row);
+            } elseif (is_object($row)) {
+                $row = $this->converter->extract($row);
+            }
+        } elseif (is_object($row) && ! $row instanceof stdClass) {
+            // If $row is using a custom class with public or protected
+            // properties representing the collection elements, we need to grab
+            // them as an array.
+            $row = $this->objectToArray($row, false, true);
+        }
+
+        // If it's still a stdClass, go ahead and convert to
+        // an array so doProtectFields and other model methods
+        // don't have to do special checks.
+        if (is_object($row)) {
+            $row = (array) $row;
+        }
+
+        // Convert any Time instances to appropriate $dateFormat
+        return $this->timeToString($row);
+    }
+
     /**
      * Sets the return type of the results to be as an associative array.
      *

system/CLI/BaseCommand.php

@@ -142,7 +142,7 @@ public function showHelp()
     {
         CLI::write(lang('CLI.helpUsage'), 'yellow');
 
-        if (isset($this->usage)) {
+        if ($this->usage !== null) {
             $usage = $this->usage;
         } else {
             $usage = $this->name;
@@ -154,7 +154,7 @@ public function showHelp()
 
         CLI::write($this->setPad($usage, 0, 0, 2));
 
-        if (isset($this->description)) {
+        if ($this->description !== null) {
             CLI::newLine();
             CLI::write(lang('CLI.helpDescription'), 'yellow');
             CLI::write($this->setPad($this->description, 0, 0, 2));

system/CLI/CLI.php

@@ -318,11 +318,7 @@ public static function promptByMultipleKeys(string $text, array $options): array
         if ($opts === []) {
             $extraOutput = $extraOutputDefault;
         } else {
-            $optsKey = [];
-
-            foreach (array_keys($opts) as $key) {
-                $optsKey[] = $key;
-            }
+            $optsKey     = array_keys($opts);
             $extraOutput = '[' . $extraOutputDefault . ', ' . implode(', ', $optsKey) . ']';
             $extraOutput = 'You can specify multiple values separated by commas.' . PHP_EOL . $extraOutput;
         }

system/CLI/Commands.php

@@ -129,7 +129,7 @@ public function discoverCommands()
 
                 $class = new $className($this->logger, $this);
 
-                if (isset($class->group) && ! isset($this->commands[$class->name])) {
+                if ($class->group !== null && ! isset($this->commands[$class->name])) {
                     $this->commands[$class->name] = [
                         'class'       => $className,
                         'file'        => $file,

system/Cache/Handlers/PredisHandler.php

@@ -162,6 +162,10 @@ public function deleteMatching(string $pattern)
             $matchedKeys[] = $key;
         }
 
+        if ($matchedKeys === []) {
+            return 0;
+        }
+
         return $this->redis->del($matchedKeys);
     }