chore: remove IncomingRequest deprecations (codeigniter4#9851)

* chore: remove IncomingRequest deprecations

* update user guide

Author: michalsn

system/HTTP/IncomingRequest.php

@@ -200,133 +200,6 @@ public function detectLocale($config)
         $this->setLocale($this->negotiate('language', $config->supportedLocales));
     }
 
-    /**
-     * Sets up our URI object based on the information we have. This is
-     * either provided by the user in the baseURL Config setting, or
-     * determined from the environment as needed.
-     *
-     * @return void
-     *
-     * @deprecated 4.4.0 No longer used.
-     */
-    protected function detectURI(string $protocol, string $baseURL)
-    {
-        $this->setPath($this->detectPath($this->config->uriProtocol), $this->config);
-    }
-
-    /**
-     * Detects the relative path based on
-     * the URIProtocol Config setting.
-     *
-     * @deprecated 4.4.0 Moved to SiteURIFactory.
-     */
-    public function detectPath(string $protocol = ''): string
-    {
-        if ($protocol === '') {
-            $protocol = 'REQUEST_URI';
-        }
-
-        $this->path = match ($protocol) {
-            'REQUEST_URI'  => $this->parseRequestURI(),
-            'QUERY_STRING' => $this->parseQueryString(),
-            default        => $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI(),
-        };
-
-        return $this->path;
-    }
-
-    /**
-     * Will parse the REQUEST_URI and automatically detect the URI from it,
-     * fixing the query string if necessary.
-     *
-     * @return string The URI it found.
-     *
-     * @deprecated 4.4.0 Moved to SiteURIFactory.
-     */
-    protected function parseRequestURI(): string
-    {
-        if (! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])) {
-            return '';
-        }
-
-        // parse_url() returns false if no host is present, but the path or query string
-        // contains a colon followed by a number. So we attach a dummy host since
-        // REQUEST_URI does not include the host. This allows us to parse out the query string and path.
-        $parts = parse_url('http://dummy' . $_SERVER['REQUEST_URI']);
-        $query = $parts['query'] ?? '';
-        $uri   = $parts['path'] ?? '';
-
-        // Strip the SCRIPT_NAME path from the URI
-        if (
-            $uri !== '' && isset($_SERVER['SCRIPT_NAME'][0])
-            && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php'
-        ) {
-            // Compare each segment, dropping them until there is no match
-            $segments = $keep = explode('/', $uri);
-
-            foreach (explode('/', $_SERVER['SCRIPT_NAME']) as $i => $segment) {
-                // If these segments are not the same then we're done
-                if (! isset($segments[$i]) || $segment !== $segments[$i]) {
-                    break;
-                }
-
-                array_shift($keep);
-            }
-
-            $uri = implode('/', $keep);
-        }
-
-        // This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
-        // URI is found, and also fixes the QUERY_STRING Server var and $_GET array.
-        if (trim($uri, '/') === '' && str_starts_with($query, '/')) {
-            $query                   = explode('?', $query, 2);
-            $uri                     = $query[0];
-            $_SERVER['QUERY_STRING'] = $query[1] ?? '';
-        } else {
-            $_SERVER['QUERY_STRING'] = $query;
-        }
-
-        // Update our globals for values likely to been have changed
-        parse_str($_SERVER['QUERY_STRING'], $_GET);
-        $this->populateGlobals('server');
-        $this->populateGlobals('get');
-
-        $uri = URI::removeDotSegments($uri);
-
-        return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
-    }
-
-    /**
-     * Parse QUERY_STRING
-     *
-     * Will parse QUERY_STRING and automatically detect the URI from it.
-     *
-     * @deprecated 4.4.0 Moved to SiteURIFactory.
-     */
-    protected function parseQueryString(): string
-    {
-        $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
-
-        if (trim($uri, '/') === '') {
-            return '/';
-        }
-
-        if (str_starts_with($uri, '/')) {
-            $uri                     = explode('?', $uri, 2);
-            $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
-            $uri                     = $uri[0];
-        }
-
-        // Update our globals for values likely to been have changed
-        parse_str($_SERVER['QUERY_STRING'], $_GET);
-        $this->populateGlobals('server');
-        $this->populateGlobals('get');
-
-        $uri = URI::removeDotSegments($uri);
-
-        return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
-    }
-
     /**
      * Provides a convenient way to work with the Negotiate class
      * for content negotiation.
@@ -411,14 +284,11 @@ public function isSecure(): bool
      * instance, this can be used to change the "current URL"
      * for testing.
      *
-     * @param string   $path   URI path relative to baseURL
-     * @param App|null $config Optional alternate config to use
+     * @param string $path URI path relative to baseURL
      *
      * @return $this
-     *
-     * @deprecated 4.4.0 This method will be private. The parameter $config is deprecated. No longer used.
      */
-    public function setPath(string $path, ?App $config = null)
+    private function setPath(string $path)
     {
         $this->path = $path;
 

tests/system/HTTP/IncomingRequestDetectingTest.php

@@ -909,36 +909,6 @@ public function testGetPostIndexNotExists(): void
         $this->assertNull($this->request->getGetPost('gc'));
     }
 
-    /**
-     * @param mixed $path
-     * @param mixed $detectPath
-     */
-    #[DataProvider('provideExtensionPHP')]
-    public function testExtensionPHP($path, $detectPath): void
-    {
-        $config          = new App();
-        $config->baseURL = 'http://example.com/';
-
-        $_SERVER['REQUEST_URI'] = $path;
-        $_SERVER['SCRIPT_NAME'] = $path;
-        $request                = new IncomingRequest($config, new SiteURI($config, $path), null, new UserAgent());
-        $this->assertSame($detectPath, $request->detectPath());
-    }
-
-    public static function provideExtensionPHP(): iterable
-    {
-        return [
-            'not /index.php' => [
-                '/test.php',
-                '/',
-            ],
-            '/index.php' => [
-                '/index.php',
-                '/',
-            ],
-        ];
-    }
-
     public function testGetPath(): void
     {
         $request = $this->createRequest(null, null, 'fruits/banana');
@@ -952,7 +922,8 @@ public function testSetPath(): void
         $request = new IncomingRequest($config, new SiteURI($config), null, new UserAgent());
         $this->assertSame('', $request->getPath());
 
-        $request->setPath('foobar');
+        $setPath = $this->getPrivateMethodInvoker($request, 'setPath');
+        $setPath('foobar');
         $this->assertSame('foobar', $request->getPath());
     }