[#16752] - Merge branch '5.0.x' into T16752-create-docker-image-on-release

Author: noone-silent

Diff for: CHANGELOG-5.0.md

@@ -14,6 +14,7 @@
 - Fixed `Phalcon\Mvc\Router` to correctly handle numeric URI parts as it was in v3 [#16741](https://github.com/phalcon/cphalcon/issues/16741)
 - Fixed `Phalcon\Mvc\Model\Binder` to use ReflectionParameter::getType() instead of deprecated method, PHP 8.0 or higher issue. [#16742](https://github.com/phalcon/cphalcon/issues/16742)
 - Fixed `Phalcon\Mvc\Model\Query` to check if cache entry exists. [#16747](https://github.com/phalcon/cphalcon/issues/16747)
+- Fixed `Phalcon\Mvc\Router` to correctly match route when using query string URIs. [#16749](https://github.com/phalcon/cphalcon/issues/16749)
 
 ### Removed
 

Diff for: phalcon/Mvc/Router.zep

@@ -613,33 +613,41 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
      */
     public function getRewriteUri() -> string
     {
-		var url, urlParts, realUri;
+		var url;
 
 		/**
 		 * By default we use $_GET["url"] to obtain the rewrite information
 		 */
 		if (self::URI_SOURCE_GET_URL === this->uriSource) {
 			if fetch url, _GET["_url"] {
 				if !empty url {
-					return url;
+					return this->extractRealUri(url);
 				}
 			}
 		} else {
 			/**
 			 * Otherwise use the standard $_SERVER["REQUEST_URI"]
 			 */
 			if fetch url, _SERVER["REQUEST_URI"] {
-				let urlParts = explode("?", url),
-					realUri  = urlParts[0];
-				if !empty realUri {
-					return realUri;
-				}
+				if !empty url {
+                    return this->extractRealUri(url);
+                }
 			}
 		}
 
 		return "/";
     }
 
+    protected function extractRealUri(string! uri) -> string
+    {
+        var urlParts, realUri;
+
+        let urlParts = explode("?", uri, 2),
+            realUri  = urlParts[0];
+
+        return realUri;
+    }
+
     /**
      * Returns a route object by its id
      *
@@ -727,13 +735,13 @@ class Router extends AbstractInjectionAware implements RouterInterface, EventsAw
             paramsStr, part, parts, paths, pattern, position, realUri,
             regexHostName, request, route, routeFound, strParams, vnamespace;
 
-        let realUri = uri;
-
-		if !realUri {
+		if !uri {
 			/**
 			 * If 'uri' isn't passed as parameter it reads _GET["_url"]
 			 */
 			let realUri = this->getRewriteUri();
+		} else {
+		    let realUri = this->extractRealUri(uri);
 		}
 
         /**

Diff for: tests/_data/fixtures/Mvc/Router.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Phalcon\Tests\Fixtures\Mvc;
+
+class Router extends \Phalcon\Mvc\Router
+{
+    public function protectedExtractRealUri($uri)
+    {
+        return parent::extractRealUri($uri);
+    }
+}

Diff for: tests/integration/Mvc/Router/ExtractRealUriCest.php

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Phalcon\Tests\Integration\Mvc\Router;
+
+use IntegrationTester;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Tests\Fixtures\Mvc\Router;
+
+class ExtractRealUriCest
+{
+    /**
+     * Tests Phalcon\Mvc\Router :: extractRealUri()
+     *
+     * @author       Phalcon Team <[email protected]>
+     * @since        2025-04-11
+     * @issue        16749
+     */
+    public function testExtractRealUri(IntegrationTester $I): void
+    {
+        $router = new Router(false);
+        $router->setDI(new FactoryDefault());
+
+        $realUri = $router->protectedExtractRealUri(
+            '/admin/private/businesses/list/my/123?query=string'
+        );
+        $I->assertSame('/admin/private/businesses/list/my/123', $realUri);
+
+        $realUri = $router->protectedExtractRealUri(
+            '/admin/private/businesses/list/my/123'
+        );
+        $I->assertSame('/admin/private/businesses/list/my/123', $realUri);
+    }
+}