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

Merge branch '2.0' into 2.0-merge

Browse source 
Conflicts:
	lib/Cake/Test/Case/Controller/ScaffoldTest.php
	lib/Cake/Test/Case/Model/ConnectionManagerTest.php
	lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
	lib/Cake/Test/Case/Utility/SanitizeTest.php
This commit is contained in:
Jose Lorenzo Rodriguez 2011-06-17 18:04:03 -04:30
commit 2a39e6869c
8 changed files with 43 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Test/Case/Controller/ScaffoldTest.php
View file

@ -366,7 +366,7 @@ class ScaffoldViewTest extends CakeTestCase {
'action' => 'admin_add',
'admin' => true
));
$Controller->plugin = 'test_plugin';
$Controller->plugin = 'TestPlugin';
$ScaffoldView = new TestScaffoldView($Controller);
$result = $ScaffoldView->testGetFilename('admin_add');
@ -825,7 +825,8 @@ class ScaffoldTest extends CakeTestCase {
*
* @return void
*/
public function testHabtmFieldAdditionWithScaffoldForm() {
function testHabtmFieldAdditionWithScaffoldForm() {
CakePlugin::unload();
$params = array(
'plugin' => null,
'pass' => array(1),