From 8746a485bd2f48f0147b37e55725f21f41f7f220 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Fri, 13 May 2011 02:53:35 -0430 Subject: [PATCH] Search and replace for changed paths --- lib/Cake/Controller/Controller.php | 2 +- lib/Cake/Test/Case/Cache/CacheTest.php | 6 +++--- lib/Cake/Test/Case/Configure/PhpReaderTest.php | 2 +- .../Case/Console/Command/SchemaShellTest.php | 10 +++++----- lib/Cake/Test/Case/Console/Command/ShellTest.php | 2 +- .../Test/Case/Console/TaskCollectionTest.php | 2 +- .../Component/Auth/FormAuthenticate.php | 2 +- .../Controller/Component/EmailComponentTest.php | 2 +- .../Case/Controller/ComponentCollectionTest.php | 4 ++-- lib/Cake/Test/Case/Controller/ComponentTest.php | 2 +- lib/Cake/Test/Case/Controller/ControllerTest.php | 4 ++-- lib/Cake/Test/Case/Controller/ScaffoldTest.php | 2 +- lib/Cake/Test/Case/Core/AppTest.php | 10 +++++----- lib/Cake/Test/Case/Core/ConfigureTest.php | 2 +- lib/Cake/Test/Case/Core/ObjectTest.php | 2 +- lib/Cake/Test/Case/I18n/I18nTest.php | 4 ++-- lib/Cake/Test/Case/Log/CakeLogTest.php | 2 +- .../Test/Case/Model/BehaviorCollectionTest.php | 2 +- lib/Cake/Test/Case/Model/CakeSchemaTest.php | 4 ++-- .../Test/Case/Model/ConnectionManagerTest.php | 10 +++++----- .../Case/Model/Datasource/CakeSessionTest.php | 4 ++-- lib/Cake/Test/Case/Routing/DispatcherTest.php | 6 +++--- .../Case/TestSuite/ControllerTestCaseTest.php | 2 +- lib/Cake/Test/Case/View/HelperCollectionTest.php | 4 ++-- lib/Cake/Test/Case/View/HelperTest.php | 4 ++-- lib/Cake/Test/Case/View/ThemeViewTest.php | 2 +- lib/Cake/Test/Case/View/ViewTest.php | 16 ++++++++-------- lib/Cake/View/View.php | 6 +++--- lib/Cake/bootstrap.php | 8 ++++---- 29 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index 615696803..a6f635970 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -315,7 +315,7 @@ class Controller extends Object { } if ($this->viewPath == null) { - $this->viewPath = Inflector::underscore($this->name); + $this->viewPath = $this->name; } $this->modelClass = Inflector::singularize($this->name); diff --git a/lib/Cake/Test/Case/Cache/CacheTest.php b/lib/Cake/Test/Case/Cache/CacheTest.php index c30e9e644..474cb81c8 100644 --- a/lib/Cake/Test/Case/Cache/CacheTest.php +++ b/lib/Cake/Test/Case/Cache/CacheTest.php @@ -90,7 +90,7 @@ class CacheTest extends CakeTestCase { function testConfigWithLibAndPluginEngines() { App::build(array( '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); CakePlugin::load('TestPlugin'); @@ -253,7 +253,7 @@ class CacheTest extends CakeTestCase { function testDrop() { App::build(array( '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); $result = Cache::drop('some_config_that_does_not_exist'); @@ -306,7 +306,7 @@ class CacheTest extends CakeTestCase { function testWriteTriggerError() { App::build(array( '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); Cache::config('test_trigger', array('engine' => 'TestAppCache', 'prefix' => '')); diff --git a/lib/Cake/Test/Case/Configure/PhpReaderTest.php b/lib/Cake/Test/Case/Configure/PhpReaderTest.php index 7fdb46a0e..1e3c22221 100644 --- a/lib/Cake/Test/Case/Configure/PhpReaderTest.php +++ b/lib/Cake/Test/Case/Configure/PhpReaderTest.php @@ -83,7 +83,7 @@ class PhpReaderTest extends CakeTestCase { */ function testReadPluginValue() { App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) ), true); CakePlugin::load('TestPlugin'); $reader = new PhpReader($this->path); diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php index 20b9c5315..89af8aee7 100644 --- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php @@ -187,7 +187,7 @@ class SchemaShellTest extends CakeTestCase { */ public function testViewWithPlugins() { 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'); $this->Shell->args = array('TestPlugin.schema'); @@ -238,7 +238,7 @@ class SchemaShellTest extends CakeTestCase { */ public function testDumpFileWritingWithPlugins() { 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'); $this->Shell->args = array('TestPlugin.TestPluginApp'); @@ -336,7 +336,7 @@ class SchemaShellTest extends CakeTestCase { */ public function testGenerateWithPlugins() { App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) ), true); CakePlugin::load('TestPlugin'); @@ -450,7 +450,7 @@ class SchemaShellTest extends CakeTestCase { */ public function testPluginParam() { 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'); $this->Shell->params = array( @@ -470,7 +470,7 @@ class SchemaShellTest extends CakeTestCase { */ public function testPluginDotSyntaxWithCreate() { 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'); $this->Shell->params = array( diff --git a/lib/Cake/Test/Case/Console/Command/ShellTest.php b/lib/Cake/Test/Case/Console/Command/ShellTest.php index 94208bf79..0505bf868 100644 --- a/lib/Cake/Test/Case/Console/Command/ShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/ShellTest.php @@ -169,7 +169,7 @@ class ShellTest extends CakeTestCase { */ public function testInitialize() { 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) ), true); diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index 3f5a40511..0b11ce39a 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -88,7 +88,7 @@ class TaskCollectionTest extends CakeTestCase { $dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false); $shell = $this->getMock('Shell', array(), array(), '', false); 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'); $this->Tasks = new TaskCollection($shell, $dispatcher); diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php index 9c71f494f..70397d997 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/FormAuthenticate.php @@ -155,7 +155,7 @@ class FormAuthenticateTest extends CakeTestCase { function testPluginModel() { Cache::delete('object_map', '_cake_core_'); App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS), + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS), ), true); CakePlugin::load('TestPlugin'); diff --git a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php index b70c46511..0ec6dc802 100644 --- a/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php +++ b/lib/Cake/Test/Case/Controller/Component/EmailComponentTest.php @@ -799,7 +799,7 @@ HTMLBLOC; function testPluginCustomViewClass() { 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) )); diff --git a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php index ec11e4d51..f21fc7d1f 100644 --- a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php @@ -84,7 +84,7 @@ class ComponentCollectionTest extends CakeTestCase { $result = $this->Components->load('Cookie'); $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'); $result = $this->Components->load('SomeOther', array('className' => 'TestPlugin.OtherComponent')); $this->assertInstanceOf('OtherComponentComponent', $result); @@ -125,7 +125,7 @@ class ComponentCollectionTest extends CakeTestCase { */ function testLoadPluginComponent() { 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'); $result = $this->Components->load('TestPlugin.OtherComponent'); diff --git a/lib/Cake/Test/Case/Controller/ComponentTest.php b/lib/Cake/Test/Case/Controller/ComponentTest.php index c52f007bd..a93e231e2 100644 --- a/lib/Cake/Test/Case/Controller/ComponentTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentTest.php @@ -251,7 +251,7 @@ class ComponentTest extends CakeTestCase { function setUp() { $this->_pluginPaths = App::path('plugins'); App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) )); } diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 160f4b87b..2f0209f9b 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -439,7 +439,7 @@ class ControllerTest extends CakeTestCase { */ function testLoadModelInPlugins() { 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), 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS) )); @@ -482,7 +482,7 @@ class ControllerTest extends CakeTestCase { 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'); $Controller = new Controller($request); diff --git a/lib/Cake/Test/Case/Controller/ScaffoldTest.php b/lib/Cake/Test/Case/Controller/ScaffoldTest.php index f46a00a05..9bd901415 100644 --- a/lib/Cake/Test/Case/Controller/ScaffoldTest.php +++ b/lib/Cake/Test/Case/Controller/ScaffoldTest.php @@ -280,7 +280,7 @@ class ScaffoldViewTest extends CakeTestCase { App::build(array( '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) )); } diff --git a/lib/Cake/Test/Case/Core/AppTest.php b/lib/Cake/Test/Case/Core/AppTest.php index 4f4450b5f..5e949e637 100644 --- a/lib/Cake/Test/Case/Core/AppTest.php +++ b/lib/Cake/Test/Case/Core/AppTest.php @@ -318,7 +318,7 @@ class AppImportTest extends CakeTestCase { function testListObjectsInPlugin() { App::build(array( '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(); @@ -369,7 +369,7 @@ class AppImportTest extends CakeTestCase { */ function testPluginPath() { 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(); @@ -491,7 +491,7 @@ class AppImportTest extends CakeTestCase { function testPluginImporting() { App::build(array( '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(); @@ -668,7 +668,7 @@ class AppImportTest extends CakeTestCase { function testLoadingVendor() { 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), ), App::RESET); CakePlugin::loadAll(); @@ -726,7 +726,7 @@ class AppImportTest extends CakeTestCase { public function testLoadClassInLibs() { App::build(array( '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); CakePlugin::loadAll(); diff --git a/lib/Cake/Test/Case/Core/ConfigureTest.php b/lib/Cake/Test/Case/Core/ConfigureTest.php index 1f51633d5..21770f660 100644 --- a/lib/Cake/Test/Case/Core/ConfigureTest.php +++ b/lib/Cake/Test/Case/Core/ConfigureTest.php @@ -241,7 +241,7 @@ class ConfigureTest extends CakeTestCase { * @return void */ 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()); CakePlugin::load('TestPlugin'); $result = Configure::load('TestPlugin.load', 'test'); diff --git a/lib/Cake/Test/Case/Core/ObjectTest.php b/lib/Cake/Test/Case/Core/ObjectTest.php index c21b06855..8e69c6c77 100644 --- a/lib/Cake/Test/Case/Core/ObjectTest.php +++ b/lib/Cake/Test/Case/Core/ObjectTest.php @@ -716,7 +716,7 @@ class ObjectTest extends CakeTestCase { */ function testRequestActionPlugins() { 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(); Router::reload(); diff --git a/lib/Cake/Test/Case/I18n/I18nTest.php b/lib/Cake/Test/Case/I18n/I18nTest.php index d4b918472..cfed024b5 100644 --- a/lib/Cake/Test/Case/I18n/I18nTest.php +++ b/lib/Cake/Test/Case/I18n/I18nTest.php @@ -35,7 +35,7 @@ class I18nTest extends CakeTestCase { Cache::delete('object_map', '_cake_core_'); App::build(array( '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); CakePlugin::loadAll(); } @@ -2432,7 +2432,7 @@ class I18nTest extends CakeTestCase { */ function testPluginTranslation() { 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'); diff --git a/lib/Cake/Test/Case/Log/CakeLogTest.php b/lib/Cake/Test/Case/Log/CakeLogTest.php index 94c0a6cd9..fa978b210 100644 --- a/lib/Cake/Test/Case/Log/CakeLogTest.php +++ b/lib/Cake/Test/Case/Log/CakeLogTest.php @@ -48,7 +48,7 @@ class CakeLogTest extends CakeTestCase { function testImportingLoggers() { App::build(array( '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); CakePlugin::load('TestPlugin'); diff --git a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php index 749b027f3..27508a12e 100644 --- a/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php +++ b/lib/Cake/Test/Case/Model/BehaviorCollectionTest.php @@ -453,7 +453,7 @@ class BehaviorCollectionTest extends CakeTestCase { $this->assertEquals($Apple->testMethod(true), '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'); $this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne'))); $this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther); diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php index 5f1a5ab05..2abe76e74 100644 --- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php +++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php @@ -665,7 +665,7 @@ class CakeSchemaTest extends CakeTestCase { function testSchemaReadWithPlugins() { App::objects('model', null, false); 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'); @@ -984,7 +984,7 @@ class CakeSchemaTest extends CakeTestCase { */ function testSchemaLoadingFromPlugin() { 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'); $Other = $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin')); diff --git a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php index 4f3e7e63c..08c224f16 100644 --- a/lib/Cake/Test/Case/Model/ConnectionManagerTest.php +++ b/lib/Cake/Test/Case/Model/ConnectionManagerTest.php @@ -80,7 +80,7 @@ class ConnectionManagerTest extends CakeTestCase { */ function testGetPluginDataSource() { 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'); $name = 'test_source'; @@ -102,7 +102,7 @@ class ConnectionManagerTest extends CakeTestCase { */ function testGetPluginDataSourceAndPluginDriver() { 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'); $name = 'test_plugin_source_and_driver'; @@ -126,7 +126,7 @@ class ConnectionManagerTest extends CakeTestCase { */ function testGetLocalDataSourceAndPluginDriver() { 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'); $name = 'test_local_source_and_plugin_driver'; @@ -149,7 +149,7 @@ class ConnectionManagerTest extends CakeTestCase { */ function testGetPluginDataSourceAndLocalDriver() { 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( LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Database' . DS ) @@ -272,7 +272,7 @@ class ConnectionManagerTest extends CakeTestCase { */ function testConnectionData() { 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( LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS ) diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 88e4a5cca..15e40f9e8 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -530,7 +530,7 @@ class CakeSessionTest extends CakeTestCase { 'Model/Datasource/Session' => array( 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); Configure::write('Session', array( 'defaults' => 'cake', @@ -551,7 +551,7 @@ class CakeSessionTest extends CakeTestCase { */ function testUsingPluginHandler() { App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) ), true); Configure::write('Session', array( diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php index 398333036..220339778 100644 --- a/lib/Cake/Test/Case/Routing/DispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php @@ -1042,7 +1042,7 @@ class DispatcherTest extends CakeTestCase { } Router::reload(); App::build(array( - 'plugins' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'plugins' . DS) + 'plugins' => array(LIBS . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS) ), true); CakePlugin::loadAll(); @@ -1142,7 +1142,7 @@ class DispatcherTest extends CakeTestCase { public function testTestPluginDispatch() { $Dispatcher = new TestDispatcher(); 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(); Router::reload(); @@ -1200,7 +1200,7 @@ class DispatcherTest extends CakeTestCase { Router::reload(); 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), 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS) )); diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index 54f6893b6..868314522 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -122,7 +122,7 @@ class ControllerTestCaseTest extends CakeTestCase { function setUp() { parent::setUp(); 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), 'Model' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'Model' . DS), 'View' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View' . DS) diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php index 4586bd8a0..d3d093882 100644 --- a/lib/Cake/Test/Case/View/HelperCollectionTest.php +++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php @@ -82,7 +82,7 @@ class HelperCollectionTest extends CakeTestCase { $result = $this->Helpers->load('Html'); $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(); $result = $this->Helpers->load('SomeOther', array('className' => 'TestPlugin.OtherHelper')); $this->assertInstanceOf('OtherHelperHelper', $result); @@ -123,7 +123,7 @@ class HelperCollectionTest extends CakeTestCase { */ function testLoadPluginHelper() { 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(); $result = $this->Helpers->load('TestPlugin.OtherHelper'); diff --git a/lib/Cake/Test/Case/View/HelperTest.php b/lib/Cake/Test/Case/View/HelperTest.php index 2c1f0edfd..f19ebb47f 100644 --- a/lib/Cake/Test/Case/View/HelperTest.php +++ b/lib/Cake/Test/Case/View/HelperTest.php @@ -518,7 +518,7 @@ class HelperTest extends CakeTestCase { $_timestamp = Configure::read('Asset.timestamp'); Configure::write('Asset.timestamp', 'force'); 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), )); CakePlugin::loadAll(); @@ -799,7 +799,7 @@ class HelperTest extends CakeTestCase { */ function testLazyLoadingHelpers() { 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(); $Helper = new TestHelper($this->View); diff --git a/lib/Cake/Test/Case/View/ThemeViewTest.php b/lib/Cake/Test/Case/View/ThemeViewTest.php index 1c7c99a9c..43cb96b4f 100644 --- a/lib/Cake/Test/Case/View/ThemeViewTest.php +++ b/lib/Cake/Test/Case/View/ThemeViewTest.php @@ -117,7 +117,7 @@ class ThemeViewTest extends CakeTestCase { $this->PostsController->index(); $this->ThemeView = new ThemeView($this->PostsController); 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) )); CakePlugin::loadAll(); diff --git a/lib/Cake/Test/Case/View/ViewTest.php b/lib/Cake/Test/Case/View/ViewTest.php index 14c783d0b..67526f321 100644 --- a/lib/Cake/Test/Case/View/ViewTest.php +++ b/lib/Cake/Test/Case/View/ViewTest.php @@ -195,9 +195,9 @@ class ViewTest extends CakeTestCase { $this->PostsController->index(); $this->View = new View($this->PostsController); 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 + LIBS . 'Test' . DS . 'test_app' . DS . 'View'. DS ) ), true); CakePlugin::loadAll(); @@ -227,16 +227,16 @@ class ViewTest extends CakeTestCase { function testPluginGetTemplate() { $this->Controller->plugin = 'TestPlugin'; $this->Controller->name = 'TestPlugin'; - $this->Controller->viewPath = 'tests'; + $this->Controller->viewPath = 'Tests'; $this->Controller->action = 'index'; $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'); $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(); $this->assertEqual($result, $expected); } @@ -249,7 +249,7 @@ class ViewTest extends CakeTestCase { function testPluginPathGeneration() { $this->Controller->plugin = 'TestPlugin'; $this->Controller->name = 'TestPlugin'; - $this->Controller->viewPath = 'tests'; + $this->Controller->viewPath = 'Tests'; $this->Controller->action = 'index'; $View = new TestView($this->Controller); @@ -278,12 +278,12 @@ class ViewTest extends CakeTestCase { function testCamelCasePluginGetTemplate() { $this->Controller->plugin = 'TestPlugin'; $this->Controller->name = 'TestPlugin'; - $this->Controller->viewPath = 'tests'; + $this->Controller->viewPath = 'Tests'; $this->Controller->action = 'index'; $View = new TestView($this->Controller); 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) )); diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php index 91dd15696..e50bdb385 100644 --- a/lib/Cake/View/View.php +++ b/lib/Cake/View/View.php @@ -740,7 +740,7 @@ class View extends Object { $subDir = $this->layoutPath . DS; } $paths = $this->_paths($this->plugin); - $file = 'layouts' . DS . $subDir . $name; + $file = 'Layouts' . DS . $subDir . $name; $exts = $this->_getExtensions(); foreach ($exts as $ext) { @@ -780,8 +780,8 @@ class View extends Object { $exts = $this->_getExtensions(); foreach ($exts as $ext) { foreach ($paths as $path) { - if (file_exists($path . 'elements' . DS . $name . $ext)) { - return $path . 'elements' . DS . $name . $ext; + if (file_exists($path . 'Elements' . DS . $name . $ext)) { + return $path . 'Elements' . DS . $name . $ext; } } } diff --git a/lib/Cake/bootstrap.php b/lib/Cake/bootstrap.php index 2c296fb6d..00284c1cd 100644 --- a/lib/Cake/bootstrap.php +++ b/lib/Cake/bootstrap.php @@ -86,20 +86,20 @@ if (!defined('APP')) { /** * 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. * 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). */ - define('ELEMENTS', VIEWS.'elements'.DS); + define('ELEMENTS', VIEWS.'Elements'.DS); /** * Path to the configuration files directory. */ 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. */ if (!defined('CAKE_TESTS')) { - define('CAKE_TESTS', CAKE.'tests'.DS); + define('CAKE_TESTS', CAKE.'Test'.DS); } /**