[system] fix validation

Umisoft · Jul 30, 2014 · 42d692b · 42d692b
1 parent 60aa068
commit 42d692b
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 13 deletions.
diff --git a/library/form/adapter/ArrayFormAdapter.php b/library/form/adapter/ArrayFormAdapter.php
@@ -61,7 +61,7 @@ public function getData(IFormElement $element)
     /**
      * {@inheritdoc}
      */
-    public function validate(IFormElement $element)
+    public function validate(IFormElement $element, $value)
     {
         return true;
     }

diff --git a/library/form/adapter/ConfigFormAdapter.php b/library/form/adapter/ConfigFormAdapter.php
@@ -61,7 +61,7 @@ public function getData(IFormElement $element)
     /**
      * {@inheritdoc}
      */
-    public function validate(IFormElement $element)
+    public function validate(IFormElement $element, $value)
     {
         return true;
     }

diff --git a/library/form/adapter/DefaultFormAdapter.php b/library/form/adapter/DefaultFormAdapter.php
@@ -57,7 +57,7 @@ public function getData(IFormElement $element)
     /**
      * {@inheritdoc}
      */
-    public function validate(IFormElement $element)
+    public function validate(IFormElement $element, $value)
     {
         return true;
     }

diff --git a/library/form/adapter/IDataAdapter.php b/library/form/adapter/IDataAdapter.php
@@ -35,9 +35,10 @@ public function getData(IFormElement $element);
     /**
      * Валидирует значение провайдера данных.
      * @param IFormElement $element элемент формы, для которого формируется значение
+     * @param mixed $value значение
      * @return bool
      */
-    public function validate(IFormElement $element);
+    public function validate(IFormElement $element, $value);
 
     /**
      * Возвращает ошибки валидации провайдера данных.

diff --git a/library/form/adapter/ObjectFormAdapter.php b/library/form/adapter/ObjectFormAdapter.php
@@ -113,10 +113,10 @@ public function getData(IFormElement $element)
     /**
      * {@inheritdoc}
      */
-    public function validate(IFormElement $element)
+    public function validate(IFormElement $element, $value)
     {
         if ($dataSource = $element->getDataSource()) {
-            return $this->data->getPropertyByPath($dataSource)->validate();
+            return $this->data->getPropertyByPath($dataSource)->validate($value);
         }
 
         return true;

diff --git a/library/form/element/BaseFormElement.php b/library/form/element/BaseFormElement.php
@@ -202,7 +202,7 @@ protected function validate($value)
     {
         $isValid =
             $this->getValidators()->isValid($value) &&
-            $this->getDataAdapter()->validate($this);
+            $this->getDataAdapter()->validate($this, $value);
 
         $this->messages = array_merge(
             $this->getValidators()->getMessages(),

diff --git a/library/orm/object/Object.php b/library/orm/object/Object.php
@@ -647,7 +647,7 @@ public function validate()
         $result = true;
 
         foreach ($this->getAllProperties() as $property) {
-            if (!$property->validate()) {
+            if (!$property->validate($property->getValue())) {
                 $this->validationErrors[$property->getFullName()] = $property->getValidationErrors();
                 $result = false;
             }

diff --git a/library/orm/object/property/IProperty.php b/library/orm/object/property/IProperty.php
@@ -128,10 +128,11 @@ public function getLocaleId();
     public function rollback();
 
     /**
-     * Производит валидацию
+     * Производит валидацию.
+     * @param mixed $value значение
      * @return bool результат валидации
      */
-    public function validate();
+    public function validate($value);
 
     /**
      * Возвращает список ошибок валидации

diff --git a/library/orm/object/property/Property.php b/library/orm/object/property/Property.php
@@ -335,7 +335,7 @@ public function update($value)
     /**
      * {@inheritdoc}
      */
-    public function validate()
+    public function validate($value)
     {
         $result = true;
         $this->validationErrors = [];
@@ -350,7 +350,7 @@ public function validate()
         if ($validators = $this->getField()->getValidatorsConfig($this->getLocaleId())) {
 
             $validatorCollection = $this->createValidatorCollection($validators);
-            if (!$validatorCollection->isValid($this->getValue())) {
+            if (!$validatorCollection->isValid($value)) {
                 $this->addValidationErrors($validatorCollection->getMessages());
                 $result = false;
             }

diff --git a/tests/utest/orm/func/object/ValidatorsTest.php b/tests/utest/orm/func/object/ValidatorsTest.php
@@ -29,9 +29,18 @@ protected function getCollectionConfig()
                 self::USERS_USER             => [
                     'type' => ICollectionFactory::TYPE_SIMPLE
                 ],
+                self::USERS_PROFILE             => [
+                    'type' => ICollectionFactory::TYPE_SIMPLE
+                ],
                 self::USERS_GROUP            => [
                     'type' => ICollectionFactory::TYPE_SIMPLE
-                ]
+                ],
+                self::BLOGS_BLOG             => [
+                    'type'      => ICollectionFactory::TYPE_SIMPLE_HIERARCHIC,
+                ],
+                self::BLOGS_SUBSCRIBER => [
+                    'type' => ICollectionFactory::TYPE_SIMPLE
+                ],
             ],
             true
         ];