#32676: Mark classes and interfaces as API part 7 - ip2long param type fix.

engcom-Foxtrot · web-flow · commit 74d33deba1b0 · 2021-04-15T16:38:54.000+03:00
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -125,7 +125,7 @@ function (string $ip) {
     public function getRemoteAddress(bool $ipToLong = false)
     {
         if ($this->remoteAddress !== null) {
-            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+            return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;
         }
 
         $remoteAddress = $this->readAddress();
@@ -144,7 +144,7 @@ public function getRemoteAddress(bool $ipToLong = false)
 
         $this->remoteAddress = $remoteAddress;
 
-        return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
+        return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ function (string $ip) {`
`125`	`125`	`public function getRemoteAddress(bool $ipToLong = false)`
`126`	`126`	`{`
`127`	`127`	`if ($this->remoteAddress !== null) {`
`128`		`- return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;`
	`128`	`+ return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`$remoteAddress = $this->readAddress();`
`@@ -144,7 +144,7 @@ public function getRemoteAddress(bool $ipToLong = false)`
`144`	`144`
`145`	`145`	`$this->remoteAddress = $remoteAddress;`
`146`	`146`
`147`		`- return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;`
	`147`	`+ return $ipToLong && $this->remoteAddress ? ip2long($this->remoteAddress) : $this->remoteAddress;`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`