Fixing style errors.

cakephp · Jun 13, 2018 · 7d9d7e7 · 7d9d7e7
1 parent 28f27f3
commit 7d9d7e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -127,7 +127,7 @@ class ServerRequest implements ArrayAccess, ServerRequestInterface
 
     /**
      * trusted proxies list
-     * 
+     *
      * @var array
      */
     protected $trustedProxies = [];
@@ -585,39 +585,29 @@ public function session(Session $session = null)
     public function clientIp()
     {
         if ($this->trustProxy) {
-
             if ($forwarded = $this->getEnv('HTTP_X_FORWARDED_FOR')) {
-
                 $addresses = array_map('trim', explode(',', $forwarded));
                 $trusted = (count($this->trustedProxies) > 0);
                 $n = count($addresses);
 
                 if ($trusted) {
-
-                    for ($i = 1; $i < $n; $i++)
-                    {
+                    for ($i = 1; $i < $n; $i++) {
                         if (in_array($addresses[$i], $this->trustedProxies) === false) {
-
                             $trusted = false;
                             break;
                         }
                     }
                 }
 
                 return (($trusted) ? $addresses[0] : $addresses[$n - 1]);
-
             } else {
-
                 if ($ip = $this->getEnv('HTTP_X_REAL_IP')) {
-
                     return $ip;
-
                 } elseif ($ip = $this->getEnv('HTTP_CLIENT_IP')) {
-
                     return $ip;
                 }
             }
-        }        
+        }
 
         return $this->getEnv('REMOTE_ADDR');
     }

diff --git a/tests/TestCase/Http/ServerRequestTest.php b/tests/TestCase/Http/ServerRequestTest.php
@@ -741,7 +741,7 @@ public function testClientIp()
 
     /**
      * test clientIp method with trusted proxies
-     * 
+     *
      * @return void
      */
     public function testClientIpWithTrustedProxies()
@@ -753,7 +753,6 @@ public function testClientIpWithTrustedProxies()
             'REMOTE_ADDR' => '192.168.1.4',
         ]]);
 
-
         $request->setTrustedProxies([
             '192.168.1.0',
             '192.168.1.1',
@@ -763,7 +762,8 @@ public function testClientIpWithTrustedProxies()
 
         $this->assertEquals('real.ip', $request->clientIp());
 
-        $request = $request->withEnv('HTTP_X_FORWARDED_FOR', 
+        $request = $request->withEnv(
+            'HTTP_X_FORWARDED_FOR',
             'spoof.fake.ip, real.ip, 192.168.1.0, 192.168.1.2, 192.168.1.3'
         );
         $this->assertEquals('192.168.1.3', $request->clientIp());