Merge pull request #838 from buddylindsey/modify_key_assertions

Modify AssertHasKey and AssertHasNotKey to work with null value
UnionOfRAD · Mar 5, 2013 · dc9fd97 · dc9fd97
2 parents bc12382 + aecc424
commit dc9fd97
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/test/Unit.php b/test/Unit.php
@@ -1170,7 +1170,13 @@ public function assertNotCount($expected, $array, $message = '{:message}') {
 	 * @return bool
 	 */
 	public function assertArrayHasKey($key, $array, $message = '{:message}') {
-		return $this->assert(isset($array[$key]), $message, array(
+		if (is_object($array) && $array instanceof \ArrayAccess) {
+		    $result = isset($array[$key]);
+		} else {
+			$result = array_key_exists($key, $array);
+		}
+
+		return $this->assert($result, $message, array(
 			'expected' => $key,
 			'result' => $array
 		));
@@ -1193,7 +1199,13 @@ public function assertArrayHasKey($key, $array, $message = '{:message}') {
 	 * @return bool
 	 */
 	public function assertArrayNotHasKey($key, $array, $message = '{:message}') {
-		return $this->assert(!isset($array[$key]), $message, array(
+		if (is_object($array) && $array instanceof \ArrayAccess) {
+			$result = isset($array[$key]);
+		} else {
+			$result = array_key_exists($key, $array);
+		}
+
+		return $this->assert(!$result, $message, array(
 			'expected' => $key,
 			'result' => $array
 		));

diff --git a/tests/cases/test/UnitTest.php b/tests/cases/test/UnitTest.php
@@ -757,6 +757,15 @@ public function testArrayHasKeyFalse() {
 		), $result['data']);
 	}
 
+	public function testArrayHasKeyValueNull() {
+		$this->assertTrue($this->test->assertArrayHasKey('bar', array('bar' => null)));
+
+		$results = $this->test->results();
+		$result = array_pop($results);
+
+		$this->assertEqual('pass', $result['result']);
+	}
+
 	public function testArrayNotHasKeyTrue() {
 		$this->assertTrue($this->test->assertArrayNotHasKey('foo', array('bar' => 'baz')));