Skip to content

Commit

Permalink
bug #32682 [HttpFoundation] Revert getClientIp @return docblock (ossi…
Browse files Browse the repository at this point in the history
…nkine)

This PR was merged into the 3.4 branch.

Discussion
----------

[HttpFoundation] Revert getClientIp @return docblock

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

<!--
Replace this notice by a short README for your feature/bugfix. This will help people
understand your PR and can be used as a start for the documentation.

Additionally (see https://symfony.com/roadmap):
 - Bug fixes must be submitted against the lowest maintained branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against branch 4.4.
 - Legacy code removals go to the master branch.
-->

This PR reverts #22418, see the comment #22418 (comment)

Commits
-------

7568d34 [HttpFoundation] Revert getClientIp @return docblock
  • Loading branch information
fabpot committed Aug 4, 2019
2 parents 8f87a85 + 7568d34 commit 2b0f2de
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpFoundation/Request.php
Expand Up @@ -912,7 +912,7 @@ public function getClientIps()
* ("Client-Ip" for instance), configure it via the $trustedHeaderSet
* argument of the Request::setTrustedProxies() method instead.
*
* @return string|null The client IP address
* @return string The client IP address
*
* @see getClientIps()
* @see http://en.wikipedia.org/wiki/X-Forwarded-For
Expand Down

0 comments on commit 2b0f2de

Please sign in to comment.