From 94d9c06a8d1089369abf3b0bfbd65953d698c240 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 7 Nov 2012 14:49:49 +0100 Subject: [PATCH 1/4] $callback parameter was missing --- PHPUnit/Framework/Assert.php | 1 + PHPUnit/Framework/Assert/Functions.php | 5 +++-- PHPUnit/Framework/Constraint/Callback.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PHPUnit/Framework/Assert.php b/PHPUnit/Framework/Assert.php index 66e2301c280..5b8537473d7 100644 --- a/PHPUnit/Framework/Assert.php +++ b/PHPUnit/Framework/Assert.php @@ -2376,6 +2376,7 @@ public static function isTrue() /** * Returns a PHPUnit_Framework_Constraint_Callback matcher object. * + * @param callable $callback * @return PHPUnit_Framework_Constraint_Callback */ public static function callback($callback) diff --git a/PHPUnit/Framework/Assert/Functions.php b/PHPUnit/Framework/Assert/Functions.php index 057a950175e..2b0e04ca412 100644 --- a/PHPUnit/Framework/Assert/Functions.php +++ b/PHPUnit/Framework/Assert/Functions.php @@ -1699,11 +1699,12 @@ function isTrue() /** * Returns a PHPUnit_Framework_Constraint_Callback matcher object. * + * @param callable $callback * @return PHPUnit_Framework_Constraint_Callback */ -function callback() +function callback($callback) { - return PHPUnit_Framework_Assert::callback(); + return PHPUnit_Framework_Assert::callback($callback); } /** diff --git a/PHPUnit/Framework/Constraint/Callback.php b/PHPUnit/Framework/Constraint/Callback.php index 7a3340dcf7a..dbc33ceb90b 100644 --- a/PHPUnit/Framework/Constraint/Callback.php +++ b/PHPUnit/Framework/Constraint/Callback.php @@ -58,7 +58,7 @@ class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint private $callback; /** - * @param callable $value + * @param callable $callback * @throws InvalidArgumentException */ public function __construct($callback) From 2129696fe6d06eeaeab8b8a0fa6682a009a18b18 Mon Sep 17 00:00:00 2001 From: Volker Dusch Date: Sat, 10 Nov 2012 17:30:17 +0100 Subject: [PATCH 2/4] Fix #709 --- ChangeLog.md | 2 ++ PHPUnit/Framework/Constraint/JsonMatches.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index e68f5f10ccb..bc434d20936 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,8 @@ PHPUnit 3.7 This is the list of changes for the PHPUnit 3.7 release series. +* Fixed #709: `assertJsonStringEqualsJsonFile` didn't work with json arrays. + PHPUnit 3.7.9 ------------- diff --git a/PHPUnit/Framework/Constraint/JsonMatches.php b/PHPUnit/Framework/Constraint/JsonMatches.php index 01bb70b8e8d..de3ed61c174 100644 --- a/PHPUnit/Framework/Constraint/JsonMatches.php +++ b/PHPUnit/Framework/Constraint/JsonMatches.php @@ -83,13 +83,13 @@ public function __construct($value) protected function matches($other) { $decodedOther = json_decode($other); - if (!is_object($decodedOther)) { + if (json_last_error()) { $this->failure_reason = $this->getJsonError(); return FALSE; } $decodedValue = json_decode($this->value); - if (!is_object($decodedValue)) { + if (json_last_error()) { $this->failure_reason = $this->getJsonError(); return FALSE; } @@ -123,4 +123,4 @@ public function toString() $this->value ); } -} \ No newline at end of file +} From 9aaf94f72b9a51bdba97cb962829b0544ef00805 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Tue, 6 Nov 2012 22:40:22 +0100 Subject: [PATCH 3/4] Bump version number. --- PHPUnit/Runner/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPUnit/Runner/Version.php b/PHPUnit/Runner/Version.php index 3691c32816d..28521c72d81 100644 --- a/PHPUnit/Runner/Version.php +++ b/PHPUnit/Runner/Version.php @@ -56,7 +56,7 @@ */ class PHPUnit_Runner_Version { - const VERSION = '3.7.8'; + const VERSION = '3.7.9'; protected static $version; /** From 1fb69e5bcce03a78c6dec0b6dca997afdb3e1328 Mon Sep 17 00:00:00 2001 From: Martin Malek Date: Thu, 15 Nov 2012 15:42:36 +0100 Subject: [PATCH 4/4] Fix wrong parameter exceptionFixed --- PHPUnit/Framework/Assert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPUnit/Framework/Assert.php b/PHPUnit/Framework/Assert.php index 5b8537473d7..3c9e855e7e3 100644 --- a/PHPUnit/Framework/Assert.php +++ b/PHPUnit/Framework/Assert.php @@ -78,7 +78,7 @@ public static function assertArrayHasKey($key, $array, $message = '') } if (!(is_array($array) || $array instanceof ArrayAccess)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'array or ArrayAccess' + 2, 'array or ArrayAccess' ); } @@ -104,7 +104,7 @@ public static function assertArrayNotHasKey($key, $array, $message = '') } if (!(is_array($array) || $array instanceof ArrayAccess)) { throw PHPUnit_Util_InvalidArgumentHelper::factory( - 1, 'array or ArrayAccess' + 2, 'array or ArrayAccess' ); }