Renamed the property _hasErrors and method hasErrors() to respectivel…

…y _canBePersisted and canBePersisted().
cakephp · Jul 4, 2018 · 4069319 · 4069319
1 parent f620cad
commit 4069319
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/src/Datasource/EntityInterface.php b/src/Datasource/EntityInterface.php
@@ -29,8 +29,8 @@
  * @method array getVirtual()
  * @method $this setDirty($property, $isDirty)
  * @method bool isDirty($property = null)
+ * @method bool canBePersisted()
  * @method array getErrors()
- * @method bool hasErrors()
  * @method array getError($field)
  * @method array setErrors(array $fields, $overwrite = false)
  * @method array setError($field, $errors, $overwrite = false)

diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -91,18 +91,18 @@ trait EntityTrait
     protected $_new = true;
 
     /**
-     * List of errors per field as stored in this object
+     * Returns whether this entity can be persisted.
      *
-     * @var array
+     * @var bool
      */
-    protected $_errors = [];
+    protected $_canBePersisted = true;
 
     /**
-     * Returns whether this entity contains errors.
+     * List of errors per field as stored in this object
      *
-     * @var bool
+     * @var array
      */
-    protected $_hasErrors = false;
+    protected $_errors = [];
 
     /**
      * List of invalid fields and their data for errors upon validation/patching
@@ -865,7 +865,7 @@ public function clean()
     {
         $this->_dirty = [];
         $this->_errors = [];
-        $this->_hasErrors = false;
+        $this->_canBePersisted = true;
         $this->_invalid = [];
         $this->_original = [];
     }
@@ -899,6 +899,16 @@ public function isNew($new = null)
         return $this->_new = $new;
     }
 
+    /**
+     * Returns whether this entity can be persisted.
+     *
+     * @return bool
+     */
+    public function canBePersisted()
+    {
+        return $this->_canBePersisted;
+    }
+
     /**
      * Returns all validation errors.
      *
@@ -919,16 +929,6 @@ public function getErrors()
             ->toArray();
     }
 
-    /**
-     * Returns whether this entity contains errors.
-     *
-     * @return bool
-     */
-    public function hasErrors()
-    {
-        return $this->_hasErrors;
-    }
-
     /**
      * Returns validation errors of a field
      *
@@ -961,7 +961,7 @@ public function getError($field)
      */
     public function setErrors(array $fields, $overwrite = false)
     {
-        $this->_hasErrors = true;
+        $this->_canBePersisted = false;
         if ($overwrite) {
             foreach ($fields as $f => $error) {
                 $this->_errors[$f] = (array)$error;

diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1902,7 +1902,7 @@ public function save(EntityInterface $entity, $options = [])
             '_primary' => true
         ]);
 
-        if ($entity->hasErrors() === true) {
+        if ($entity->canBePersisted() === false) {
             return false;
         }