console cake cleanup and unification

remove duplicate define
cakephp · Jun 17, 2014 · a9de83d · a9de83d
1 parent 96df2c4
commit a9de83d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/app/Console/cake.php b/app/Console/cake.php
@@ -17,20 +17,24 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
 
 	// the following line differs from its sibling
 	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+	ini_set('include_path', $root . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+	unset($root);
 }
 
 if (!include $dispatcher) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
-unset($paths, $path, $dispatcher, $root, $ds);
+unset($dispatcher);
 
 return ShellDispatcher::run($argv);
diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php
@@ -79,7 +79,6 @@ protected function _initConstants() {
 		}
 
 		if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-			define('DS', DIRECTORY_SEPARATOR);
 			define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__))));
 			define('CAKEPHP_SHELL', true);
 			if (!defined('CORE_PATH')) {

diff --git a/lib/Cake/Console/cake.php b/lib/Cake/Console/cake.php
@@ -17,21 +17,24 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 $found = false;
 $paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 
 foreach ($paths as $path) {
-	if (file_exists($path . $ds . $dispatcher)) {
+	if (file_exists($path . DS . $dispatcher)) {
 		$found = $path;
 		break;
 	}
 }
 
 if (!$found) {
-	$rootInstall = dirname(dirname(dirname(__FILE__))) . $ds . $dispatcher;
-	$composerInstall = dirname(dirname(__FILE__)) . $ds . $dispatcher;
+	$rootInstall = dirname(dirname(dirname(__FILE__))) . DS . $dispatcher;
+	$composerInstall = dirname(dirname(__FILE__)) . DS . $dispatcher;
 
 	if (file_exists($composerInstall)) {
 		include $composerInstall;
@@ -40,10 +43,12 @@
 	} else {
 		trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 	}
+	unset($rootInstall, $composerInstall);
+
 } else {
-	include $found . $ds . $dispatcher;
+	include $found . DS . $dispatcher;
 }
 
-unset($paths, $path, $found, $dispatcher, $root, $ds);
+unset($paths, $path, $found, $dispatcher);
 
 return ShellDispatcher::run($argv);