diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
index 1792c9fd52923..fe27e53e7cbe9 100644
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@@ -296,13 +296,13 @@ public static function createFromGlobals()
      * The information contained in the URI always take precedence
      * over the other information (server and parameters).
      *
-     * @param string $uri        The URI
-     * @param string $method     The HTTP method
-     * @param array  $parameters The query (GET) or request (POST) parameters
-     * @param array  $cookies    The request cookies ($_COOKIE)
-     * @param array  $files      The request files ($_FILES)
-     * @param array  $server     The server parameters ($_SERVER)
-     * @param string $content    The raw body data
+     * @param string      $uri        The URI
+     * @param string      $method     The HTTP method
+     * @param array       $parameters The query (GET) or request (POST) parameters
+     * @param array       $cookies    The request cookies ($_COOKIE)
+     * @param array       $files      The request files ($_FILES)
+     * @param array       $server     The server parameters ($_SERVER)
+     * @param string|null $content    The raw body data
      *
      * @return static
      */
@@ -1748,7 +1748,7 @@ protected function prepareBaseUrl()
 
         // Does the baseUrl have anything in common with the request_uri?
         $requestUri = $this->getRequestUri();
-        if ($requestUri !== '' && $requestUri[0] !== '/') {
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
             $requestUri = '/'.$requestUri;
         }
 
@@ -1824,7 +1824,7 @@ protected function preparePathInfo()
         if (false !== $pos = strpos($requestUri, '?')) {
             $requestUri = substr($requestUri, 0, $pos);
         }
-        if ($requestUri !== '' && $requestUri[0] !== '/') {
+        if ('' !== $requestUri && '/' !== $requestUri[0]) {
             $requestUri = '/'.$requestUri;
         }