From f824cc0f43c2dad4f178aec36fd0cc865d785f57 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Mon, 31 Oct 2011 22:44:54 -0500
Subject: [PATCH] refactoring the uri method.

---
 laravel/request.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/laravel/request.php b/laravel/request.php
index f6378597..67c5ab8c 100644
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -26,6 +26,10 @@ class Request {
 	/**
 	 * Get the URI for the current request.
 	 *
+	 * If the request is to the root of the application, a single forward slash
+	 * will be returned. Otherwise, the URI will be returned without any leading
+	 * or trailing slashes.
+	 *
 	 * @return string
 	 */
 	public static function uri()
@@ -44,6 +48,8 @@ public static function uri()
 			$uri = substr($uri, strlen($base));
 		}
 
+		// Remove the application index file. It is not used for anything as far
+		// as the framework and routing is concerned, so it's worthless.
 		$index = '/'.Config::$items['application']['index'];
 
 		if ($index !== '/' and strpos($uri, $index) === 0)
@@ -51,6 +57,9 @@ public static function uri()
 			$uri = substr($uri, strlen($index));
 		}
 
+		// Format the final request URI. If there is nothing left, we will just
+		// return a single forward slash. Otherwise, we'll remove all of the
+		// leading and trailing spaces from the URI.
 		return static::$uri = (($uri = trim($uri, '/')) !== '') ? $uri : '/';
 	}