Skip to content
Permalink
Browse files

Remove use of WEBROOT_DIR from CakePHP.

This constant isn't really used that much and can easily be replaced
with the `App.webroot` config value.

Refs #4664
  • Loading branch information...
markstory committed Sep 20, 2014
1 parent c24f7ca commit 9245265dddc1e2d4877e466625c5f7771ce8b2f8
@@ -598,7 +598,7 @@ public function testLoginRedirect() {
Configure::write('App', array(
'dir' => APP_DIR,
'webroot' => WEBROOT_DIR,
'webroot' => 'webroot',
'base' => false,
'baseUrl' => '/cake/index.php'
));
@@ -1198,7 +1198,7 @@ public function testRedirectUrlWithBaseSet() {
Configure::write('App', array(
'dir' => APP_DIR,
'webroot' => WEBROOT_DIR,
'webroot' => 'webroot',
'base' => false,
'baseUrl' => '/cake/index.php'
));
@@ -1191,7 +1191,7 @@ public function testBaseUrlWithNoModRewrite() {
Configure::write('App', array(
'dir' => APP_DIR,
'webroot' => WEBROOT_DIR,
'webroot' => 'webroot',
'base' => false,
'baseUrl' => '/cake/index.php'
));
@@ -22,7 +22,6 @@
define('DS', DIRECTORY_SEPARATOR);
define('ROOT', dirname(__DIR__));
define('APP_DIR', 'TestApp');
define('WEBROOT_DIR', 'webroot');
define('TMP', sys_get_temp_dir() . DS);
define('LOGS', TMP . 'logs' . DS);
@@ -39,7 +38,7 @@
// Point app constants to the test app.
define('APP', TEST_APP . 'TestApp' . DS);
define('WWW_ROOT', TEST_APP . WEBROOT_DIR . DS);
define('WWW_ROOT', TEST_APP . 'webroot' . DS);
define('TESTS', TEST_APP . 'tests' . DS);
define('CONFIG', TEST_APP . 'config' . DS);
@@ -74,7 +73,7 @@
'base' => false,
'baseUrl' => false,
'dir' => APP_DIR,
'webroot' => WEBROOT_DIR,
'webroot' => 'webroot',
'www_root' => WWW_ROOT,
'fullBaseUrl' => 'http://localhost',
'imageBaseUrl' => 'img/',

0 comments on commit 9245265

Please sign in to comment.
You can’t perform that action at this time.