Fix empty collections being treated as EntityContext.

An empty collection should not fall into the EntityContext as it will cause errors downstream. Instead of just sniffing against Travserable, using a temporary Collection to access the first element will give a better test of what is in an object/array. Fixes #4698
cakephp · Sep 25, 2014 · e7a8582 · e7a8582
1 parent d5828d0
commit e7a8582
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -16,6 +16,7 @@
 
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
+use Cake\Collection\Collection;
 use Cake\ORM\Entity;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
@@ -216,11 +217,16 @@ protected function _addDefaultContextProviders() {
 		});
 
 		$this->addContextProvider('orm', function ($request, $data) {
-			if (
+			if (is_array($data['entity']) || $data['entity'] instanceof Traversable) {
-				$data['entity'] instanceof Entity ||
+				$pass = (new Collection($data['entity']))->first() !== null;
-				$data['entity'] instanceof Traversable ||
+				if ($pass) {
-				(is_array($data['entity']) && !isset($data['entity']['schema']))
+					return new EntityContext($request, $data);
-			) {
+				}
+			}
+			if ($data['entity'] instanceof Entity) {
+				return new EntityContext($request, $data);
+			}
+			if (is_array($data['entity']) && empty($data['entity']['schema'])) {
 				return new EntityContext($request, $data);
 			}
 		});

diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -272,6 +272,9 @@ public function testAddContextProviderInvalid() {
 	public function contextSelectionProvider() {
 		$entity = new Article();
 		$collection = $this->getMock('Cake\Collection\Collection', ['extract'], [[$entity]]);
+		$emptyCollection = new Collection([]);
+		$emptyArray = [];
+		$arrayObject = new \ArrayObject([]);
 		$data = [
 			'schema' => [
 				'title' => ['type' => 'string']
@@ -281,7 +284,9 @@ public function contextSelectionProvider() {
 		return [
 			'entity' => [$entity, 'Cake\View\Form\EntityContext'],
 			'collection' => [$collection, 'Cake\View\Form\EntityContext'],
+			'empty_collection' => [$emptyCollection, 'Cake\View\Form\NullContext'],
 			'array' => [$data, 'Cake\View\Form\ArrayContext'],
+			'array_object' => [$arrayObject, 'Cake\View\Form\NullContext'],
 			'none' => [null, 'Cake\View\Form\NullContext'],
 			'false' => [false, 'Cake\View\Form\NullContext'],
 		];