test fix

korovitskyi · korovitskyi · commit 1691f0d8d222 · 2021-04-10T11:47:25.000+03:00
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -104,9 +104,9 @@ function (string $ip) {
                     return !in_array(trim($ip), $this->trustedProxies, true);
                 }
             );
-            $remoteAddress = trim(array_pop($ipList));
+            $remoteAddress = trim((string) array_pop($ipList));
         } else {
-            $remoteAddress = trim(reset($ipList));
+            $remoteAddress = trim((string) reset($ipList));
         }
 
         return $remoteAddress ?: null;

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,9 @@ function (string $ip) {`
`104`	`104`	`return !in_array(trim($ip), $this->trustedProxies, true);`
`105`	`105`	`}`
`106`	`106`	`);`
`107`		`- $remoteAddress = trim(array_pop($ipList));`
	`107`	`+ $remoteAddress = trim((string) array_pop($ipList));`
`108`	`108`	`} else {`
`109`		`- $remoteAddress = trim(reset($ipList));`
	`109`	`+ $remoteAddress = trim((string) reset($ipList));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`return $remoteAddress ?: null;`