Hash::get() should not throw an exception on '' or null path.

Port fixes for #6297 to 3.0. This resolves a regression that was introduced in 2.6.x.
cakephp · Apr 9, 2015 · fcd51e1 · fcd51e1
1 parent d1a17c2
commit fcd51e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -45,7 +45,7 @@ class Hash
      */
     public static function get(array $data, $path, $default = null)
     {
-        if (empty($data)) {
+        if (empty($data) || $path === null || $path === '') {
             return $default;
         }
 

diff --git a/tests/TestCase/Utility/HashTest.php b/tests/TestCase/Utility/HashTest.php
@@ -210,6 +210,9 @@ public function testGet()
         $result = Hash::get($data, '');
         $this->assertNull($result);
 
+        $result = Hash::get($data, null, '-');
+        $this->assertSame('-', $result);
+
         $result = Hash::get($data, '0.Article.title');
         $this->assertEquals('First Article', $result);