#32676: Mark classes and interfaces as API part 7 - revert changes in RemoteAddress.php

Author: engcom-Foxtrot

lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-declare(strict_types=1);
-
 namespace Magento\Framework\HTTP\PhpEnvironment;
 
 use Magento\Framework\App\RequestInterface;
@@ -104,9 +102,9 @@ function (string $ip) {
                     return !in_array(trim($ip), $this->trustedProxies, true);
                 }
             );
-            $remoteAddress = trim((string) array_pop($ipList));
+            $remoteAddress = trim(array_pop($ipList));
         } else {
-            $remoteAddress = trim((string) reset($ipList));
+            $remoteAddress = trim(reset($ipList));
         }
 
         return $remoteAddress ?: null;
@@ -125,7 +123,7 @@ function (string $ip) {
     public function getRemoteAddress(bool $ipToLong = false)
     {
         if ($this->remoteAddress !== null) {
-            return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;
+            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
         }
 
         $remoteAddress = $this->readAddress();
@@ -144,7 +142,7 @@ public function getRemoteAddress(bool $ipToLong = false)
 
         $this->remoteAddress = $remoteAddress;
 
-        return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }
 
     /**