refactor: early return

Complex conditions cause bugs.
codeigniter4 · Dec 6, 2021 · 35b612b · 35b612b
1 parent a0a55ed
commit 35b612b
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/system/Model.php b/system/Model.php
@@ -584,12 +584,15 @@ public function set($key, $value = '', ?bool $escape = null)
      */
     protected function shouldUpdate($data): bool
     {
+        if (parent::shouldUpdate($data) === false) {
+            return false;
+        }
+
         // When useAutoIncrement feature is disabled, check
         // in the database if given record already exists
-        return parent::shouldUpdate($data)
-            && ($this->useAutoIncrement
+        return $this->useAutoIncrement
                 ? true
-                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1);
+                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
     }
 
     /**