From 16a62193fcbdac7394dcde49d567dbde592731b2 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Fri, 4 Nov 2011 19:07:13 -0500
Subject: [PATCH] fix function namespacing.

---
 laravel/bootstrap/core.php      | 38 +++++++++++++--------------------
 laravel/bootstrap/errors.php    | 12 +++++------
 laravel/bootstrap/functions.php | 27 +++++++++++++++++++++++
 3 files changed, 48 insertions(+), 29 deletions(-)
 create mode 100644 laravel/bootstrap/functions.php

diff --git a/laravel/bootstrap/core.php b/laravel/bootstrap/core.php
index fab3a7ec..a9d34ef6 100644
--- a/laravel/bootstrap/core.php
+++ b/laravel/bootstrap/core.php
@@ -1,9 +1,9 @@
 <?php namespace Laravel;
 
 /**
- * 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 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 these core paths.
  */
 define('EXT', '.php');
 define('CRLF', chr(13).chr(10));
@@ -29,9 +29,9 @@
 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.
+ * Define the Laravel environment configuration path. This path is used
+ * by the configuration class to load configuration options specific
+ * for the server environment.
  */
 $environment = '';
 
@@ -55,18 +55,18 @@
 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.
+ * Load a few of the core configuration files that are loaded for every
+ * request to the application. It is quicker to load them manually each
+ * request 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.
+ * Bootstrap the application inversion of control container. The IoC
+ * container is responsible for resolving classes, and helps keep the
+ * framework flexible.
  */
 IoC::bootstrap();
 
@@ -78,15 +78,7 @@
 spl_autoload_register(array('Laravel\\Autoloader', 'load'));
 
 /**
- * Define a few global convenience functions to make our lives
- * as Laravel PHP developers a little more easy and enjoyable.
+ * Define a few global convenience functions to make our lives as
+ * Laravel PHP developers a little more easy and enjoyable.
  */
-function e($value)
-{
-	return HTML::entities($value);
-}
-
-function __($key, $replacements = array(), $language = null)
-{
-	return Lang::line($key, $replacements, $language);
-}
\ No newline at end of file
+require 'functions'.EXT;
\ No newline at end of file
diff --git a/laravel/bootstrap/errors.php b/laravel/bootstrap/errors.php
index af1fb40f..f1087c3d 100644
--- a/laravel/bootstrap/errors.php
+++ b/laravel/bootstrap/errors.php
@@ -1,9 +1,9 @@
 <?php namespace Laravel;
 
 /**
- * Define a closure that will return a formatted error message
- * when given an exception. This function will be used by the
- * error handler to create a more readable message.
+ * Define a closure that will return the formatted error message when
+ * when given an exception. This function will be used by all of error
+ * handlers to create a more readable message.
  */
 $message = function($e)
 {
@@ -17,9 +17,9 @@
 };
 
 /**
- * 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.
+ * 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)
 {
diff --git a/laravel/bootstrap/functions.php b/laravel/bootstrap/functions.php
new file mode 100644
index 00000000..7a775c8b
--- /dev/null
+++ b/laravel/bootstrap/functions.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Convert HTML characters to entities.
+ *
+ * The encoding specified in the application configuration file will be used.
+ *
+ * @param  string  $value
+ * @return string
+ */
+function e($value)
+{
+	return HTML::entities($value);
+}
+
+/**
+ * Retrieve a language line.
+ *
+ * @param  string  $key
+ * @param  array   $replacements
+ * @param  string  $language
+ * @return string
+ */
+function __($key, $replacements = array(), $language = null)
+{
+	return Lang::line($key, $replacements, $language);
+}
\ No newline at end of file