Fix Model/Property Validation (#10)

Fix Model/Property Validation
locomotivemtl · Nov 4, 2019 · 8b4510e · 8b4510e
2 parents 1845a60 + ca77046
commit 8b4510e
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "0.8.x-dev"
+            "dev-master": "0.9.x-dev"
         }
     },
     "require": {
@@ -30,7 +30,7 @@
         "psr/log": "^1.0",
         "psr/cache": "^1.0",
         "locomotivemtl/charcoal-config": "~0.9",
-        "locomotivemtl/charcoal-core": "~0.4",
+        "locomotivemtl/charcoal-core": "~0.5",
         "locomotivemtl/charcoal-factory": "~0.4",
         "locomotivemtl/charcoal-image": "~0.4",
         "locomotivemtl/charcoal-translator": "~0.3"

diff --git a/src/Charcoal/Property/AbstractProperty.php b/src/Charcoal/Property/AbstractProperty.php
@@ -291,9 +291,10 @@ public function l10nIdent($lang = null)
     /**
      * Set the property's value.
      *
+     * @deprecated
+     *
      * @param  mixed $val The property (raw) value.
      * @return self
-     * @deprecated
      */
     final public function setVal($val)
     {
@@ -302,11 +303,26 @@ final public function setVal($val)
         return $this;
     }
 
+    /**
+     * Clear the property's value.
+     *
+     * @deprecated
+     *
+     * @return self
+     */
+    final public function clearVal()
+    {
+        $this->val = null;
+
+        return $this;
+    }
+
     /**
      * Retrieve the property's value.
      *
-     * @return mixed
      * @deprecated
+     *
+     * @return mixed
      */
     final public function val()
     {
@@ -840,7 +856,7 @@ public function validationMethods()
         return [
             'required',
             'unique',
-            'allowNull'
+            'allowNull',
         ];
     }
 
@@ -885,8 +901,6 @@ public function validateAllowNull()
         return true;
     }
 
-
-
     /**
      * @param mixed $val The value, at time of saving.
      * @return mixed

diff --git a/src/Charcoal/Property/EmailProperty.php b/src/Charcoal/Property/EmailProperty.php
@@ -36,8 +36,9 @@ public function getMaxLength()
     public function validationMethods()
     {
         $parentMethods = parent::validationMethods();
+
         return array_merge($parentMethods, [
-            'email'
+            'email',
         ]);
     }
 

diff --git a/src/Charcoal/Property/FileProperty.php b/src/Charcoal/Property/FileProperty.php
@@ -369,7 +369,10 @@ public function validationMethods()
     {
         $parentMethods = parent::validationMethods();
 
-        return array_merge($parentMethods, [ 'accepted_mimetypes', 'max_filesize' ]);
+        return array_merge($parentMethods, [
+            'acceptedMimetypes',
+            'maxFilesize',
+        ]);
     }
 
     /**

diff --git a/src/Charcoal/Property/IdProperty.php b/src/Charcoal/Property/IdProperty.php
@@ -173,6 +173,20 @@ public function save($val)
         return $val;
     }
 
+    /**
+     * @return boolean
+     */
+    public function validateRequired()
+    {
+        $mode = $this->getMode();
+
+        if ($mode !== self::MODE_AUTO_INCREMENT) {
+            return parent::validateRequired();
+        }
+
+        return true;
+    }
+
     /**
      * Auto-generate a value upon first save.
      *

diff --git a/src/Charcoal/Property/PropertyValidator.php b/src/Charcoal/Property/PropertyValidator.php
@@ -4,9 +4,10 @@
 
 // From 'charcoal-core'
 use Charcoal\Validator\AbstractValidator;
+use Charcoal\Validator\ValidatableInterface;
 
 /**
- *
+ * Property Validator
  */
 class PropertyValidator extends AbstractValidator
 {
@@ -15,17 +16,21 @@ class PropertyValidator extends AbstractValidator
      */
     public function validate()
     {
+        $result = true;
+
         // The model, in this case, should be a PropertyInterface
-        $model = $this->model;
+        $property = $this->model;
+
+        $methods = $property->validationMethods();
+        foreach ($methods as $method) {
+            $method = $this->camelize($method);
 
-        $ret = true;
-        $validationMethods = $model->validationMethods();
-        foreach ($validationMethods as $m) {
-            $fn = [$model, 'validate_'.$m];
-            if (is_callable($fn)) {
-                $ret = $ret && call_user_func($fn);
+            $func = [ $property, 'validate'.ucfirst($method) ];
+            if (is_callable($func)) {
+                $result = $result && call_user_func($func);
             }
         }
-        return $ret;
+
+        return $result;
     }
 }
diff --git a/src/Charcoal/Property/StringProperty.php b/src/Charcoal/Property/StringProperty.php
@@ -325,7 +325,7 @@ public function validationMethods()
             'maxLength',
             'minLength',
             'regexp',
-            'allowEmpty'
+            'allowEmpty',
         ]);
     }
 

diff --git a/tests/Charcoal/Property/FilePropertyTest.php b/tests/Charcoal/Property/FilePropertyTest.php
@@ -135,8 +135,8 @@ public function testVaidationMethods()
     {
         $obj = $this->obj;
         $ret = $obj->validationMethods();
-        $this->assertContains('accepted_mimetypes', $ret);
-        $this->assertContains('max_filesize', $ret);
+        $this->assertContains('acceptedMimetypes', $ret);
+        $this->assertContains('maxFilesize', $ret);
     }
 
     /**