fix for #4563

cakephp · Sep 11, 2014 · 828efb0 · 828efb0
1 parent d87fcbb
commit 828efb0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 19 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -660,11 +660,12 @@ protected function _readError($object, $path = null) {
 			return $object->errors($path);
 		}
 		if (is_array($object)) {
-			return array_map(function($val) {
+			$array = array_map(function($val) {
 				if ($val instanceof static) {
 					return $val->errors();
 				}
 			}, $object);
+			return array_filter($array);
 		}
 		return [];
 	}

diff --git a/src/View/Form/EntityContext.php b/src/View/Form/EntityContext.php
@@ -456,16 +456,7 @@ public function attributes($field) {
  * @return bool Returns true if the errors for the field are not empty.
  */
 	public function hasError($field) {
-		$errors = $this->error($field);
+		return $this->error($field) !== [];
-		if ($errors !== []) {
-			foreach ($errors as $key => $value) {
-				if (!is_null($value)) {
-					return true;
-				}
-			}
-			return false;
-		}
-		return false;
 	}
 
 /**

diff --git a/tests/TestCase/View/Form/EntityContextTest.php b/tests/TestCase/View/Form/EntityContextTest.php
@@ -794,13 +794,6 @@ public function testHasError() {
 			'user' => new Entity(['username' => 'Mark']),
 		]);
 		$row->errors('title', []);
-		$row->errors(['uploadedFile' => [
-			'name' => null,
-			'tmp_name' => null,
-			'error' => null,
-			'type' => null,
-			'size' => null
-		]]);
 		$row->errors('body', 'Gotta have one');
 		$row->errors('user_id', ['Required field']);
 		$context = new EntityContext($this->request, [
@@ -809,7 +802,6 @@ public function testHasError() {
 		]);
 
 		$this->assertFalse($context->hasError('title'));
-		$this->assertFalse($context->hasError('uploadedFile'));
 		$this->assertFalse($context->hasError('nope'));
 		$this->assertTrue($context->hasError('body'));
 		$this->assertTrue($context->hasError('user_id'));