Permalink
Browse files

Added configurable default value to Hash::get()

  • Loading branch information...
1 parent e5c2d4f commit e68a61c375f42b73775aec177bfc92767838f3bc @davidsteinsland davidsteinsland committed Oct 31, 2013
Showing with 8 additions and 3 deletions.
  1. +4 −0 lib/Cake/Test/Case/Utility/HashTest.php
  2. +4 −3 lib/Cake/Utility/Hash.php
@@ -205,6 +205,10 @@ public function testGet() {
$result = Hash::get($data, '5.Article.title');
$this->assertNull($result);
+ $default = array('empty');
+ $this->assertEquals($default, Hash::get($data, '5.Article.title', $default));
+ $this->assertEquals($default, Hash::get(array(), '5.Article.title', $default));
+
$result = Hash::get($data, '1.Article.title.not_there');
$this->assertNull($result);
@@ -37,12 +37,13 @@ class Hash {
* @param array $data Array of data to operate on.
* @param string|array $path The path being searched for. Either a dot
* separated string, or an array of path segments.
+ * @param mixed $default The return value when the path does not exist
* @return mixed The value fetched from the array, or null.
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::get
*/
- public static function get(array $data, $path) {
+ public static function get(array $data, $path, $default = null) {
if (empty($data)) {
- return null;
+ return $default;
}
if (is_string($path) || is_numeric($path)) {
$parts = explode('.', $path);
@@ -53,7 +54,7 @@ public static function get(array $data, $path) {
if (is_array($data) && isset($data[$key])) {
$data =& $data[$key];
} else {
- return null;
+ return $default;
}
}
return $data;

0 comments on commit e68a61c

Please sign in to comment.