refactor: remove deprecations in HTTP

Author: paulbalandan

system/HTTP/CURLRequest.php

@@ -313,7 +313,7 @@ public function setJSON($data)
     protected function parseOptions(array $options)
     {
         if (array_key_exists('baseURI', $options)) {
-            $this->baseURI = $this->baseURI->setURI($options['baseURI']);
+            $this->baseURI = new URI($options['baseURI']);
             unset($options['baseURI']);
         }
 

system/HTTP/Message.php

@@ -60,39 +60,6 @@ public function getBody()
         return $this->body;
     }
 
-    /**
-     * Returns an array containing all headers.
-     *
-     * @return array<string, Header> An array of the request headers
-     *
-     * @deprecated 4.0.5 Use Message::headers() to make room for PSR-7
-     *
-     * @TODO Incompatible return value with PSR-7
-     *
-     * @codeCoverageIgnore
-     */
-    public function getHeaders(): array
-    {
-        return $this->headers();
-    }
-
-    /**
-     * Returns a single header object. If multiple headers with the same
-     * name exist, then will return an array of header objects.
-     *
-     * @return array|Header|null
-     *
-     * @deprecated 4.0.5 Use Message::header() to make room for PSR-7
-     *
-     * @TODO Incompatible return value with PSR-7
-     *
-     * @codeCoverageIgnore
-     */
-    public function getHeader(string $name)
-    {
-        return $this->header($name);
-    }
-
     /**
      * Determines whether a header exists.
      */

system/HTTP/Request.php

@@ -42,22 +42,6 @@ public function __construct($config = null)
         }
     }
 
-    /**
-     * Sets the request method. Used when spoofing the request.
-     *
-     * @return $this
-     *
-     * @deprecated 4.0.5 Use withMethod() instead for immutability
-     *
-     * @codeCoverageIgnore
-     */
-    public function setMethod(string $method)
-    {
-        $this->method = $method;
-
-        return $this;
-    }
-
     /**
      * Returns an instance with the specified method.
      *

system/HTTP/RequestTrait.php

@@ -36,12 +36,8 @@ trait RequestTrait
 
     /**
      * IP address of the current user.
-     *
-     * @var string
-     *
-     * @deprecated 4.0.5 Will become private in a future release
      */
-    protected $ipAddress = '';
+    private string $ipAddress = '';
 
     /**
      * Stores values we've retrieved from PHP globals.
@@ -78,11 +74,11 @@ public function getIPAddress(): string
             );
         }
 
-        $this->ipAddress = $this->getServer('REMOTE_ADDR');
+        $this->ipAddress = $this->getServer('REMOTE_ADDR') ?? '0.0.0.0';
 
-        // If this is a CLI request, $this->ipAddress is null.
-        if ($this->ipAddress === null) {
-            return $this->ipAddress = '0.0.0.0';
+        // If this is a CLI request, $this->ipAddress is '0.0.0.0'.
+        if ($this->ipAddress === '0.0.0.0') {
+            return $this->ipAddress;
         }
 
         // @TODO Extract all this IP address logic to another class.
@@ -206,23 +202,6 @@ public function getServer($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('server', $index, $filter, $flags);
     }
 
-    /**
-     * Fetch an item from the $_ENV array.
-     *
-     * @param array|string|null $index  Index for item to be fetched from $_ENV
-     * @param int|null          $filter A filter name to be applied
-     * @param array|int|null    $flags
-     *
-     * @return mixed
-     *
-     * @deprecated 4.4.4 This method does not work from the beginning. Use `env()`.
-     */
-    public function getEnv($index = null, $filter = null, $flags = null)
-    {
-        // @phpstan-ignore-next-line
-        return $this->fetchGlobal('env', $index, $filter, $flags);
-    }
-
     /**
      * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
      *

system/HTTP/SiteURI.php

@@ -53,26 +53,10 @@ class SiteURI extends URI
      *       1 => 'public',
      *       2 => 'index.php',
      *   ];
-     */
-    private array $baseSegments;
-
-    /**
-     * List of URI segments after indexPage.
-     *
-     * The word "URI Segments" originally means only the URI path part relative
-     * to the baseURL.
-     *
-     * If the URI is "http://localhost:8888/ci431/public/index.php/test?a=b",
-     * and the baseURL is "http://localhost:8888/ci431/public/", then:
-     *   $segments = [
-     *       0 => 'test',
-     *   ];
      *
-     * @var array<int, string>
-     *
-     * @deprecated 4.4.0 This property will be private.
+     * @var list<string>
      */
-    protected $segments;
+    private array $baseSegments;
 
     /**
      * URI path relative to baseURL.
@@ -149,9 +133,9 @@ private function determineBaseURL(
 
         // Update scheme
         if ($scheme !== null && $scheme !== '') {
-            $uri->setScheme($scheme);
+            $uri = $uri->withScheme($scheme);
         } elseif ($configApp->forceGlobalSecureRequests) {
-            $uri->setScheme('https');
+            $uri = $uri->withScheme('https');
         }
 
         // Update host
@@ -219,26 +203,10 @@ private function setBasePath(): void
         }
     }
 
-    /**
-     * @deprecated 4.4.0
-     */
-    public function setBaseURL(string $baseURL): void
-    {
-        throw new BadMethodCallException('Cannot use this method.');
-    }
-
-    /**
-     * @deprecated 4.4.0
-     */
-    public function setURI(?string $uri = null)
-    {
-        throw new BadMethodCallException('Cannot use this method.');
-    }
-
     /**
      * Returns the baseURL.
      *
-     * @interal
+     * @internal
      */
     public function getBaseURL(): string
     {
@@ -298,23 +266,21 @@ private function setRoutePath(string $routePath): void
     }
 
     /**
-     * Converts path to segments
+     * @return list<string>
      */
     private function convertToSegments(string $path): array
     {
         $tempPath = trim($path, '/');
 
-        return ($tempPath === '') ? [] : explode('/', $tempPath);
+        return $tempPath === '' ? [] : explode('/', $tempPath);
     }
 
     /**
      * Sets the path portion of the URI based on segments.
      *
      * @return $this
-     *
-     * @deprecated 4.4.0 This method will be private.
      */
-    public function refreshPath()
+    protected function refreshPath(): self
     {
         $allSegments = array_merge($this->baseSegments, $this->segments);
         $this->path  = '/' . $this->filterPath(implode('/', $allSegments));
@@ -364,11 +330,7 @@ protected function applyParts(array $parts): void
             $this->fragment = $parts['fragment'];
         }
 
-        if (isset($parts['scheme'])) {
-            $this->setScheme(rtrim($parts['scheme'], ':/'));
-        } else {
-            $this->setScheme('http');
-        }
+        $this->scheme = $this->withScheme($parts['scheme'] ?? 'http')->getScheme();
 
         if (isset($parts['port'])) {
             // Valid port numbers are enforced by earlier parse_url or setPort()