Merge branch 'kevin-foster-is_hash_undefined_offset' into 1.1-dev

Author: cvanschalkwijk

lib/Utils.php

@@ -63,13 +63,15 @@ function array_flatten(array $array)
 /**
  * Somewhat naive way to determine if an array is a hash.
  */
-function is_hash(&$array)
+function is_hash($array)
 {
-	if (!is_array($array))
+	if (!is_array($array)) {
 		return false;
+	}
 
 	$keys = array_keys($array);
-	return @is_string($keys[0]) ? true : false;
+
+	return isset($keys[0]) && is_string($keys[0]);
 }
 
 /**

test/UtilsTest.php

@@ -103,5 +103,20 @@ public function test_wrap_strings_in_arrays()
 		$x = '1';
 		$this->assert_equals(array(array('1')),ActiveRecord\wrap_strings_in_arrays($x));
 	}
-}
-
+	
+	public function test_is_hash()
+	{
+		$hash = array('key' => 'value');
+		$this->assert_true(ActiveRecord\is_hash($hash));
+		
+		$notHash = array(0 => 'value');
+		$this->assert_false(ActiveRecord\is_hash($notHash));
+	}
+	
+	public function test_is_hash_empty_array()
+	{
+		$notHash = array();
+		$this->assert_false(ActiveRecord\is_hash($notHash));
+	}
+};
+?>