From f44c565ee46109cba060af962c3ebd5f991c050e Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 27 Jan 2012 16:17:43 -0600
Subject: [PATCH] converted path constants to $GLOBALS.

---
 application/bundle.php                        |  8 +++----
 artisan                                       |  4 ++--
 laravel/asset.php                             |  2 +-
 laravel/autoloader.php                        |  6 ++---
 laravel/blade.php                             |  2 +-
 laravel/bundle.php                            |  8 +++----
 laravel/cache.php                             |  4 ++--
 laravel/cli/artisan.php                       |  4 ++--
 laravel/cli/tasks/bundle/bundler.php          |  4 ++--
 laravel/cli/tasks/bundle/providers/github.php |  2 +-
 laravel/cli/tasks/bundle/publisher.php        |  4 ++--
 laravel/cli/tasks/key.php                     |  2 +-
 laravel/cli/tasks/migrate/migrator.php        |  2 +-
 laravel/cli/tasks/session/manager.php         |  6 ++---
 laravel/cli/tasks/test/runner.php             | 24 ++++++++++++++-----
 laravel/config.php                            |  2 +-
 laravel/cookie.php                            |  2 +-
 laravel/core.php                              | 13 ++++------
 laravel/crypter.php                           |  2 +-
 laravel/database/connectors/sqlite.php        |  2 +-
 laravel/file.php                              |  4 ++--
 laravel/helpers.php                           | 13 +++++++++-
 laravel/log.php                               |  2 +-
 laravel/session.php                           |  2 +-
 laravel/view.php                              |  2 +-
 paths.php                                     | 18 ++++----------
 phpunit.php                                   | 17 +------------
 public/index.php                              |  2 +-
 28 files changed, 80 insertions(+), 83 deletions(-)

diff --git a/application/bundle.php b/application/bundle.php
index d1b9e362..8e7507f4 100644
--- a/application/bundle.php
+++ b/application/bundle.php
@@ -16,8 +16,8 @@
 */
 
 Autoloader::psr(array(
-	APP_PATH.'models',
-	APP_PATH.'libraries',
+	$GLOBALS['APP_PATH'].'models',
+	$GLOBALS['APP_PATH'].'libraries',
 ));
 
 /*
@@ -37,6 +37,6 @@
 */
 
 Autoloader::map(array(
-	//'User' => APP_PATH.'models/user.php',
-	//'Role' => APP_PATH.'models/role.php',
+	//'User' => $GLOBALS['APP_PATH'].'models/user.php',
+	//'Role' => $GLOBALS['APP_PATH'].'models/role.php',
 ));
\ No newline at end of file
diff --git a/artisan b/artisan
index b46f317b..0d827f8c 100644
--- a/artisan
+++ b/artisan
@@ -16,9 +16,9 @@ require 'paths.php';
 // --------------------------------------------------------------
 // Bootstrap the Laravel core.
 // --------------------------------------------------------------
-require SYS_PATH.'core.php';
+require $GLOBALS['SYS_PATH'].'core.php';
 
 // --------------------------------------------------------------
 // Launch the Laravel "Artisan" CLI.
 // --------------------------------------------------------------
