create-prisma-php-app 2.0.0-beta.13 → 2.0.0-beta.14

package/dist/bootstrap.php

@@ -64,7 +64,7 @@ final class Bootstrap
 
         Request::$pathname = $contentInfo['pathname'] ? '/' . $contentInfo['pathname'] : '/';
         Request::$uri = $contentInfo['uri'] ? $contentInfo['uri'] : '/';
-        Request::$decodedUri = urldecode(Request::$uri);
+        Request::$decodedUri = Request::getDecodedUrl(Request::$uri);
 
         if (is_file(self::$contentToInclude)) {
             Request::$fileToInclude = basename(self::$contentToInclude);
@@ -675,7 +675,7 @@ final class Bootstrap
             }
         }
 
-        $currentUrl = urldecode(Request::$uri);
+        $currentUrl = Request::getDecodedUrl(Request::$uri);
 
         if (isset($currentData[$currentUrl])) {
             $currentData[$currentUrl]['includedFiles'] = array_values(array_unique(
@@ -687,7 +687,7 @@ final class Bootstrap
             }
         } else {
             $currentData[$currentUrl] = [
-                'url'         => $currentUrl,
+                'url'         => Request::$uri,
                 'fileName'    => self::convertUrlToFileName($currentUrl),
                 'isCacheable' => CacheHandler::$isCacheable,
                 'cacheTtl' => CacheHandler::$ttl,
@@ -707,7 +707,7 @@ final class Bootstrap
     {
         $url = trim($url, '/');
         $fileName = preg_replace('/[^a-zA-Z0-9-_]/', '_', $url);
-        return $fileName ?: 'index';
+        return $fileName ? mb_strtolower($fileName, 'UTF-8') : 'index';
     }
 
     private static function authenticateUserToken(): void

package/dist/src/Lib/Request.php

@@ -457,4 +457,16 @@ class Request
 
         exit;
     }
+
+    public static function getDecodedUrl(string $uri): string
+    {
+        $parsedUrl = parse_url($uri);
+
+        $queryString = isset($parsedUrl['query']) ? '?' . urldecode($parsedUrl['query']) : '';
+        $path = $parsedUrl['path'] ?? '';
+
+        $decodedUrl = urldecode($path . $queryString);
+
+        return $decodedUrl;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",