use symfony http foundation where applicable.

laravel/request.php

@@ -2,6 +2,13 @@
 
 class Request {
 
+	/**
+	 * The Symfony HttpFoundation Request instance.
+	 *
+	 * @var HttpFoundation\Request
+	 */
+	public static $request;
+
 	/**
 	 * All of the route instances handling the request.
 	 *
@@ -71,20 +78,7 @@ class Request {
 	 */
 	public static function ip($default = '0.0.0.0')
 	{
-		if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
-		{
-			return $_SERVER['HTTP_X_FORWARDED_FOR'];
-		}
-		elseif (isset($_SERVER['HTTP_CLIENT_IP']))
-		{
-			return $_SERVER['HTTP_CLIENT_IP'];
-		}
-		elseif (isset($_SERVER['REMOTE_ADDR']))
-		{
-			return $_SERVER['REMOTE_ADDR'];
-		}
-
-		return value($default);
+		return value(static::$request->getClientIp(), $default);
 	}
 
 	/**
@@ -97,6 +91,26 @@ class Request {
 		return array_get($_SERVER, 'SERVER_PROTOCOL', 'HTTP/1.1');
 	}
 
+	/**
+	 * Get the list of acceptable content types for the request.
+	 *
+	 * @return array
+	 */
+	public static function accept()
+	{
+		return static::$request->getAcceptableContentTypes();
+	}
+
+	/**
+	 * Determine if the request accepts a given content type.
+	 *
+	 * @return bool
+	 */
+	public static function accepts($type)
+	{
+		return in_array($type, static::accept());
+	}
+
 	/**
 	 * Determine if the current request is using HTTPS.
 	 *
@@ -104,7 +118,7 @@ class Request {
 	 */
 	public static function secure()
 	{
-		return isset($_SERVER['HTTPS']) and strtolower($_SERVER['HTTPS']) !== 'off';
+		return static::$request->isSecure();
 	}
 
 	/**
@@ -126,9 +140,7 @@ class Request {
 	 */
 	public static function ajax()
 	{
-		if ( ! isset($_SERVER['HTTP_X_REQUESTED_WITH'])) return false;
-
-		return strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest';
+		return static::$request->isXmlHttpRequest();
 	}
 
 	/**
@@ -182,4 +194,16 @@ class Request {
 		return static::$route;
 	}
 
+	/**
+	 * Pass any other methods to the Symfony request.
+	 *
+	 * @param  string  $method
+	 * @param  array   $parameters
+	 * @return mixed
+	 */
+	public static function __callStatic($method, $parameters)
+	{
+		return call_user_func_array(array(static::$request, $method), $parameters);
+	}
+
 }