refactoring bootstrapping.

laravel/bootstrap/constants.php

@@ -1,58 +0,0 @@
-<?php
-
-define('EXT',       '.php');
-define('BLADE_EXT', '.blade.php');
-
-function constants($constants)
-{
-	foreach ($constants as $key => $value)
-	{
-		if ( ! defined($key)) define($key, $value);
-	}
-}
-
-/**
- * Register the core framework paths and all of the paths that
- * derive from them. If any constant has already been defined,
- * we will not attempt to define it again.
- */
-$constants = array(
-	'APP_PATH'     => realpath($application).'/',
-	'BASE_PATH'    => realpath("$laravel/..").'/',
-	'PUBLIC_PATH'  => realpath($public).'/',
-	'STORAGE_PATH' => realpath($storage).'/',
-	'SYS_PATH'     => realpath($laravel).'/',
-);
-
-constants($constants);
-
-unset($application, $public, $storage, $laravel);
-
-$constants = array(
-	'CACHE_PATH'      => STORAGE_PATH.'cache/',
-	'CONFIG_PATH'     => APP_PATH.'config/',
-	'CONTROLLER_PATH' => APP_PATH.'controllers/',
-	'DATABASE_PATH'   => STORAGE_PATH.'database/',
-	'LANG_PATH'       => APP_PATH.'language/',
-	'LIBRARY_PATH'    => APP_PATH.'libraries/',
-	'MODEL_PATH'      => APP_PATH.'models/',
-	'ROUTE_PATH'      => APP_PATH.'routes/',
-	'SESSION_PATH'    => STORAGE_PATH.'sessions/',
-	'SYS_CONFIG_PATH' => SYS_PATH.'config/',
-	'SYS_VIEW_PATH'   => SYS_PATH.'views/',
-	'VIEW_PATH'       => APP_PATH.'views/',
-);
-
-
-constants($constants);
-
-/**
- * Register the core framework paths and all of the paths that
- * derive from them. If any constant has already been defined,
- * we will not attempt to define it again.
- */
-$environment = (isset($_SERVER['LARAVEL_ENV'])) ? CONFIG_PATH.$_SERVER['LARAVEL_ENV'].'/' : '';
-
-constants(array('ENV_CONFIG_PATH' => $environment));
-
-unset($constants, $environment);

laravel/bootstrap/core.php

@@ -1,21 +1,87 @@
 <?php namespace Laravel;
 
-require 'constants.php';
+/**
+ * Define all of the constants used by the framework. All of the
+ * core paths will be defined, as well as all of the paths which
+ * derive from those core paths.
+ */
+define('EXT', '.php');
+define('CRLF', chr(13).chr(10));
+define('BLADE_EXT', '.blade.php');
 
+define('APP_PATH', realpath($application).'/');
+define('BASE_PATH', realpath("$laravel/..").'/');
+define('PUBLIC_PATH', realpath($public).'/');
+define('STORAGE_PATH', realpath($storage).'/');
+define('SYS_PATH', realpath($laravel).'/');
+
+define('CACHE_PATH', STORAGE_PATH.'cache/');
+define('CONFIG_PATH', APP_PATH.'config/');
+define('CONTROLLER_PATH', APP_PATH.'controllers/');
+define('DATABASE_PATH', STORAGE_PATH.'database/');
+define('LANG_PATH', APP_PATH.'language/');
+define('LIBRARY_PATH', APP_PATH.'libraries/');
+define('MODEL_PATH', APP_PATH.'models/');
+define('ROUTE_PATH', APP_PATH.'routes/');
+define('SESSION_PATH', STORAGE_PATH.'sessions/');
+define('SYS_CONFIG_PATH', SYS_PATH.'config/');
+define('SYS_VIEW_PATH', SYS_PATH.'views/');
+define('VIEW_PATH', APP_PATH.'views/');
+
+/**
+ * Define the Laravel environment configuration path. This path is
+ * used by the configuration class to load configuration options
+ * specific for the server environment.
+ */
+$environment = '';
+
+if (isset($_SERVER['LARAVEL_ENV']))
+{
+	$environment = CONFIG_PATH.$_SERVER['LARAVEL_ENV'].'/';
+}
+
+define('ENV_CONFIG_PATH', $environment);
+
+unset($application, $public, $storage, $laravel, $environment);
+
+/**
+ * Require all of the classes that can't be loaded by the auto-loader.
+ * These are typically classes that the auto-loader itself relies upon
+ * to load classes, such as the array and configuration classes.
+ */
 require SYS_PATH.'arr'.EXT;
 require SYS_PATH.'config'.EXT;
 require SYS_PATH.'facades'.EXT;
 require SYS_PATH.'container'.EXT;
 require SYS_PATH.'autoloader'.EXT;
 
+/**
+ * Load a few of the core configuration files that are loaded for
+ * every request to the application. It is quicker to load them
+ * manually rather than parse the keys for every request.
+ */
 Config::load('application');
 Config::load('container');
 Config::load('session');
 
+/**
+ * Bootstrap the application inversion of control container.
+ * The IoC container is responsible for resolving classes and
+ * their dependencies, and helps keep the framework flexible.
+ */
 IoC::bootstrap();
 
+/**
+ * Register the Autoloader's "load" method on the auto-loader stack.
+ * This method provides the lazy-loading of all class files, as well
+ * as any PSR-0 compliant libraries used by the application.
+ */
 spl_autoload_register(array('Laravel\\Autoloader', 'load'));
 
+/**
+ * Define a few convenient functions to make our lives as
+ * developers a little more easy and enjoyable.
+ */
 function e($value)
 {
 	return HTML::entities($value);

laravel/bootstrap/errors.php

@@ -17,9 +17,9 @@ $message = function($e)
 };
 
 /**
- * Define a clousre that will return a more readable version
- * of the severity of an exception. This function will be used
- * by the error handler when parsing exceptions.
+ * Define a closure that will return a more readable version of
+ * the severity of an exception. This function will be used by
+ * the error handler when parsing exceptions.
  */
 $severity = function($e)
 {