adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-01 07:09:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Network/Http/HttpResponse.php
This commit is contained in:
mark_story 2013-01-14 20:24:56 -05:00
commit 9c29fab4a4
3 changed files with 28 additions and 4 deletions
lib/Cake
Network/Http
HttpSocketResponse.php
Test/Case/Network/Http
HttpResponseTest.php
TestSuite/Fixture
CakeFixtureManager.php

2
lib/Cake/Network/Http/HttpSocketResponse.php
View file

@ -128,7 +128,7 @@ class HttpSocketResponse implements ArrayAccess {
* @return boolean * @return boolean
*/ */
public function isOk() { public function isOk() {
return $this->code == 200; return in_array($this->code, array(200, 201, 202, 203, 204, 205, 206));
} }
/** /**

28
lib/Cake/Test/Case/Network/Http/HttpResponseTest.php
View file

@ -157,12 +157,36 @@ class HttpResponseTest extends CakeTestCase {
$this->assertFalse($this->HttpResponse->isOk()); $this->assertFalse($this->HttpResponse->isOk());
$this->HttpResponse->code = -1; $this->HttpResponse->code = -1;
$this->assertFalse($this->HttpResponse->isOk()); $this->assertFalse($this->HttpResponse->isOk());
$this->HttpResponse->code = 201;
$this->assertFalse($this->HttpResponse->isOk());
$this->HttpResponse->code = 'what?'; $this->HttpResponse->code = 'what?';
$this->assertFalse($this->HttpResponse->isOk()); $this->assertFalse($this->HttpResponse->isOk());
$this->HttpResponse->code = 200; $this->HttpResponse->code = 200;
$this->assertTrue($this->HttpResponse->isOk()); $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());
} }
/** /**

2
lib/Cake/TestSuite/Fixture/CakeFixtureManager.php
View file

@ -175,7 +175,7 @@ class CakeFixtureManager {
return; return;
} }
$sources = $db->listSources(); $sources = (array)$db->listSources();
$table = $db->config['prefix'] . $fixture->table; $table = $db->config['prefix'] . $fixture->table;
$exists = in_array($table, $sources); $exists = in_array($table, $sources);