From 099ca310e2b695250a42d0a984f5be3518e7e6b2 Mon Sep 17 00:00:00 2001 From: Cauan Cabral Date: Fri, 11 Jan 2013 10:14:05 -0300 Subject: [PATCH 1/2] Ensure $sources is Array before use --- lib/Cake/TestSuite/Fixture/CakeFixtureManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index 4d726efbb..ea875af7e 100644 --- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -175,7 +175,7 @@ class CakeFixtureManager { return; } - $sources = $db->listSources(); + $sources = (array)$db->listSources(); $table = $db->config['prefix'] . $fixture->table; $exists = in_array($table, $sources); From bcdbdc810849ce1f759d6517819f09f844eb94c5 Mon Sep 17 00:00:00 2001 From: U-Zyn Chua Date: Tue, 15 Jan 2013 09:17:24 +0800 Subject: [PATCH 2/2] Add OK or Successful HTTP codes 200-206 to HttpResponse::isOK(). Fixes #3531 --- lib/Cake/Network/Http/HttpResponse.php | 4 +-- .../Case/Network/Http/HttpResponseTest.php | 28 +++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Network/Http/HttpResponse.php b/lib/Cake/Network/Http/HttpResponse.php index 90c622588..6a0d768d6 100644 --- a/lib/Cake/Network/Http/HttpResponse.php +++ b/lib/Cake/Network/Http/HttpResponse.php @@ -116,12 +116,12 @@ class HttpResponse implements ArrayAccess { } /** - * If return is 200 (OK) + * If return is a valid 2xx (OK or Successful) * * @return boolean */ public function isOk() { - return $this->code == 200; + return in_array($this->code, array(200, 201, 202, 203, 204, 205, 206)); } /** diff --git a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php index 2f9809821..495a70a8b 100644 --- a/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php +++ b/lib/Cake/Test/Case/Network/Http/HttpResponseTest.php @@ -157,12 +157,36 @@ class HttpResponseTest extends CakeTestCase { $this->assertFalse($this->HttpResponse->isOk()); $this->HttpResponse->code = -1; $this->assertFalse($this->HttpResponse->isOk()); - $this->HttpResponse->code = 201; - $this->assertFalse($this->HttpResponse->isOk()); $this->HttpResponse->code = 'what?'; $this->assertFalse($this->HttpResponse->isOk()); $this->HttpResponse->code = 200; $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 201; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 202; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 203; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 204; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 205; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 206; + $this->assertTrue($this->HttpResponse->isOk()); + $this->HttpResponse->code = 207; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 208; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 209; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 210; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 226; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 288; + $this->assertFalse($this->HttpResponse->isOk()); + $this->HttpResponse->code = 301; + $this->assertFalse($this->HttpResponse->isOk()); } /**