Merge pull request #7030 from kenjis/fix-request-getIPaddress-cli

fix: Request::getIPaddress() causes error on CLI

Author: kenjis

system/HTTP/RequestTrait.php

@@ -44,7 +44,7 @@ trait RequestTrait
     /**
      * Gets the user's IP address.
      *
-     * @return string IP address if it can be detected, or empty string.
+     * @return string IP address if it can be detected.
      *                If the IP address is not a valid IP address,
      *                then will return '0.0.0.0'.
      */
@@ -73,6 +73,11 @@ public function getIPAddress(): string
 
         $this->ipAddress = $this->getServer('REMOTE_ADDR');
 
+        // If this is a CLI request, $this->ipAddress is null.
+        if ($this->ipAddress === null) {
+            return $this->ipAddress = '0.0.0.0';
+        }
+
         if ($proxyIPs) {
             // @TODO Extract all this IP address logic to another class.
             foreach ($proxyIPs as $proxyIP => $header) {
@@ -151,7 +156,7 @@ public function getIPAddress(): string
             return $this->ipAddress = '0.0.0.0';
         }
 
-        return empty($this->ipAddress) ? '' : $this->ipAddress;
+        return $this->ipAddress;
     }
 
     /**

user_guide_src/source/incoming/request.rst

@@ -22,8 +22,8 @@ Class Reference
 
     .. php:method:: getIPAddress()
 
-        :returns: The user's IP Address, if it can be detected, or null. If the IP address
-                    is not a valid IP address, then will return 0.0.0.0
+        :returns: The user's IP Address, if it can be detected. If the IP address
+                    is not a valid IP address, then will return 0.0.0.0.
         :rtype:   string
 
         Returns the IP address for the current user. If the IP address is not valid, the method