refactor: Apply suggestions (revert)

Author: neznaika0

system/BaseModel.php

@@ -212,8 +212,8 @@ abstract class BaseModel
     protected bool $updateOnlyChanged = true;
 
     /**
-     * Rules used to validate data
-     * in $this->insert(), $this->update(), $this->save() methods.
+     * Rules used to validate data in insert(), update(), save(),
+     * insertBatch(), and updateBatch() methods.
      *
      * The array must match the format of data passed to the `Validation`
      * library.
@@ -973,8 +973,7 @@ public function update($id = null, $row = null): bool
             throw new InvalidArgumentException('update(): argument #1 ($id) should not be boolean.');
         }
 
-        // if (is_numeric($id) || is_string($id)) {
-        if (! in_array($id, [null, 0, '0'], true) && (is_numeric($id) || is_string($id))) {
+        if (is_numeric($id) || is_string($id)) {
             $id = [$id];
         }
 
@@ -1105,7 +1104,7 @@ public function delete($id = null, bool $purge = false)
             throw new InvalidArgumentException('delete(): argument #1 ($id) should not be boolean.');
         }
 
-        if (! in_array($id, [null, 0, '0'], true) && (is_numeric($id) || is_string($id))) {
+        if (is_numeric($id) || is_string($id)) {
             $id = [$id];
         }
 

system/Model.php

@@ -506,6 +506,9 @@ public function countAllResults(bool $reset = true, bool $test = false)
             $this->builder()->where($this->table . '.' . $this->deletedField, null);
         }
 
+        // When $reset === false, the $tempUseSoftDeletes will be
+        // dependent on $useSoftDeletes value because we don't
+        // want to add the same "where" condition for the second time.
         $this->tempUseSoftDeletes = $reset
             ? $this->useSoftDeletes
             : ($this->useSoftDeletes ? false : $this->useSoftDeletes);