Fixed phalcon#14198: Missing validation value resolution

CameronHall · Jun 23, 2019 · 9fa404d · 9fa404d
1 parent 5a32421
commit 9fa404d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -64,6 +64,7 @@
 - Fixed `Phalcon\Mvc\Router` now parses and uses path. [#14087](https://github.com/phalcon/cphalcon/issues/14087)
 - Fixed various areas in `Phalcon\Acl\Adapter` and `Phalcon\Acl\Adapter\Memory` including comments, logic, `denyComponentAccess` and `AdapterInterface`. Added tests. [#13870](https://github.com/phalcon/cphalcon/issues/13870)
 - Fixed `Phalcon\Config::merge()` not merging numeric values properly [#13201](https://github.com/phalcon/cphalcon/issues/13201), [#13768](https://github.com/phalcon/cphalcon/issues/13768)
+- Fixed `Phalcon\Validation\Validator\File\AbstractFile` missing the resolution of the `value` property [#14198](https://github.com/phalcon/cphalcon/issues/14198)
 
 ## Removed
 - Removed `Phalcon\Session\Factory`. [#13672](https://github.com/phalcon/cphalcon/issues/13672)

diff --git a/phalcon/Validation/Validator/File/FileAbstract.zep b/phalcon/Validation/Validator/File/FileAbstract.zep
@@ -153,6 +153,8 @@ abstract class FileAbstract extends Validator
     {
         var label, replacePairs, value;
 
+        let value = validation->getValue(field);
+
         if !isset value["error"] || !isset value["tmp_name"] || value["error"] !== UPLOAD_ERR_OK || !is_uploaded_file(value["tmp_name"]) {
             let label = this->prepareLabel(validation, field),
                 replacePairs = [
@@ -185,6 +187,8 @@ abstract class FileAbstract extends Validator
     {
         var label, replacePairs, value;
 
+        let value = validation->getValue(field);
+
         if !isset value["name"] || !isset value["type"] || !isset value["size"] {
             let label = this->prepareLabel(validation, field),
                 replacePairs = [