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

CS fixes

Browse source
This commit is contained in:
Chris Hallgren 2016-02-15 20:44:27 -06:00
parent 849abab6a4
commit bf22e84d65
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -393,19 +393,19 @@ class CakeRequest implements ArrayAccess {
} }
} }
} }
/** /**
* Get the content type used in this request. * Get the content type used in this request.
* *
* @return string * @return string
*/ */
public function contentType() { public function contentType() {
$type = env('CONTENT_TYPE'); $type = env('CONTENT_TYPE');
if ($type) { if ($type) {
return $type; return $type;
} }
return env('HTTP_CONTENT_TYPE'); return env('HTTP_CONTENT_TYPE');
} }
/** /**
* Get the IP the client is using, or says they are using. * Get the IP the client is using, or says they are using.

18
lib/Cake/Test/Case/Network/CakeRequestTest.php
View file

@ -145,21 +145,21 @@ class CakeRequestTest extends CakeTestCase {
$request = new CakeRequest(null, false); $request = new CakeRequest(null, false);
$this->assertFalse(isset($request->query['one'])); $this->assertFalse(isset($request->query['one']));
} }
/** /**
* Test the content type method. * Test the content type method.
* *
* @return void * @return void
*/ */
public function testContentType() { public function testContentType() {
$_SERVER['HTTP_CONTENT_TYPE'] = 'application/json'; $_SERVER['HTTP_CONTENT_TYPE'] = 'application/json';
$request = new CakeRequest('/', false); $request = new CakeRequest('/', false);
$this->assertEquals('application/json', $request->contentType()); $this->assertEquals('application/json', $request->contentType());
$_SERVER['CONTENT_TYPE'] = 'application/xml'; $_SERVER['CONTENT_TYPE'] = 'application/xml';
$request = new CakeRequest('/', false); $request = new CakeRequest('/', false);
$this->assertEquals('application/xml', $request->contentType(), 'prefer non http header.'); $this->assertEquals('application/xml', $request->contentType(), 'prefer non http header.');
} }
/** /**
* Test construction * Test construction