adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

a few more application contents should send the charset

Browse source 
adding content type tests as dataprovider
This commit is contained in:
euromark 2012-12-21 12:32:32 +01:00
parent 554d5794ce
commit 910e21e65e
2 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Cake/Network/CakeResponse.php
View file

@ -444,10 +444,20 @@ class CakeResponse {
if (in_array($this->_status, array(304, 204))) { if (in_array($this->_status, array(304, 204))) {
return; return;
} }
if (strpos($this->_contentType, 'text/') === 0) { $whitelist = array(
'application/javascript', 'application/json', 'application/xml', 'application/rss+xml'
);
$charset = false;
if (
$this->_charset &&
(strpos($this->_contentType, 'text/') === 0 || in_array($this->_contentType, $whitelist))
) {
$charset = true;
}
if ($charset) {
$this->header('Content-Type', "{$this->_contentType}; charset={$this->_charset}"); $this->header('Content-Type', "{$this->_contentType}; charset={$this->_charset}");
} elseif ($this->_contentType === 'application/json') {
$this->header('Content-Type', "{$this->_contentType}; charset=UTF-8");
} else { } else {
$this->header('Content-Type', "{$this->_contentType}"); $this->header('Content-Type', "{$this->_contentType}");
} }

37
lib/Cake/Test/Case/Network/CakeResponseTest.php
View file

@ -196,12 +196,27 @@ class CakeResponseTest extends CakeTestCase {
} }
/** /**
* Tests the send method and changing the content type * Data provider for content type tests.
* *
* @return array
*/ */
public function testSendChangingContentType() { public static function charsetTypeProvider() {
return array(
array('mp3', 'audio/mpeg'),
array('js', 'application/javascript; charset=UTF-8'),
array('json', 'application/json; charset=UTF-8'),
array('xml', 'application/xml; charset=UTF-8'),
array('txt', 'text/plain; charset=UTF-8'),
);
}
/**
* Tests the send method and changing the content type
* @dataProvider charsetTypeProvider
*/
public function testSendChangingContentType($original, $expected) {
$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent', '_setCookies')); $response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent', '_setCookies'));
$response->type('mp3'); $response->type($original);
$response->body('the response body'); $response->body('the response body');
$response->expects($this->once())->method('_sendContent')->with('the response body'); $response->expects($this->once())->method('_sendContent')->with('the response body');
$response->expects($this->at(0))->method('_setCookies'); $response->expects($this->at(0))->method('_setCookies');
@ -210,26 +225,28 @@ class CakeResponseTest extends CakeTestCase {
$response->expects($this->at(2)) $response->expects($this->at(2))
->method('_sendHeader')->with('Content-Length', 17); ->method('_sendHeader')->with('Content-Length', 17);
$response->expects($this->at(3)) $response->expects($this->at(3))
->method('_sendHeader')->with('Content-Type', 'audio/mpeg'); ->method('_sendHeader')->with('Content-Type', $expected);
$response->send(); $response->send();
} }
/** /**
* Tests the send method and changing the content type to JSON * Tests the send method and changing the content type to JS without adding the charset
* *
*/ */
public function testSendChangingContentTypeJSON() { public function testSendChangingContentTypeWithoutCharset() {
$response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent', '_setCookies')); $response = $this->getMock('CakeResponse', array('_sendHeader', '_sendContent', '_setCookies'));
$response->type('json'); $response->type('js');
$response->body('the response body'); $response->charset('');
$response->expects($this->once())->method('_sendContent')->with('the response body');
$response->body('var $foo = "bar";');
$response->expects($this->once())->method('_sendContent')->with('var $foo = "bar";');
$response->expects($this->at(0))->method('_setCookies'); $response->expects($this->at(0))->method('_setCookies');
$response->expects($this->at(1)) $response->expects($this->at(1))
->method('_sendHeader')->with('HTTP/1.1 200 OK'); ->method('_sendHeader')->with('HTTP/1.1 200 OK');
$response->expects($this->at(2)) $response->expects($this->at(2))
->method('_sendHeader')->with('Content-Length', 17); ->method('_sendHeader')->with('Content-Length', 17);
$response->expects($this->at(3)) $response->expects($this->at(3))
->method('_sendHeader')->with('Content-Type', 'application/json; charset=UTF-8'); ->method('_sendHeader')->with('Content-Type', 'application/javascript');
$response->send(); $response->send();
} }