merged branch hhamon/request_getport_cleanup (PR #4052)

Commits
-------

6dddb6b [HttpFoundation] removed useless else clause in Request::getPort() method.

Discussion
----------

Request getport cleanup

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

src/Symfony/Component/HttpFoundation/Request.php

@@ -564,9 +564,9 @@ class Request
     {
         if (self::$trustProxy && $this->headers->has('X-Forwarded-Port')) {
             return $this->headers->get('X-Forwarded-Port');
-        } else {
-            return $this->server->get('SERVER_PORT');
         }
+
+        return $this->server->get('SERVER_PORT');
     }
 
     /**