Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge pull request zendframework/zendframework#5114 in develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Maks3w committed Oct 2, 2013
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions test/Header/CookieTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function testCookieToStringReturnsHeaderFormattedString()
// // Because ';' has special meaning in the cookie, strip it out for this test.
// $val = str_replace(';', '', $val);
// $cookie = Http\Cookie::fromString('cookie=' . $val . '; domain=example.com', null, false);
// $this->assertEquals('cookie=' . $val . ';', (string)$cookie);
// $this->assertEquals('cookie=' . $val . ';', (string) $cookie);
// }
//
// /**
Expand All @@ -170,7 +170,7 @@ public function testCookieToStringReturnsHeaderFormattedString()
// // Because ';' has special meaning in the cookie, strip it out for this test.
// $val = str_replace(';', '', $val);
// $cookie = Http\Cookie::fromString('cookie=' . $val . '; domain=example.com', null, true);
// $this->assertEquals('cookie=' . urlencode($val) . ';', (string)$cookie);
// $this->assertEquals('cookie=' . urlencode($val) . ';', (string) $cookie);
// }
//
// /**
Expand Down
4 changes: 2 additions & 2 deletions test/ResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public function testToString()
$response = Response::fromString($response_str);

$this->assertEquals(strtolower(str_replace("\n", "\r\n", $response_str)), strtolower($response->toString()), 'Response convertion to string does not match original string');
$this->assertEquals(strtolower(str_replace("\n", "\r\n", $response_str)), strtolower((string)$response), 'Response convertion to string does not match original string');
$this->assertEquals(strtolower(str_replace("\n", "\r\n", $response_str)), strtolower((string) $response), 'Response convertion to string does not match original string');
}

public function testToStringGzip()
Expand All @@ -281,7 +281,7 @@ public function testToStringGzip()
$response = Response::fromString($response_str);

$this->assertEquals(strtolower($response_str), strtolower($response->toString()), 'Response convertion to string does not match original string');
$this->assertEquals(strtolower($response_str), strtolower((string)$response), 'Response convertion to string does not match original string');
$this->assertEquals(strtolower($response_str), strtolower((string) $response), 'Response convertion to string does not match original string');
}

public function testGetHeaders()
Expand Down

0 comments on commit 8053499

Please sign in to comment.