Skip to content

Commit

Permalink
[HttpFoundation] Fix getClientIp @return docblock
Browse files Browse the repository at this point in the history
  • Loading branch information
e-moe committed Apr 13, 2017
1 parent 67fba7d commit 6932072
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/Symfony/Component/HttpFoundation/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ public static function setTrustedProxies(array $proxies)
/**
* Gets the list of trusted proxies.
*
* @return array An array of trusted proxies.
* @return array an array of trusted proxies
*/
public static function getTrustedProxies()
{
Expand All @@ -579,7 +579,7 @@ public static function setTrustedHosts(array $hostPatterns)
/**
* Gets the list of trusted host patterns.
*
* @return array An array of trusted host patterns.
* @return array an array of trusted host patterns
*/
public static function getTrustedHosts()
{
Expand Down Expand Up @@ -832,7 +832,7 @@ public function getClientIps()
unset($clientIps[$key]);

// Fallback to this when the client IP falls into the range of trusted proxies
if (null === $firstTrustedIp) {
if (null === $firstTrustedIp) {
$firstTrustedIp = $clientIp;
}
}
Expand All @@ -855,7 +855,7 @@ public function getClientIps()
* ("Client-Ip" for instance), configure it via "setTrustedHeaderName()" with
* the "client-ip" key.
*
* @return string The client IP address
* @return string|null The client IP address
*
* @see getClientIps()
* @see http://en.wikipedia.org/wiki/X-Forwarded-For
Expand Down Expand Up @@ -1392,7 +1392,7 @@ public function getRequestFormat($default = 'html')
/**
* Sets the request format.
*
* @param string $format The request format.
* @param string $format the request format
*/
public function setRequestFormat($format)
{
Expand Down Expand Up @@ -1456,7 +1456,7 @@ public function getLocale()
/**
* Checks if the request method is of specified type.
*
* @param string $method Uppercase request method (GET, POST etc).
* @param string $method uppercase request method (GET, POST etc)
*
* @return bool
*/
Expand All @@ -1480,7 +1480,7 @@ public function isMethodSafe()
*
* @param bool $asResource If true, a resource will be returned
*
* @return string|resource The request body content or a resource to read the body stream.
* @return string|resource the request body content or a resource to read the body stream
*
* @throws \LogicException
*/
Expand Down Expand Up @@ -1666,7 +1666,7 @@ public function getAcceptableContentTypes()
* It works if your JavaScript library sets an X-Requested-With HTTP header.
* It is known to work with common JavaScript frameworks:
*
* @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
* @see http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
*
* @return bool true if the request is an XMLHttpRequest, false otherwise
*/
Expand Down

0 comments on commit 6932072

Please sign in to comment.