Fixed coding styles and done requested changes in BaseModel.php

Author: patel-vansh

system/BaseModel.php

@@ -921,11 +921,10 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
                     } elseif (is_object($row)) {
                         $row = $this->converter->extract($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) {
+                } 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);
                 }
 
@@ -1076,11 +1075,11 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                     } elseif (is_object($row)) {
                         $row = $this->converter->extract($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) {
+                } 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.
+
                     // For updates the index field is needed even if it is not changed.
                     // So set $onlyChanged to false.
                     $row = $this->objectToArray($row, false, true);

tests/system/Models/InsertModelTest.php

@@ -382,21 +382,21 @@ public function testInsertBatchWithCasts(): void
     {
         $userData = [
             [
-                'name' => 'Smriti',
+                'name'  => 'Smriti',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]'
+                    'work'     => '[email protected]',
                 ],
                 'country' => 'India',
             ],
             [
-                'name' => 'Rahul',
+                'name'  => 'Rahul',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]'
+                    'work'     => '[email protected]',
                 ],
                 'country' => 'India',
-            ]
+            ],
         ];
         $this->createModel(UserCastsTimestampModel::class);
 
@@ -410,7 +410,7 @@ public function testInsertBatchWithCasts(): void
         $this->assertCount(2, $rows);
 
         $smriti = $rows[0];
-        $rahul = $rows[1];
+        $rahul  = $rows[1];
 
         $this->assertNotNull($smriti);
         $this->assertNotNull($rahul);
@@ -427,5 +427,4 @@ public function testInsertBatchWithCasts(): void
         $this->assertSame('[email protected]', $rahul['email']['personal']);
         $this->assertSame('[email protected]', $rahul['email']['work']);
     }
-
 }

tests/system/Models/UpdateModelTest.php

@@ -611,18 +611,18 @@ public function testUpdateBatchWithCasts(): void
         // Step 1: Insert initial users
         $initialData = [
             [
-                'name' => 'Smriti',
+                'name'  => 'Smriti',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]',
+                    'work'     => '[email protected]',
                 ],
                 'country' => 'India',
             ],
             [
-                'name' => 'Rahul',
+                'name'  => 'Rahul',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]',
+                    'work'     => '[email protected]',
                 ],
                 'country' => 'India',
             ],
@@ -636,27 +636,27 @@ public function testUpdateBatchWithCasts(): void
         $this->assertCount(2, $rows);
 
         $smriti = $rows[0];
-        $rahul = $rows[1];
+        $rahul  = $rows[1];
 
         $this->assertNotNull($smriti);
         $this->assertNotNull($rahul);
 
         // Step 3: Prepare update data (must include 'id' key)
         $updateData = [
             [
-                'id' => $smriti['id'],
-                'name' => 'Smriti Updated',
+                'id'    => $smriti['id'],
+                'name'  => 'Smriti Updated',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]',
+                    'work'     => '[email protected]',
                 ],
             ],
             [
-                'id' => $rahul['id'],
-                'name' => 'Rahul Updated',
+                'id'    => $rahul['id'],
+                'name'  => 'Rahul Updated',
                 'email' => [
                     'personal' => '[email protected]',
-                    'work' => '[email protected]',
+                    'work'     => '[email protected]',
                 ],
             ],
         ];
@@ -671,7 +671,7 @@ public function testUpdateBatchWithCasts(): void
         $this->assertCount(2, $rows);
 
         $smritiUpdated = $rows[0];
-        $rahulUpdated = $rows[1];
+        $rahulUpdated  = $rows[1];
 
         // Smriti assertions
         $this->assertSame('Smriti Updated', $smritiUpdated['name']);