fix: toRawArray() converts DateTime objects to strings

This squashes several fixes regarding Entity::toRawArray returning string values instead of Time objects, addressing issue #8302. It also updates DatetimeCast to handle string values to prevent DataConverter crashes, and applies phpstan, rector, and cs-fix formatting.

Author: gr8man

rector.php

@@ -12,7 +12,6 @@
  */
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
-use Rector\CodeQuality\Rector\BooleanNot\NegatedAndsToPositiveOrsRector;
 use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
 use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
@@ -176,7 +175,6 @@
         ],
 
         // to be applied in separate PRs to ease review
-        NegatedAndsToPositiveOrsRector::class,
     ])
     // auto import fully qualified class names
     ->withImportNames()

system/DataCaster/Cast/DatetimeCast.php

@@ -16,6 +16,8 @@
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\I18n\Time;
+use DateTimeInterface;
+use Exception;
 
 /**
  * Class DatetimeCast
@@ -51,7 +53,15 @@ public static function set(
         array $params = [],
         ?object $helper = null,
     ): string {
-        if (! $value instanceof Time) {
+        if (is_string($value)) {
+            try {
+                $value = Time::parse($value);
+            } catch (Exception) {
+                self::invalidTypeValueError($value);
+            }
+        }
+
+        if (! $value instanceof DateTimeInterface) {
             self::invalidTypeValueError($value);
         }
 

system/Entity/Entity.php

@@ -233,6 +233,11 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
     public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
     {
         $convert = static function ($value) use (&$convert, $recursive) {
+            // Always convert DateTime objects to string for raw output
+            if ($value instanceof DateTimeInterface) {
+                return method_exists($value, '__toString') ? (string) $value : $value->format('Y-m-d H:i:s');
+            }
+
             if (! $recursive) {
                 return $value;
             }
@@ -261,9 +266,7 @@ public function toRawArray(bool $onlyChanged = false, bool $recursive = false):
 
         // When returning everything
         if (! $onlyChanged) {
-            return $recursive
-                ? array_map($convert, $this->attributes)
-                : $this->attributes;
+            return array_map($convert, $this->attributes);
         }
 
         // When filtering by changed values only
@@ -335,7 +338,7 @@ public function toRawArray(bool $onlyChanged = false, bool $recursive = false):
             }
 
             // non-recursive changed value
-            $return[$key] = $value;
+            $return[$key] = $convert($value);
         }
 
         return $return;

tests/system/Entity/EntityTest.php

@@ -367,6 +367,58 @@ public function testDateMutationTimeToTime(): void
         $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
     }
 
+    public function testToRawArrayConvertsDateTimeToString(): void
+    {
+        $entity = new class () extends Entity {
+            protected $attributes = [
+                'created_at' => null,
+                'updated_at' => null,
+            ];
+            protected $original = [
+                'created_at' => null,
+                'updated_at' => null,
+            ];
+        };
+
+        $entity->created_at = '2023-12-12 12:12:12';
+        $entity->updated_at = '2023-12-13 13:13:13';
+
+        $raw = $entity->toRawArray();
+
+        // toRawArray() should return primitive types, not objects
+        $this->assertIsString($raw['created_at']);
+        $this->assertSame('2023-12-12 12:12:12', $raw['created_at']);
+        $this->assertIsString($raw['updated_at']);
+        $this->assertSame('2023-12-13 13:13:13', $raw['updated_at']);
+
+        // Attributes themselves should still contain Time objects
+        $attrs = $this->getPrivateProperty($entity, 'attributes');
+        $this->assertInstanceOf(Time::class, $attrs['created_at']);
+        $this->assertInstanceOf(Time::class, $attrs['updated_at']);
+
+        // toArray() should still return Time objects (no regression)
+        $array = $entity->toArray();
+        $this->assertInstanceOf(Time::class, $array['created_at']);
+        $this->assertInstanceOf(Time::class, $array['updated_at']);
+    }
+
+    public function testToRawArrayConvertsStandardDateTimeToString(): void
+    {
+        $entity = new class () extends Entity {
+            protected $attributes = [
+                'my_date' => null,
+            ];
+            protected $dates = [];
+        };
+
+        $entity->my_date = new DateTime('2023-12-12 12:12:12');
+
+        $raw = $entity->toRawArray();
+
+        $this->assertIsString($raw['my_date']);
+        $this->assertSame('2023-12-12 12:12:12', $raw['my_date']);
+    }
+
     public function testCastInteger(): void
     {
         $entity = $this->getCastEntity();

utils/phpstan-baseline/argument.type.neon

@@ -1,7 +1,17 @@
-# total 68 errors
+# total 228 errors
 
 parameters:
     ignoreErrors:
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\RedirectResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../system/Config/Services.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 2
+            path: ../../system/Config/Services.php
+
         -
             message: '#^Parameter \#3 \.\.\.\$arrays of function array_map expects array, int\|string given\.$#'
             count: 1
@@ -22,6 +32,26 @@ parameters:
             count: 1
             path: ../../system/Database/SQLite3/Builder.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../system/HTTP/CURLRequest.php
+
+        -
+            message: '#^Parameter \#1 \$config of method CodeIgniter\\HTTP\\Response\:\:__construct\(\) expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../system/HTTP/DownloadResponse.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\Test\\Mock\\MockResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 2
+            path: ../../tests/system/API/ResponseTraitTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 19
+            path: ../../tests/system/Cache/ResponseCacheTest.php
+
         -
             message: '#^Parameter \#2 \$to of method CodeIgniter\\Router\\RouteCollection\:\:add\(\) expects array\|\(Closure\(mixed \.\.\.\)\: \(CodeIgniter\\HTTP\\ResponseInterface\|string\|void\)\)\|string, Closure\(mixed\)\: CodeIgniter\\HTTP\\ResponseInterface given\.$#'
             count: 1
@@ -42,6 +72,11 @@ parameters:
             count: 1
             path: ../../tests/system/CodeIgniterTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\RedirectResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 3
+            path: ../../tests/system/CommonFunctionsTest.php
+
         -
             message: '#^Parameter \#1 \$expected of method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) expects class\-string\<Config\\TestRegistrar\>, string given\.$#'
             count: 1
@@ -52,6 +87,16 @@ parameters:
             count: 2
             path: ../../tests/system/Config/FactoriesTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\Test\\Mock\\MockResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 7
+            path: ../../tests/system/Config/ServicesTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/ControllerTest.php
+
         -
             message: '#^Parameter \#1 \$from of method CodeIgniter\\Database\\BaseBuilder\:\:from\(\) expects array\|string, null given\.$#'
             count: 1
@@ -97,16 +142,66 @@ parameters:
             count: 1
             path: ../../tests/system/Debug/TimerTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\RedirectResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/Filters/PageCacheTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 10
+            path: ../../tests/system/Filters/PageCacheTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/HTTP/CURLRequestShareOptionsTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/HTTP/CURLRequestTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 6
+            path: ../../tests/system/HTTP/ContentSecurityPolicyTest.php
+
         -
             message: '#^Parameter \#1 \$array of method CodeIgniter\\Superglobals\:\:setServerArray\(\) expects array\<string, array\<mixed\>\|float\|int\|string\>, array\<string, string\|null\> given\.$#'
             count: 1
             path: ../../tests/system/HTTP/MessageTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\RedirectResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 15
+            path: ../../tests/system/HTTP/RedirectResponseTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 27
+            path: ../../tests/system/HTTP/ResponseCookieTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 5
+            path: ../../tests/system/HTTP/ResponseSendTest.php
+
         -
             message: '#^Parameter \#3 \$expire of method CodeIgniter\\HTTP\\Response\:\:setCookie\(\) expects int, string given\.$#'
             count: 1
             path: ../../tests/system/HTTP/ResponseSendTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 43
+            path: ../../tests/system/HTTP/ResponseTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\Test\\Mock\\MockResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 2
+            path: ../../tests/system/HTTP/ResponseTest.php
+
         -
             message: '#^Parameter \#1 \$data of method CodeIgniter\\HTTP\\Message\:\:setBody\(\) expects string, array\<string, list\<int\>\|string\> given\.$#'
             count: 2
@@ -122,6 +217,11 @@ parameters:
             count: 1
             path: ../../tests/system/HTTP/SiteURITest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\Test\\Mock\\MockResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/Helpers/CookieHelperTest.php
+
         -
             message: '#^Parameter \#2 \$value of function form_hidden expects array\|string, null given\.$#'
             count: 1
@@ -152,11 +252,21 @@ parameters:
             count: 2
             path: ../../tests/system/Images/GDHandlerTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\Test\\Mock\\MockResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+
         -
             message: '#^Parameter \#2 \$message of method CodeIgniter\\Log\\Handlers\\ChromeLoggerHandler\:\:handle\(\) expects string, stdClass given\.$#'
             count: 1
             path: ../../tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 2
+            path: ../../tests/system/RESTful/ResourceControllerTest.php
+
         -
             message: '#^Parameter \#1 \$format of method CodeIgniter\\RESTful\\ResourceController\:\:setFormat\(\) expects ''json''\|''xml'', ''Nonsense'' given\.$#'
             count: 1
@@ -172,6 +282,11 @@ parameters:
             count: 1
             path: ../../tests/system/Test/FeatureTestTraitTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 2
+            path: ../../tests/system/Test/TestCaseEmissionsTest.php
+
         -
             message: '#^Parameter \#1 \$body of method CodeIgniter\\HTTP\\Response\:\:setJSON\(\) expects array\|object\|string, false given\.$#'
             count: 1
@@ -182,6 +297,16 @@ parameters:
             count: 1
             path: ../../tests/system/Test/TestResponseTest.php
 
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\RedirectResponse constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 5
+            path: ../../tests/system/Test/TestResponseTest.php
+
+        -
+            message: '#^Parameter \#1 \$config of class CodeIgniter\\HTTP\\Response constructor expects CodeIgniter\\HTTP\\App, Config\\App given\.$#'
+            count: 1
+            path: ../../tests/system/Test/TestResponseTest.php
+
         -
             message: '#^Parameter \#3 \$errors of method CodeIgniter\\Validation\\Validation\:\:check\(\) expects list\<string\>, array\{is_numeric\: ''Nope\. Not a number\.''\} given\.$#'
             count: 1

utils/phpstan-baseline/empty.notAllowed.neon

@@ -1,4 +1,4 @@
-# total 212 errors
+# total 205 errors
 
 parameters:
     ignoreErrors:

utils/phpstan-baseline/loader.neon

@@ -1,4 +1,4 @@
-# total 1819 errors
+# total 1972 errors
 
 includes:
     - argument.type.neon