Merge pull request #7042 from michalsn/fix/noAutoIncrementWithObject

fix: save object when useAutoIncrement is disabled

Author: kenjis

system/Model.php

@@ -685,8 +685,12 @@ public function insert($data = null, bool $returnID = true)
             }
         }
 
-        if ($this->useAutoIncrement === false && isset($data[$this->primaryKey])) {
-            $this->tempPrimaryKeyValue = $data[$this->primaryKey];
+        if ($this->useAutoIncrement === false) {
+            if (is_array($data) && isset($data[$this->primaryKey])) {
+                $this->tempPrimaryKeyValue = $data[$this->primaryKey];
+            } elseif (is_object($data) && isset($data->{$this->primaryKey})) {
+                $this->tempPrimaryKeyValue = $data->{$this->primaryKey};
+            }
         }
 
         $this->escape   = $this->tempData['escape'] ?? [];

tests/system/Models/SaveModelTest.php

@@ -322,4 +322,27 @@ public function testUseAutoIncrementSetToFalseSave(): void
         $this->assertSame($insert['key'], $this->model->getInsertID());
         $this->seeInDatabase('without_auto_increment', $update);
     }
+
+    public function testUseAutoIncrementSetToFalseSaveObject(): void
+    {
+        $this->createModel(WithoutAutoIncrementModel::class);
+
+        $insert = [
+            'key'   => 'some_random_key',
+            'value' => 'some value',
+        ];
+        $this->model->save((object) $insert);
+
+        $this->assertSame($insert['key'], $this->model->getInsertID());
+        $this->seeInDatabase('without_auto_increment', $insert);
+
+        $update = [
+            'key'   => 'some_random_key',
+            'value' => 'some different value',
+        ];
+        $this->model->save((object) $update);
+
+        $this->assertSame($insert['key'], $this->model->getInsertID());
+        $this->seeInDatabase('without_auto_increment', $update);
+    }
 }