optimize Model::initEntityIdAndAssertUnchanged hook

atk4 · Jan 24, 2023 · d4ec429 · d4ec429
1 parent ac9dcd6
commit d4ec429
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Model.php b/src/Model.php
@@ -420,7 +420,7 @@ private function initEntityIdAndAssertUnchanged(): void
         if ($this->_entityId === null) {
             // set entity ID to the first seen ID
             $this->_entityId = $id;
-        } elseif (!$this->compare($this->idField, $this->_entityId)) {
+        } elseif ($this->_entityId !== $id && !$this->compare($this->idField, $this->_entityId)) {
             $this->unload(); // data for different ID were loaded, make sure to discard them
 
             throw (new Exception('Model instance is an entity, ID cannot be changed to a different one'))

diff --git a/tests/ConditionSqlTest.php b/tests/ConditionSqlTest.php
@@ -74,7 +74,7 @@ public function testEntityReloadWithDifferentIdException(): void
         }, null, Model::class)();
 
         $this->expectException(Exception::class);
-        $this->expectExceptionMessageMatches('~entity.+different~');
+        $this->expectExceptionMessageMessage('Model instance is an entity, ID cannot be changed to a different one');
         $m->reload();
     }