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

Renaming method to better match what it does.

Browse source
This commit is contained in:
mark_story 2011-09-24 21:56:37 -04:00
parent dffcf048d9
commit 50a0a51f53
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -733,7 +733,7 @@ class CakeRequest implements ArrayAccess {
* @return The decoded/processed request data. * @return The decoded/processed request data.
*/ */
public function input($callback = null) { public function input($callback = null) {
$input = $this->_readStdin(); $input = $this->_readInput();
$args = func_get_args(); $args = func_get_args();
if (!empty($args)) { if (!empty($args)) {
$callback = array_shift($args); $callback = array_shift($args);
@ -746,9 +746,9 @@ class CakeRequest implements ArrayAccess {
/** /**
* Read data from php://input, mocked in tests. * Read data from php://input, mocked in tests.
* *
* @return string contents of stdin * @return string contents of php://input
*/ */
protected function _readStdin() { protected function _readInput() {
if (empty($this->_input)) { if (empty($this->_input)) {
$fh = fopen('php://input', 'r'); $fh = fopen('php://input', 'r');
$content = stream_get_contents($fh); $content = stream_get_contents($fh);

8
lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
View file

@ -256,7 +256,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
public function testStartupCallback() { public function testStartupCallback() {
$_SERVER['REQUEST_METHOD'] = 'PUT'; $_SERVER['REQUEST_METHOD'] = 'PUT';
$_SERVER['CONTENT_TYPE'] = 'application/xml'; $_SERVER['CONTENT_TYPE'] = 'application/xml';
$this->Controller->request = $this->getMock('CakeRequest', array('_readStdin')); $this->Controller->request = $this->getMock('CakeRequest', array('_readInput'));
$this->RequestHandler->startup($this->Controller); $this->RequestHandler->startup($this->Controller);
$this->assertTrue(is_array($this->Controller->data)); $this->assertTrue(is_array($this->Controller->data));
$this->assertFalse(is_object($this->Controller->data)); $this->assertFalse(is_object($this->Controller->data));
@ -270,7 +270,7 @@ class RequestHandlerComponentTest extends CakeTestCase {
public function testStartupCallbackCharset() { public function testStartupCallbackCharset() {
$_SERVER['REQUEST_METHOD'] = 'PUT'; $_SERVER['REQUEST_METHOD'] = 'PUT';
$_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8'; $_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8';
$this->Controller->request = $this->getMock('CakeRequest', array('_readStdin')); $this->Controller->request = $this->getMock('CakeRequest', array('_readInput'));
$this->RequestHandler->startup($this->Controller); $this->RequestHandler->startup($this->Controller);
$this->assertTrue(is_array($this->Controller->data)); $this->assertTrue(is_array($this->Controller->data));
$this->assertFalse(is_object($this->Controller->data)); $this->assertFalse(is_object($this->Controller->data));
@ -287,9 +287,9 @@ class RequestHandlerComponentTest extends CakeTestCase {
} }
$_SERVER['REQUEST_METHOD'] = 'POST'; $_SERVER['REQUEST_METHOD'] = 'POST';
$_SERVER['CONTENT_TYPE'] = 'text/csv'; $_SERVER['CONTENT_TYPE'] = 'text/csv';
$this->Controller->request = $this->getMock('CakeRequest', array('_readStdin')); $this->Controller->request = $this->getMock('CakeRequest', array('_readInput'));
$this->Controller->request->expects($this->once()) $this->Controller->request->expects($this->once())
->method('_readStdin') ->method('_readInput')
->will($this->returnValue('"A","csv","string"')); ->will($this->returnValue('"A","csv","string"'));
$this->RequestHandler->addInputType('csv', array('str_getcsv')); $this->RequestHandler->addInputType('csv', array('str_getcsv'));
$this->RequestHandler->startup($this->Controller); $this->RequestHandler->startup($this->Controller);

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

@ -1518,8 +1518,8 @@ class CakeRequestTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testInput() { public function testInput() {
$request = $this->getMock('CakeRequest', array('_readStdin')); $request = $this->getMock('CakeRequest', array('_readInput'));
$request->expects($this->once())->method('_readStdin') $request->expects($this->once())->method('_readInput')
->will($this->returnValue('I came from stdin')); ->will($this->returnValue('I came from stdin'));
$result = $request->input(); $result = $request->input();
@ -1532,8 +1532,8 @@ class CakeRequestTest extends CakeTestCase {
* @return void * @return void
*/ */
public function testInputDecode() { public function testInputDecode() {
$request = $this->getMock('CakeRequest', array('_readStdin')); $request = $this->getMock('CakeRequest', array('_readInput'));
$request->expects($this->once())->method('_readStdin') $request->expects($this->once())->method('_readInput')
->will($this->returnValue('{"name":"value"}')); ->will($this->returnValue('{"name":"value"}'));
$result = $request->input('json_decode'); $result = $request->input('json_decode');
@ -1553,8 +1553,8 @@ class CakeRequestTest extends CakeTestCase {
</post> </post>
XML; XML;
$request = $this->getMock('CakeRequest', array('_readStdin')); $request = $this->getMock('CakeRequest', array('_readInput'));
$request->expects($this->once())->method('_readStdin') $request->expects($this->once())->method('_readInput')
->will($this->returnValue($xml)); ->will($this->returnValue($xml));
$result = $request->input('Xml::build', array('return' => 'domdocument')); $result = $request->input('Xml::build', array('return' => 'domdocument'));