adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-04 02:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
This commit is contained in:
mark_story 2012-11-02 16:52:51 -04:00
commit 60f9626838
20 changed files with 289 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -311,9 +311,10 @@ class CakeRequestTest extends CakeTestCase {
$request = $this->getMock('TestCakeRequest', array('_readInput'));
$request->expects($this->at(0))->method('_readInput')
->will($this->returnValue('{Article":["title"]}'));
->will($this->returnValue('{"Article":["title"]}'));
$request->reConstruct();
$this->assertEquals('{Article":["title"]}', $request->data);
$result = $request->input('json_decode', true);
$this->assertEquals(array('title'), $result['Article']);
}
/**