wip

api.php

@@ -7242,8 +7242,15 @@ class RequestFactory
         $psr17Factory = new Psr17Factory();
         $creator = new ServerRequestCreator($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
         $serverRequest = $creator->fromGlobals();
+        $uri = '';
         if (isset($_SERVER['PATH_INFO'])) {
-            $serverRequest = $serverRequest->withUri($psr17Factory->createUri($_SERVER['PATH_INFO'] . '?' . $_SERVER['QUERY_STRING']));
+            $uri .= $_SERVER['PATH_INFO'];
+        }
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $uri .= '?' . $_SERVER['QUERY_STRING'];
+        }
+        if ($uri) {
+            $serverRequest = $serverRequest->withUri($psr17Factory->createUri($uri));
         }
         $body = file_get_contents('php://input');
         if ($body) {

src/Tqdev/PhpCrudApi/RequestFactory.php

@@ -34,8 +34,15 @@ class RequestFactory
         $psr17Factory = new Psr17Factory();
         $creator = new ServerRequestCreator($psr17Factory, $psr17Factory, $psr17Factory, $psr17Factory);
         $serverRequest = $creator->fromGlobals();
+        $uri = '';
         if (isset($_SERVER['PATH_INFO'])) {
-            $serverRequest = $serverRequest->withUri($psr17Factory->createUri($_SERVER['PATH_INFO'] . '?' . $_SERVER['QUERY_STRING']));
+            $uri .= $_SERVER['PATH_INFO'];
+        }
+        if (isset($_SERVER['QUERY_STRING'])) {
+            $uri .= '?' . $_SERVER['QUERY_STRING'];
+        }
+        if ($uri) {
+            $serverRequest = $serverRequest->withUri($psr17Factory->createUri($uri));
         }
         $body = file_get_contents('php://input');
         if ($body) {