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

Author: michalsn

.github/workflows/test-scss.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v5.0.0
         with:
           # node version based on dart-sass test workflow
           node-version: 16

composer.json

@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^3.0",
-        "rector/rector": "2.1.4",
+        "rector/rector": "2.1.5",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

rector.php

@@ -35,6 +35,7 @@
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\AddParamTypeFromDependsRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\RemoveDataProviderParamKeysRector;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\YieldDataProviderRector;
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -170,6 +171,9 @@
         CompactToVariablesRector::class,
 
         RemoveDataProviderParamKeysRector::class,
+
+        // buggy on no depends, @see https://github.com/rectorphp/rector-phpunit/pull/537
+        AddParamTypeFromDependsRector::class,
     ])
     // auto import fully qualified class names
     ->withImportNames(removeUnusedImports: true)

system/BaseModel.php

@@ -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/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php

@@ -99,7 +99,7 @@ public function get(): array
      *
      * @return list<array<string, array|string>>
      */
-    private function addFilters($routes)
+    private function addFilters(array $routes): array
     {
         $filterCollector = new FilterCollector(true);
 

system/Database/BaseBuilder.php

@@ -3257,18 +3257,17 @@ protected function compileOrderBy(): string
     {
         if (is_array($this->QBOrderBy) && $this->QBOrderBy !== []) {
             foreach ($this->QBOrderBy as &$orderBy) {
+                if (is_string($orderBy)) {
+                    continue;
+                }
                 if ($orderBy['escape'] !== false && ! $this->isLiteral($orderBy['field'])) {
                     $orderBy['field'] = $this->db->protectIdentifiers($orderBy['field']);
                 }
 
                 $orderBy = $orderBy['field'] . $orderBy['direction'];
             }
 
-            return $this->QBOrderBy = "\nORDER BY " . implode(', ', $this->QBOrderBy);
-        }
-
-        if (is_string($this->QBOrderBy)) {
-            return $this->QBOrderBy;
+            return "\nORDER BY " . implode(', ', $this->QBOrderBy);
         }
 
         return '';

tests/system/Config/FactoriesTest.php

@@ -460,7 +460,7 @@ public function testGetComponentInstances(): array
      * }
      */
     #[Depends('testGetComponentInstances')]
-    public function testSetComponentInstances(array $data)
+    public function testSetComponentInstances(array $data): array
     {
         $before = Factories::getComponentInstances('config');
         $this->assertSame(['options' => [], 'aliases' => [], 'instances' => []], $before);

tests/system/Database/Builder/SelectTest.php

@@ -407,4 +407,24 @@ public function testSelectResetQuery(): void
             str_replace("\n", ' ', $sql),
         );
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/9696
+     */
+    public function testGetCompiledSelect(): void
+    {
+        $builder = new BaseBuilder('users', $this->db);
+
+        $builder->select('name, role')->orderBy('name', 'desc');
+
+        $expected = 'SELECT "name", "role" FROM "users" ORDER BY "name" DESC';
+
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect(false)));
+
+        $builder->orderBy('role', 'desc');
+
+        $expected = 'SELECT "name", "role" FROM "users" ORDER BY "name" DESC, "role" DESC';
+
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }

tests/system/Database/Live/OCI8/CallStoredProcedureTest.php

@@ -38,7 +38,7 @@ protected function setUp(): void
 
     public function testCallPackageProcedure(): void
     {
-        $result = 0;
+        $result = '0';
 
         $this->db->storedProcedure('calculator.plus', [
             [
@@ -60,7 +60,7 @@ public function testCallPackageProcedure(): void
 
     public function testCallStoredProcedure(): void
     {
-        $result = 0;
+        $result = '0';
 
         $this->db->storedProcedure('plus', [
             [

tests/system/Models/InsertModelTest.php

@@ -22,6 +22,7 @@
 use stdClass;
 use Tests\Support\Entity\User;
 use Tests\Support\Models\JobModel;
+use Tests\Support\Models\UserCastsTimestampModel;
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\UserObjModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
@@ -376,4 +377,34 @@ public function testInsertWithDefaultValue(): void
         $id = $this->model->getInsertID();
         $this->assertSame($entity->country, $this->model->find($id)->country);
     }
+
+    public function testInsertBatchWithCasts(): void
+    {
+        $userData = [
+            [
+                'name'  => 'Smriti',
+                'email' => [
+                    'personal' => 'smriti@india.com',
+                    'work'     => 'smriti@company.com',
+                ],
+                'country' => 'India',
+            ],
+            [
+                'name'  => 'Rahul',
+                'email' => [
+                    'personal' => 'rahul123@india.com',
+                    'work'     => 'rahul@company123.com',
+                ],
+                'country' => 'India',
+            ],
+        ];
+        $this->createModel(UserCastsTimestampModel::class);
+
+        $numRows = $this->model->insertBatch($userData); // @phpstan-ignore argument.type
+
+        $this->assertSame(2, $numRows);
+
+        $this->seeInDatabase('user', ['email' => json_encode($userData[0]['email'])]);
+        $this->seeInDatabase('user', ['email' => json_encode($userData[1]['email'])]);
+    }
 }