Merge branch 'hotfix/5374-cleanup' into develop

Forward-ports testing and CS fixes for zendframework/zendframework#5374
zendframework · Oct 31, 2013 · f8c3502 · f8c3502
3 parents fa17926 + b653ea9 + 2dd4cc5
commit f8c3502
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/PhpEnvironment/RemoteAddress.php b/src/PhpEnvironment/RemoteAddress.php
@@ -101,7 +101,7 @@ public function getIpAddress()
         if ($ip) {
             return $ip;
         }
-        
+
         // direct IP address
         if (isset($_SERVER['REMOTE_ADDR'])) {
             return $_SERVER['REMOTE_ADDR'];
@@ -118,7 +118,7 @@ public function getIpAddress()
      */
     protected function getIpAddressFromProxy()
     {
-        if (!$this->useProxy 
+        if (!$this->useProxy
             || !in_array($_SERVER['REMOTE_ADDR'], $this->trustedProxies)
         ) {
             return false;
@@ -135,7 +135,7 @@ protected function getIpAddressFromProxy()
         $ips = array_map('trim', $ips);
         // remove trusted proxy IPs
         $ips = array_diff($ips, $this->trustedProxies);
-        
+
         // Any left?
         if (empty($ips)) {
             return false;