Fix notice error when reading array values.

We cannot assume that array keys will exist. Refs #7061
cakephp · Jul 20, 2015 · ca109d9 · ca109d9
1 parent d5b2551
commit ca109d9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/View/Form/EntityContext.php b/src/View/Form/EntityContext.php
@@ -223,7 +223,8 @@ public function val($field)
         if ($entity instanceof EntityInterface) {
             return $entity->get(array_pop($parts));
         } elseif (is_array($entity)) {
-            return $entity[array_pop($parts)];
+            $key = array_pop($parts);
+            return isset($entity[$key]) ? $entity[$key] : null;
         }
         return null;
     }

diff --git a/tests/TestCase/View/Form/EntityContextTest.php b/tests/TestCase/View/Form/EntityContextTest.php
@@ -477,6 +477,12 @@ public function testValGetArrayValue()
 
         $result = $context->val('tag.name');
         $this->assertEquals($row->tag['name'], $result);
+
+        $result = $context->val('tag.nope');
+        $this->assertNull($result);
+
+        $result = $context->val('author.roles.3');
+        $this->assertNull($result);
     }
 
     /**