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

Search and replace for changed paths

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-13 02:53:35 -04:30
parent 3b725290ba
commit 8746a485bd
29 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Controller.php
View file

@ -315,7 +315,7 @@ class Controller extends Object {
} }
if ($this->viewPath == null) { if ($this->viewPath == null) {
$this->viewPath = Inflector::underscore($this->name); $this->viewPath = $this->name;
} }
$this->modelClass = Inflector::singularize($this->name); $this->modelClass = Inflector::singularize($this->name);

6
lib/Cake/Test/Case/Cache/CacheTest.php
View file

@ -90,7 +90,7 @@ class CacheTest extends CakeTestCase {
function testConfigWithLibAndPluginEngines() { function testConfigWithLibAndPluginEngines() {
App::build(array( App::build(array(
'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS), 'Lib' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
@ -253,7 +253,7 @@ class CacheTest extends CakeTestCase {
function testDrop() { function testDrop() {
App::build(array( App::build(array(
'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS), 'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
$result = Cache::drop('some_config_that_does_not_exist'); $result = Cache::drop('some_config_that_does_not_exist');
@ -306,7 +306,7 @@ class CacheTest extends CakeTestCase {
function testWriteTriggerError() { function testWriteTriggerError() {
App::build(array( App::build(array(
'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS), 'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => '')); Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => ''));

2
lib/Cake/Test/Case/Configure/PhpReaderTest.php
View file

@ -83,7 +83,7 @@ class PhpReaderTest extends CakeTestCase {
*/ */
function testReadPluginValue() { function testReadPluginValue() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$reader = new PhpReader($this->path); $reader = new PhpReader($this->path);

10
lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View file

@ -187,7 +187,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testViewWithPlugins() { public function testViewWithPlugins() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Shell->args = array('TestPlugin.schema'); $this->Shell->args = array('TestPlugin.schema');
@ -238,7 +238,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testDumpFileWritingWithPlugins() { public function testDumpFileWritingWithPlugins() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Shell->args = array('TestPlugin.TestPluginApp'); $this->Shell->args = array('TestPlugin.TestPluginApp');
@ -336,7 +336,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testGenerateWithPlugins() { public function testGenerateWithPlugins() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
@ -450,7 +450,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testPluginParam() { public function testPluginParam() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Shell->params = array( $this->Shell->params = array(
@ -470,7 +470,7 @@ class SchemaShellTest extends CakeTestCase {
*/ */
public function testPluginDotSyntaxWithCreate() { public function testPluginDotSyntaxWithCreate() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Shell->params = array( $this->Shell->params = array(

2
lib/Cake/Test/Case/Console/Command/ShellTest.php
View file

@ -169,7 +169,7 @@ class ShellTest extends CakeTestCase {
*/ */
public function testInitialize() { public function testInitialize() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS) 'models' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
), true); ), true);

2
lib/Cake/Test/Case/Console/TaskCollectionTest.php
View file

@ -88,7 +88,7 @@ class TaskCollectionTest extends CakeTestCase {
$dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false); $dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false);
$shell = $this->getMock('Shell', array(), array(), '', false); $shell = $this->getMock('Shell', array(), array(), '', false);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->Tasks = new TaskCollection($shell, $dispatcher); $this->Tasks = new TaskCollection($shell, $dispatcher);

2
lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php
View file

@ -155,7 +155,7 @@ class FormAuthenticateTest extends CakeTestCase {
function testPluginModel() { function testPluginModel() {
Cache::delete('object_map', '_cake_core_'); Cache::delete('object_map', '_cake_core_');
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
), true); ), true);
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');

2
lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php
View file

@ -799,7 +799,7 @@ HTMLBLOC;
function testPluginCustomViewClass() { function testPluginCustomViewClass() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
)); ));

4
lib/Cake/Test/Case/Controller/ComponentCollectionTest.php
View file

@ -84,7 +84,7 @@ class ComponentCollectionTest extends CakeTestCase {
$result = $this->Components->load('Cookie'); $result = $this->Components->load('Cookie');
$this->assertInstanceOf('CookieAliasComponent', $result); $this->assertInstanceOf('CookieAliasComponent', $result);
App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS))); App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent')); $result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent'));
$this->assertInstanceOf('OtherComponentComponent', $result); $this->assertInstanceOf('OtherComponentComponent', $result);
@ -125,7 +125,7 @@ class ComponentCollectionTest extends CakeTestCase {
*/ */
function testLoadPluginComponent() { function testLoadPluginComponent() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$result = $this->Components->load('TestPlugin.OtherComponent'); $result = $this->Components->load('TestPlugin.OtherComponent');

2
lib/Cake/Test/Case/Controller/ComponentTest.php
View file

@ -251,7 +251,7 @@ class ComponentTest extends CakeTestCase {
function setUp() { function setUp() {
$this->_pluginPaths = App::path('plugins'); $this->_pluginPaths = App::path('plugins');
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
} }

4
lib/Cake/Test/Case/Controller/ControllerTest.php
View file

@ -439,7 +439,7 @@ class ControllerTest extends CakeTestCase {
*/ */
function testLoadModelInPlugins() { function testLoadModelInPlugins() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS), 'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS) 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS)
)); ));
@ -482,7 +482,7 @@ class ControllerTest extends CakeTestCase {
unset($Controller); unset($Controller);
App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS))); App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$Controller = new Controller($request); $Controller = new Controller($request);

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

@ -280,7 +280,7 @@ class ScaffoldViewTest extends CakeTestCase {
App::build(array( App::build(array(
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS), 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
} }

10
lib/Cake/Test/Case/Core/AppTest.php
View file

@ -318,7 +318,7 @@ class AppImportTest extends CakeTestCase {
function testListObjectsInPlugin() { function testListObjectsInPlugin() {
App::build(array( App::build(array(
'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS), 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -369,7 +369,7 @@ class AppImportTest extends CakeTestCase {
*/ */
function testPluginPath() { function testPluginPath() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -491,7 +491,7 @@ class AppImportTest extends CakeTestCase {
function testPluginImporting() { function testPluginImporting() {
App::build(array( App::build(array(
'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS), 'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -668,7 +668,7 @@ class AppImportTest extends CakeTestCase {
function testLoadingVendor() { function testLoadingVendor() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS), 'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
), App::RESET); ), App::RESET);
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -726,7 +726,7 @@ class AppImportTest extends CakeTestCase {
public function testLoadClassInLibs() { public function testLoadClassInLibs() {
App::build(array( App::build(array(
'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS), 'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), App::RESET); ), App::RESET);
CakePlugin::loadAll(); CakePlugin::loadAll();

2
lib/Cake/Test/Case/Core/ConfigureTest.php
View file

@ -241,7 +241,7 @@ class ConfigureTest extends CakeTestCase {
* @return void * @return void
*/ */
function testLoadPlugin() { function testLoadPlugin() {
App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true); App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)), true);
Configure::config('test', new PhpReader()); Configure::config('test', new PhpReader());
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$result = Configure::load('TestPlugin.load', 'test'); $result = Configure::load('TestPlugin.load', 'test');

2
lib/Cake/Test/Case/Core/ObjectTest.php
View file

@ -716,7 +716,7 @@ class ObjectTest extends CakeTestCase {
*/ */
function testRequestActionPlugins() { function testRequestActionPlugins() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
Router::reload(); Router::reload();

4
lib/Cake/Test/Case/I18n/I18nTest.php
View file

@ -35,7 +35,7 @@ class I18nTest extends CakeTestCase {
Cache::delete('object_map', '_cake_core_'); Cache::delete('object_map', '_cake_core_');
App::build(array( App::build(array(
'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS), 'locales' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::loadAll(); CakePlugin::loadAll();
} }
@ -2432,7 +2432,7 @@ class I18nTest extends CakeTestCase {
*/ */
function testPluginTranslation() { function testPluginTranslation() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
Configure::write('Config.language', 'po'); Configure::write('Config.language', 'po');

2
lib/Cake/Test/Case/Log/CakeLogTest.php
View file

@ -48,7 +48,7 @@ class CakeLogTest extends CakeTestCase {
function testImportingLoggers() { function testImportingLoggers() {
App::build(array( App::build(array(
'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS), 'libs' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Lib' . DS),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');

2
lib/Cake/Test/Case/Model/BehaviorCollectionTest.php
View file

@ -453,7 +453,7 @@ class BehaviorCollectionTest extends CakeTestCase {
$this->assertEquals($Apple->testMethod(true), 'working'); $this->assertEquals($Apple->testMethod(true), 'working');
$this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working'); $this->assertEquals($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), 'working');
App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS))); App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne'))); $this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther); $this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);

4
lib/Cake/Test/Case/Model/CakeSchemaTest.php
View file

@ -665,7 +665,7 @@ class CakeSchemaTest extends CakeTestCase {
function testSchemaReadWithPlugins() { function testSchemaReadWithPlugins() {
App::objects('model', null, false); App::objects('model', null, false);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
@ -984,7 +984,7 @@ class CakeSchemaTest extends CakeTestCase {
*/ */
function testSchemaLoadingFromPlugin() { function testSchemaLoadingFromPlugin() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin')); $Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));

10
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
View file

@ -80,7 +80,7 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetPluginDataSource() { function testGetPluginDataSource() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$name = 'test_source'; $name = 'test_source';
@ -102,7 +102,7 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetPluginDataSourceAndPluginDriver() { function testGetPluginDataSourceAndPluginDriver() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$name = 'test_plugin_source_and_driver'; $name = 'test_plugin_source_and_driver';
@ -126,7 +126,7 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetLocalDataSourceAndPluginDriver() { function testGetLocalDataSourceAndPluginDriver() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::load('TestPlugin'); CakePlugin::load('TestPlugin');
$name = 'test_local_source_and_plugin_driver'; $name = 'test_local_source_and_plugin_driver';
@ -149,7 +149,7 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetPluginDataSourceAndLocalDriver() { function testGetPluginDataSourceAndLocalDriver() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Model/Datasource/Database' => array( 'Model/Datasource/Database' => array(
LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
) )
@ -272,7 +272,7 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testConnectionData() { function testConnectionData() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Model/Datasource' => array( 'Model/Datasource' => array(
LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
) )

4
lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
View file

@ -530,7 +530,7 @@ class CakeSessionTest extends CakeTestCase {
'Model/Datasource/Session' => array( 'Model/Datasource/Session' => array(
LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
), ),
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
Configure::write('Session', array( Configure::write('Session', array(
'defaults' => 'cake', 'defaults' => 'cake',
@ -551,7 +551,7 @@ class CakeSessionTest extends CakeTestCase {
*/ */
function testUsingPluginHandler() { function testUsingPluginHandler() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
Configure::write('Session', array( Configure::write('Session', array(

6
lib/Cake/Test/Case/Routing/DispatcherTest.php
View file

@ -1042,7 +1042,7 @@ class DispatcherTest extends CakeTestCase {
} }
Router::reload(); Router::reload();
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
), true); ), true);
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -1142,7 +1142,7 @@ class DispatcherTest extends CakeTestCase {
public function testTestPluginDispatch() { public function testTestPluginDispatch() {
$Dispatcher = new TestDispatcher(); $Dispatcher = new TestDispatcher();
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
Router::reload(); Router::reload();
@ -1200,7 +1200,7 @@ class DispatcherTest extends CakeTestCase {
Router::reload(); Router::reload();
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS), 'vendors' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
)); ));

2
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php
View file

@ -122,7 +122,7 @@ class ControllerTestCaseTest extends CakeTestCase {
function setUp() { function setUp() {
parent::setUp(); parent::setUp();
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS), 'Controller' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Controller' . DS),
'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS), 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS) 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS)

4
lib/Cake/Test/Case/View/HelperCollectionTest.php
View file

@ -82,7 +82,7 @@ class HelperCollectionTest extends CakeTestCase {
$result = $this->Helpers->load('Html'); $result = $this->Helpers->load('Html');
$this->assertInstanceOf('HtmlAliasHelper', $result); $this->assertInstanceOf('HtmlAliasHelper', $result);
App::build(array('plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS))); App::build(array('plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
CakePlugin::loadAll(); CakePlugin::loadAll();
$result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper')); $result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper'));
$this->assertInstanceOf('OtherHelperHelper', $result); $this->assertInstanceOf('OtherHelperHelper', $result);
@ -123,7 +123,7 @@ class HelperCollectionTest extends CakeTestCase {
*/ */
function testLoadPluginHelper() { function testLoadPluginHelper() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
$result = $this->Helpers->load('TestPlugin.OtherHelper'); $result = $this->Helpers->load('TestPlugin.OtherHelper');

4
lib/Cake/Test/Case/View/HelperTest.php
View file

@ -518,7 +518,7 @@ class HelperTest extends CakeTestCase {
$_timestamp = Configure::read('Asset.timestamp'); $_timestamp = Configure::read('Asset.timestamp');
Configure::write('Asset.timestamp', 'force'); Configure::write('Asset.timestamp', 'force');
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS), 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS),
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -799,7 +799,7 @@ class HelperTest extends CakeTestCase {
*/ */
function testLazyLoadingHelpers() { function testLazyLoadingHelpers() {
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();
$Helper = new TestHelper($this->View); $Helper = new TestHelper($this->View);

2
lib/Cake/Test/Case/View/ThemeViewTest.php
View file

@ -117,7 +117,7 @@ class ThemeViewTest extends CakeTestCase {
$this->PostsController->index(); $this->PostsController->index();
$this->ThemeView = new ThemeView($this->PostsController); $this->ThemeView = new ThemeView($this->PostsController);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
)); ));
CakePlugin::loadAll(); CakePlugin::loadAll();

16
lib/Cake/Test/Case/View/ViewTest.php
View file

@ -195,9 +195,9 @@ class ViewTest extends CakeTestCase {
$this->PostsController->index(); $this->PostsController->index();
$this->View = new View($this->PostsController); $this->View = new View($this->PostsController);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array( 'View' => array(
LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS
) )
), true); ), true);
CakePlugin::loadAll(); CakePlugin::loadAll();
@ -227,16 +227,16 @@ class ViewTest extends CakeTestCase {
function testPluginGetTemplate() { function testPluginGetTemplate() {
$this->Controller->plugin = 'TestPlugin'; $this->Controller->plugin = 'TestPlugin';
$this->Controller->name = 'TestPlugin'; $this->Controller->name = 'TestPlugin';
$this->Controller->viewPath = 'tests'; $this->Controller->viewPath = 'Tests';
$this->Controller->action = 'index'; $this->Controller->action = 'index';
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
$expected = CakePlugin::path('TestPlugin') . 'View' . DS .'tests' . DS .'index.ctp'; $expected = CakePlugin::path('TestPlugin') . 'View' . DS .'Tests' . DS .'index.ctp';
$result = $View->getViewFileName('index'); $result = $View->getViewFileName('index');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$expected = CakePlugin::path('TestPlugin') . 'View' . DS . 'layouts' . DS .'default.ctp'; $expected = CakePlugin::path('TestPlugin') . 'View' . DS . 'Layouts' . DS .'default.ctp';
$result = $View->getLayoutFileName(); $result = $View->getLayoutFileName();
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }
@ -249,7 +249,7 @@ class ViewTest extends CakeTestCase {
function testPluginPathGeneration() { function testPluginPathGeneration() {
$this->Controller->plugin = 'TestPlugin'; $this->Controller->plugin = 'TestPlugin';
$this->Controller->name = 'TestPlugin'; $this->Controller->name = 'TestPlugin';
$this->Controller->viewPath = 'tests'; $this->Controller->viewPath = 'Tests';
$this->Controller->action = 'index'; $this->Controller->action = 'index';
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
@ -278,12 +278,12 @@ class ViewTest extends CakeTestCase {
function testCamelCasePluginGetTemplate() { function testCamelCasePluginGetTemplate() {
$this->Controller->plugin = 'TestPlugin'; $this->Controller->plugin = 'TestPlugin';
$this->Controller->name = 'TestPlugin'; $this->Controller->name = 'TestPlugin';
$this->Controller->viewPath = 'tests'; $this->Controller->viewPath = 'Tests';
$this->Controller->action = 'index'; $this->Controller->action = 'index';
$View = new TestView($this->Controller); $View = new TestView($this->Controller);
App::build(array( App::build(array(
'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS) 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
)); ));

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

@ -740,7 +740,7 @@ class View extends Object {
$subDir = $this->layoutPath . DS; $subDir = $this->layoutPath . DS;
} }
$paths = $this->_paths($this->plugin); $paths = $this->_paths($this->plugin);
$file = 'layouts' . DS . $subDir . $name; $file = 'Layouts' . DS . $subDir . $name;
$exts = $this->_getExtensions(); $exts = $this->_getExtensions();
foreach ($exts as $ext) { foreach ($exts as $ext) {
@ -780,8 +780,8 @@ class View extends Object {
$exts = $this->_getExtensions(); $exts = $this->_getExtensions();
foreach ($exts as $ext) { foreach ($exts as $ext) {
foreach ($paths as $path) { foreach ($paths as $path) {
if (file_exists($path . 'elements' . DS . $name . $ext)) { if (file_exists($path . 'Elements' . DS . $name . $ext)) {
return $path . 'elements' . DS . $name . $ext; return $path . 'Elements' . DS . $name . $ext;
} }
} }
} }

8
lib/Cake/bootstrap.php
View file

@ -86,20 +86,20 @@ if (!defined('APP')) {
/** /**
* Path to the application's view's layouts directory. * Path to the application's view's layouts directory.
*/ */
define('LAYOUTS', VIEWS.'layouts'.DS); define('LAYOUTS', VIEWS.'Layouts'.DS);
/** /**
* Path to the application's view's elements directory. * Path to the application's view's elements directory.
* It's supposed to hold pieces of PHP/HTML that are used on multiple pages * It's supposed to hold pieces of PHP/HTML that are used on multiple pages
* and are not linked to a particular layout (like polls, footers and so on). * and are not linked to a particular layout (like polls, footers and so on).
*/ */
define('ELEMENTS', VIEWS.'elements'.DS); define('ELEMENTS', VIEWS.'Elements'.DS);
/** /**
* Path to the configuration files directory. * Path to the configuration files directory.
*/ */
if (!defined('CONFIGS')) { if (!defined('CONFIGS')) {
define('CONFIGS', APP.'config'.DS); define('CONFIGS', APP.'Config'.DS);
} }
/** /**
@ -138,7 +138,7 @@ if (!defined('TESTS')) {
* Path to the core tests directory. * Path to the core tests directory.
*/ */
if (!defined('CAKE_TESTS')) { if (!defined('CAKE_TESTS')) {
define('CAKE_TESTS', CAKE.'tests'.DS); define('CAKE_TESTS', CAKE.'Test'.DS);
} }
/** /**