Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Request::segments method.

This commit is contained in:
Taylor Otwell 2011-08-05 15:24:24 -05:00
parent 9827ca2cde
commit 6cf69d5406
1 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
system/request.php
View File

@ -16,13 +16,6 @@ class Request {
*/ */
public static $uri; public static $uri;
/**
* The request URI segments.
*
* @var array
*/
public static $segments;
/** /**
* Get the request URI. * Get the request URI.
* *
@ -34,31 +27,6 @@ public static function uri()
{ {
if ( ! is_null(static::$uri)) return static::$uri; if ( ! is_null(static::$uri)) return static::$uri;
$uri = static::raw_uri();
if (strpos($uri, $base = parse_url(Config::get('application.url'), PHP_URL_PATH)) === 0)
{
$uri = substr($uri, strlen($base));
}
if (strpos($uri, $index = '/index.php') === 0)
{
$uri = substr($uri, strlen($index));
}
return static::$uri = (($uri = trim($uri, '/')) == '') ? '/' : $uri;
}
/**
* Get the request URI from the $_SERVER array.
*
* The server PATH_INFO will be used if available. Otherwise, the REQUEST_URI will be used.
* The application URL and index will be removed from the URI.
*
* @return string
*/
private static function raw_uri()
{
if (isset($_SERVER['PATH_INFO'])) if (isset($_SERVER['PATH_INFO']))
{ {
$uri = $_SERVER['PATH_INFO']; $uri = $_SERVER['PATH_INFO'];
@ -77,20 +45,17 @@ private static function raw_uri()
throw new \Exception("Malformed request URI. Request terminated."); throw new \Exception("Malformed request URI. Request terminated.");
} }
return $uri; if (strpos($uri, $base = parse_url(Config::get('application.url'), PHP_URL_PATH)) === 0)
} {
$uri = substr($uri, strlen($base));
}
/** if (strpos($uri, $index = '/index.php') === 0)
* Get a segment of the request URI. {
* $uri = substr($uri, strlen($index));
* @param int $segment }
* @return string
*/
public static function segment($segment)
{
if (is_null(static::$segments)) static::$segments = explode('/', static::uri());
return (isset(static::$segments[$index = $segment - 1])) ? static::$segments[$index] : null; return static::$uri = (($uri = trim($uri, '/')) == '') ? '/' : $uri;
} }
/** /**