-require SYS_PATH.'cli/artisan'.EXT;
\ No newline at end of file
+require $GLOBALS['SYS_PATH'].'cli/artisan'.EXT;
\ No newline at end of file
diff --git a/laravel/asset.php b/laravel/asset.php
index b8aeb448..e2ccd23e 100644
--- a/laravel/asset.php
+++ b/laravel/asset.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 class Asset {
 
diff --git a/laravel/autoloader.php b/laravel/autoloader.php
index a7ca41a6..5a634600 100644
--- a/laravel/autoloader.php
+++ b/laravel/autoloader.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 class Autoloader {
 
@@ -62,7 +62,7 @@ class_alias(static::$aliases[$class], $class);
 
 			if ($namespace == 'Laravel')
 			{
-				return static::load_psr($class, BASE_PATH);
+				return static::load_psr($class, $GLOBALS['BASE_PATH']);
 			}
 
 			// If the class namespace is mapped to a directory, we will load the class
@@ -149,7 +149,7 @@ protected static function load_psr($class, $directory = null)
 	 *
 	 * <code>
 	 *		// Register a class mapping with the Autoloader
-	 *		Autoloader::map(array('User' => APP_PATH.'models/user.php'));
+	 *		Autoloader::map(array('User' => $GLOBALS['APP_PATH'].'models/user.php'));
 	 * </code>
 	 *
 	 * @param  array  $mappings
diff --git a/laravel/blade.php b/laravel/blade.php
index ad30fbcb..15cf20d5 100644
--- a/laravel/blade.php
+++ b/laravel/blade.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 class Blade {
 
diff --git a/laravel/bundle.php b/laravel/bundle.php
index 7ee967ff..2857aaac 100644
--- a/laravel/bundle.php
+++ b/laravel/bundle.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 class Bundle {
 
@@ -51,7 +51,7 @@ public static function register($bundle, $config = array())
 		// We will trim the trailing slash from the location and add it back so
 		// we don't have to worry about the developer adding or not adding it
 		// to the location path for the bundle.
-		$config['location'] = BUNDLE_PATH.rtrim($config['location'], DS).DS;
+		$config['location'] = $GLOBALS['BUNDLE_PATH'].rtrim($config['location'], DS).DS;
 
 		static::$bundles[$bundle] = array_merge($defaults, $config);
 	}
@@ -173,7 +173,7 @@ public static function class_prefix($bundle)
 	 *		// Returns the bundle path for the "admin" bundle
 	 *		$path = Bundle::path('admin');
 	 *
-	 *		// Returns the APP_PATH constant as the default bundle
+	 *		// Returns the $GLOBALS['APP_PATH'] constant as the default bundle
 	 *		$path = Bundle::path('application');
 	 * </code>
 	 *
@@ -182,7 +182,7 @@ public static function class_prefix($bundle)
 	 */
 	public static function path($bundle)
 	{
-		return ($bundle == DEFAULT_BUNDLE) ? APP_PATH : static::$bundles[$bundle]['location'];
+		return ($bundle == DEFAULT_BUNDLE) ? $GLOBALS['APP_PATH'] : static::$bundles[$bundle]['location'];
 	}
 
 	/**
diff --git a/laravel/cache.php b/laravel/cache.php
index cc044373..2c532d5d 100644
--- a/laravel/cache.php
+++ b/laravel/cache.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 class Cache {
 
@@ -51,7 +51,7 @@ protected static function factory($driver)
 				return new Cache\Drivers\APC(Config::get('cache.key'));
 
 			case 'file':
-				return new Cache\Drivers\File(CACHE_PATH);
+				return new Cache\Drivers\File($GLOBALS['STORAGE_PATH'].'cache'.DS);
 
 			case 'memcached':
 				return new Cache\Drivers\Memcached(Memcached::connection(), Config::get('cache.key'));
diff --git a/laravel/cli/artisan.php b/laravel/cli/artisan.php
index 398091bc..117d64c4 100644
--- a/laravel/cli/artisan.php
+++ b/laravel/cli/artisan.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel\CLI; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel\CLI; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 use Laravel\Bundle;
 use Laravel\Config;
@@ -44,7 +44,7 @@
  * us to seamlessly add tasks to the CLI so that the Task class
  * doesn't have to worry about how to resolve core tasks.
  */
-require SYS_PATH.'cli/dependencies'.EXT;
+require $GLOBALS['SYS_PATH'].'cli/dependencies'.EXT;
 
 /**
  * We will wrap the command execution in a try / catch block and
diff --git a/laravel/cli/tasks/bundle/bundler.php b/laravel/cli/tasks/bundle/bundler.php
index f7695c4d..8af7bdcf 100644
--- a/laravel/cli/tasks/bundle/bundler.php
+++ b/laravel/cli/tasks/bundle/bundler.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel\CLI\Tasks\Bundle; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel\CLI\Tasks\Bundle; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 use Laravel\IoC;
 use Laravel\Bundle;
@@ -16,7 +16,7 @@ public function install($bundles)
 	{
 		foreach ($this->get($bundles) as $bundle)
 		{
-			if (is_dir(BUNDLE_PATH.$bundle['name']))
+			if (is_dir($GLOBALS['BUNDLE_PATH'].$bundle['name']))
 			{
 				echo "Bundle {$bundle['name']} is already installed.";
 
diff --git a/laravel/cli/tasks/bundle/providers/github.php b/laravel/cli/tasks/bundle/providers/github.php
index be8de72c..e2a36087 100644
--- a/laravel/cli/tasks/bundle/providers/github.php
+++ b/laravel/cli/tasks/bundle/providers/github.php
@@ -17,7 +17,7 @@ public function install($bundle)
 		// a location outside of the Git repository, so we don't need
 		// the full bundle path. We'll just take the basename in case
 		// the bundle directory has been renamed.
-		$path = basename(BUNDLE_PATH).'/';
+		$path = basename($GLOBALS['BUNDLE_PATH']).'/';
 
 		passthru('git submodule add '.$repository.' '.$path.$bundle['name']);
 
diff --git a/laravel/cli/tasks/bundle/publisher.php b/laravel/cli/tasks/bundle/publisher.php
index 5fc30c84..d15effdb 100644
--- a/laravel/cli/tasks/bundle/publisher.php
+++ b/laravel/cli/tasks/bundle/publisher.php
@@ -16,7 +16,7 @@ public function publish($bundle)
 	{
 		$path = Bundle::path($bundle);
 
-		$this->move($path.'public', PUBLIC_PATH.'bundles'.DS.$bundle);
+		$this->move($path.'public', $GLOBALS['PUBLIC_PATH'].'bundles'.DS.$bundle);
 
 		echo "Assets published for bundle [$bundle].".PHP_EOL;
 	}
@@ -41,7 +41,7 @@ protected function move($source, $destination)
 	 */
 	protected function to($bundle)
 	{
-		return PUBLIC_PATH.'bundles'.DS.$bundle.DS;
+		return $GLOBALS['PUBLIC_PATH'].'bundles'.DS.$bundle.DS;
 	}
 
 	/**
diff --git a/laravel/cli/tasks/key.php b/laravel/cli/tasks/key.php
index 91c89239..8b336171 100644
--- a/laravel/cli/tasks/key.php
+++ b/laravel/cli/tasks/key.php
@@ -19,7 +19,7 @@ class Key extends Task {
 	 */
 	public function __construct()
 	{
-		$this->path = APP_PATH.'config/application'.EXT;
+		$this->path = $GLOBALS['APP_PATH'].'config/application'.EXT;
 	}
 
 	/**
diff --git a/laravel/cli/tasks/migrate/migrator.php b/laravel/cli/tasks/migrate/migrator.php
index 44dc56d4..4cdf9710 100644
--- a/laravel/cli/tasks/migrate/migrator.php
+++ b/laravel/cli/tasks/migrate/migrator.php
@@ -222,7 +222,7 @@ public function make($arguments = array())
 	 */
 	protected function stub($bundle, $migration)
 	{
-		$stub = File::get(SYS_PATH.'cli/tasks/migrate/stub'.EXT);
+		$stub = File::get($GLOBALS['SYS_PATH'].'cli/tasks/migrate/stub'.EXT);
 
 		// The class name is formatted simialrly to tasks and controllers,
 		// where the bundle name is prefixed to the class if it is not in
diff --git a/laravel/cli/tasks/session/manager.php b/laravel/cli/tasks/session/manager.php
index 7c7dba99..ba6f6136 100644
--- a/laravel/cli/tasks/session/manager.php
+++ b/laravel/cli/tasks/session/manager.php
@@ -34,7 +34,7 @@ public function install($arguments = array())
 		// generated on the database.
 		$migration = $migrator->make(array('create_session_table'));
 
-		$stub = SYS_PATH.'cli/tasks/session/migration'.EXT;
+		$stub = $GLOBALS['SYS_PATH'].'cli/tasks/session/migration'.EXT;
 
 		File::put($migration, File::get($stub));
 
@@ -42,7 +42,7 @@ public function install($arguments = array())
 		// Since the developer is requesting that the session table be
 		// created on the database, we'll set the driver to database
 		// to save an extra step for the developer.
-		$config = File::get(APP_PATH.'config/session'.EXT);
+		$config = File::get($GLOBALS['APP_PATH'].'config/session'.EXT);
 
 		$config = str_replace(
 			"'driver' => '',",
@@ -50,7 +50,7 @@ public function install($arguments = array())
 			$config
 		);
 
-		File::put(APP_PATH.'config/session'.EXT, $config);
+		File::put($GLOBALS['APP_PATH'].'config/session'.EXT, $config);
 
 		echo PHP_EOL;
 
diff --git a/laravel/cli/tasks/test/runner.php b/laravel/cli/tasks/test/runner.php
index 09c39688..02307b9c 100644
--- a/laravel/cli/tasks/test/runner.php
+++ b/laravel/cli/tasks/test/runner.php
@@ -23,7 +23,7 @@ public function run()
 	 */
 	public function core()
 	{
-		if ( ! is_dir(BUNDLE_PATH.'laravel-tests'))
+		if ( ! is_dir($GLOBALS['BUNDLE_PATH'].'laravel-tests'))
 		{
 			throw new \Exception("The bundle [laravel-tests] has not been installed!");
 		}
@@ -31,7 +31,19 @@ public function core()
 		// When testing the Laravel core, we will just stub the path directly
 		// so the test bundle is not required to be registered in the bundle
 		// configuration, as it is kind of a unique bundle.
-		$this->stub(BUNDLE_PATH.'laravel-tests/cases');
+		$this->stub($GLOBALS['BUNDLE_PATH'].'laravel-tests/cases');
+
+		$path = $GLOBALS['BUNDLE_PATH'].'laravel-tests/';
+
+		// When testing the framework, we will swap out the application
+		// and other core paths to stub out the application portion of
+		// the framework for testing. This allows us to create dummy
+		// controllers, views, models, etc.
+		$GLOBALS['APP_PATH'] = $path.'application'.DS;
+
+		$GLOBALS['BUNDLE_PATH'] = $path.'bundles'.DS;
+
+		$GLOBALS['STORAGE_PATH'] = $path.'storage'.DS;
 
 		$this->test();
 	}
@@ -74,9 +86,9 @@ protected function test()
 		// We'll simply fire off PHPUnit with the configuration switch
 		// pointing to our temporary configuration file. This allows
 		// us to flexibly run tests for any setup.
-		passthru('phpunit -c '.BASE_PATH.'phpunit.xml');
+		passthru('phpunit -c '.$GLOBALS['BASE_PATH'].'phpunit.xml');
 
-		@unlink(BASE_PATH.'phpunit.xml');
+		@unlink($GLOBALS['BASE_PATH'].'phpunit.xml');
 	}
 
 	/**
@@ -87,11 +99,11 @@ protected function test()
 	 */
 	protected function stub($directory)
 	{
-		$stub = File::get(SYS_PATH.'cli/tasks/test/stub.xml');
+		$stub = File::get($GLOBALS['SYS_PATH'].'cli/tasks/test/stub.xml');
 
 		$stub = str_replace('{{directory}}', $directory, $stub);
 
-		File::put(BASE_PATH.'phpunit.xml', $stub);
+		File::put($GLOBALS['BASE_PATH'].'phpunit.xml', $stub);
 	}
 
 }
\ No newline at end of file
diff --git a/laravel/config.php b/laravel/config.php
index 1d9da14f..72e3dbb7 100644
--- a/laravel/config.php
+++ b/laravel/config.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 use Closure;
 
diff --git a/laravel/cookie.php b/laravel/cookie.php
index 39e6da3d..016988df 100644
--- a/laravel/cookie.php
+++ b/laravel/cookie.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 use Closure;
 
diff --git a/laravel/core.php b/laravel/core.php
index a1ec4605..c3cd48f4 100644
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -9,9 +9,6 @@
 define('EXT', '.php');
 define('CRLF', "\r\n");
 define('BLADE_EXT', '.blade.php');
-define('CACHE_PATH', STORAGE_PATH.'cache'.DS);
-define('DATABASE_PATH', STORAGE_PATH.'database'.DS);
-define('SESSION_PATH', STORAGE_PATH.'sessions'.DS);
 define('DEFAULT_BUNDLE', 'application');
 define('MB_STRING', (int) function_exists('mb_get_info'));
 
@@ -20,10 +17,10 @@
  * These are typically classes that the auto-loader relies upon to
  * load classes, such as the array and configuration classes.
  */
-require SYS_PATH.'bundle'.EXT;
-require SYS_PATH.'config'.EXT;
-require SYS_PATH.'helpers'.EXT;
-require SYS_PATH.'autoloader'.EXT;
+require $GLOBALS['SYS_PATH'].'bundle'.EXT;
+require $GLOBALS['SYS_PATH'].'config'.EXT;
+require $GLOBALS['SYS_PATH'].'helpers'.EXT;
+require $GLOBALS['SYS_PATH'].'autoloader'.EXT;
 
 /**
  * Register the Autoloader's "load" method on the auto-loader stack.
@@ -45,7 +42,7 @@
  * file within the bundles directory. This informs the framework
  * where the bundle lives and which URIs it responds to.
  */
-$bundles = require BUNDLE_PATH.'bundles'.EXT;
+$bundles = require $GLOBALS['BUNDLE_PATH'].'bundles'.EXT;
 
 foreach ($bundles as $bundle => $value)
 {
diff --git a/laravel/crypter.php b/laravel/crypter.php
index eb45a518..4ad37ece 100644
--- a/laravel/crypter.php
+++ b/laravel/crypter.php
@@ -1,4 +1,4 @@
-<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
+<?php namespace Laravel; isset($GLOBALS['APP_PATH']) or die('No direct script access.');
 
 if (trim(Config::get('application.key')) === '')
 {
diff --git a/laravel/database/connectors/sqlite.php b/laravel/database/connectors/sqlite.php
index 5b3390f1..c78d5701 100644
--- a/laravel/database/connectors/sqlite.php
+++ b/laravel/database/connectors/sqlite.php
@@ -24,7 +24,7 @@ public function connect($config)
 		// SQLite databases will be created automatically if they do not exist, so we
 		// will not check for the existence of the database file before establishing
 		// the PDO connection to the database.
-		$path = DATABASE_PATH.$config['database'].'.sqlite';
+		$path = $GLOBALS['STORAGE_PATH'].'database'.DS.$config['database'].'.sqlite';
 
 		return new PDO('sqlite:'.$path, null, null, $options);
 	}
diff --git a/laravel/file.php b/laravel/file.php
index c72c577e..e72ec1e6 100644
--- a/laravel/file.php
+++ b/laravel/file.php
@@ -18,10 +18,10 @@ public static function exists($path)
 	 *
 	 * <code>
 	 *		// Get the contents of a file
-	 *		$contents = File::get(APP_PATH.'routes'.EXT);
+	 *		$contents = File::get($GLOBALS['APP_PATH'].'routes'.EXT);
 	 *
 	 *		// Get the contents of a file or return a default value if it doesn't exist
-	 *		$contents = File::get(APP_PATH.'routes'.EXT, 'Default Value');
+	 *		$contents = File::get($GLOBALS['APP_PATH'].'routes'.EXT, 'Default Value');
 	 * </code>
 	 *
 	 * @param  string  $path
diff --git a/laravel/helpers.php b/laravel/helpers.php
index f533999f..720f3ea0 100644
--- a/laravel/helpers.php
+++ b/laravel/helpers.php
@@ -1,5 +1,16 @@
 <?php
 
+/**
+ * Get one of the global paths.
+ *
+ * @param  string  $path
+ * @return string
+ */
+function path($path)
+{
+	return $GLOBALS[strtoupper($path).'_PATH'];
+}
+
 /**
  * Convert HTML characters to entities.
  *
@@ -268,7 +279,7 @@ function head($array)
  * @param  bool    $https
  * @return string
  */
-function path($url = '', $https = false)
+function url($url = '', $https = false)
 {
 	return Laravel\URL::to($url, $https);
 }
diff --git a/laravel/log.php b/laravel/log.php
index cdc550af..ad1fda81 100644
--- a/laravel/log.php
+++ b/laravel/log.php
@@ -43,7 +43,7 @@ public static function write($type, $message)
 	{
 		$message = date('Y-m-d H:i:s').' '.Str::upper($type)." - {$message}".PHP_EOL;
 
-		File::append(STORAGE_PATH.'logs/'.date('Y-m-d').'.log', $message);
+		File::append($GLOBALS['STORAGE_PATH'].'logs/'.date('Y-m-d').'.log', $message);
 	}
 
 	/**
diff --git a/laravel/session.php b/laravel/session.php
index 0c598a7b..744b0ca6 100644
--- a/laravel/session.php
+++ b/laravel/session.php
@@ -52,7 +52,7 @@ public static function factory($driver)
 				return new Session\Drivers\Database(Database::connection());
 
 			case 'file':
-				return new Session\Drivers\File(SESSION_PATH);
+				return new Session\Drivers\File($GLOBALS['STORAGE_PATH'].'sessions'.DS);
 
 			case 'memcached':
 				return new Session\Drivers\Memcached(Cache::driver('memcached'));
diff --git a/laravel/view.php b/laravel/view.php
index 2e041375..1dfba4fc 100644
--- a/laravel/view.php
+++ b/laravel/view.php
@@ -261,7 +261,7 @@ protected function compile()
 		// hash of their path. This allows us to easily store the views in
 		// the directory without worrying about re-creating the entire
 		// application view directory structure.
-		$compiled = STORAGE_PATH.'views/'.md5($this->path);
+		$compiled = $GLOBALS['STORAGE_PATH'].'views/'.md5($this->path);
 
 		// The view will only be re-compiled if the view has been modified
 		// since the last compiled version of the view was created or no
diff --git a/paths.php b/paths.php
index d21cc45e..bcbfd294 100644
--- a/paths.php
+++ b/paths.php
@@ -24,7 +24,7 @@
 // --------------------------------------------------------------
 // Define the path to the base directory.
 // --------------------------------------------------------------
-define('BASE_PATH', __DIR__.DS);
+$GLOBALS['BASE_PATH'] = __DIR__.DS;
 
 // --------------------------------------------------------------
 // The path to the application directory.
@@ -46,21 +46,16 @@
 // --------------------------------------------------------------
 $paths['STORAGE_PATH'] = 'storage';
 
-// --------------------------------------------------------------
-// The path to the tests directory.
-// --------------------------------------------------------------
-$paths['TESTS_PATH'] = 'tests';
-
 // --------------------------------------------------------------
 // The path to the public directory.
 // --------------------------------------------------------------
 if ($web)
 {
-	define('PUBLIC_PATH', realpath('').DS);
+	$GLOBALS['PUBLIC_PATH'] = realpath('').DS;
 }
 else
 {
-	$paths['PUBLIC_PATH'] = 'public';
+	$paths['PUBLIC'] = 'public';
 }
 
 // --------------------------------------------------------------
@@ -68,10 +63,7 @@
 // --------------------------------------------------------------
 foreach ($paths as $name => $path)
 {
-	if ( ! defined($name))
-	{
-		if ($web) $path = "../{$path}";
+	if ($web) $path = "../{$path}";
 
-		define($name, realpath($path).DS);
-	}
+	$GLOBALS[$name] = realpath($path).DS;
 }
\ No newline at end of file
diff --git a/phpunit.php b/phpunit.php
index e1a1ebd6..d9ea9d46 100644
--- a/phpunit.php
+++ b/phpunit.php
@@ -13,21 +13,6 @@
 // --------------------------------------------------------------
 define('DS', DIRECTORY_SEPARATOR);
 
-// --------------------------------------------------------------
-// Override the framework paths if testing Laravel.
-// --------------------------------------------------------------
-foreach ($_SERVER['argv'] as $argument)
-{
-	if (strpos($argument, 'build.xml') !== false)
-	{
-		define('APP_PATH', realpath('bundles/laravel-tests/application').DS);
-
-		define('BUNDLE_PATH', realpath('bundles/laravel-tests/bundles').DS);
-
-		define('STORAGE_PATH', realpath('bundles/laravel-tests/storage').DS);
-	}
-}
-
 // --------------------------------------------------------------
 // Set the core Laravel path constants.
 // --------------------------------------------------------------
@@ -36,7 +21,7 @@
 // --------------------------------------------------------------
 // Bootstrap the Laravel core.
 // --------------------------------------------------------------
-require SYS_PATH.'core.php';
+require $GLOBALS['SYS_PATH'].'core.php';
 
 // --------------------------------------------------------------
 // Start the default bundle.
diff --git a/public/index.php b/public/index.php
index a683d732..910c07b0 100644
--- a/public/index.php
+++ b/public/index.php
@@ -31,4 +31,4 @@
 // --------------------------------------------------------------
 // Launch Laravel.
 // --------------------------------------------------------------
-require SYS_PATH.'laravel.php';
\ No newline at end of file
+require $GLOBALS['SYS_PATH'].'laravel.php';
\ No newline at end of file