create-prisma-php-app 1.22.506 → 1.22.507

package/dist/bootstrap.php

@@ -188,29 +188,37 @@ function dynamicRoute($uri)
     $normalizedUri = ltrim(str_replace('\\', '/', $uri), './');
     $normalizedUriEdited = "src/app/$normalizedUri";
     $uriSegments = explode('/', $normalizedUriEdited);
+
     foreach ($_filesListRoutes as $route) {
         $normalizedRoute = trim(str_replace('\\', '/', $route), '.');
+
+        // Skip non-.php files to improve performance
+        if (pathinfo($normalizedRoute, PATHINFO_EXTENSION) !== 'php') {
+            continue;
+        }
+
         $routeSegments = explode('/', ltrim($normalizedRoute, '/'));
 
         $filteredRouteSegments = array_values(array_filter($routeSegments, function ($segment) {
             return !preg_match('/\(.+\)/', $segment); // Skip segments with parentheses (groups)
         }));
 
-        $singleDynamic = preg_match_all('/\[[^\]]+\]/', $normalizedRoute, $matches) === 1 && !strpos($normalizedRoute, '[...');
+        $singleDynamic = preg_match_all('/\[[^\]]+\]/', $normalizedRoute, $matches) === 1 && strpos($normalizedRoute, '[...') === false;
+
         if ($singleDynamic) {
             $segmentMatch = singleDynamicRoute($uriSegments, $filteredRouteSegments);
             $index = array_search($segmentMatch, $filteredRouteSegments);
+
             if ($index !== false && isset($uriSegments[$index])) {
                 $trimSegmentMatch = trim($segmentMatch, '[]');
                 $dynamicRouteParams = new \ArrayObject([$trimSegmentMatch => $uriSegments[$index]], \ArrayObject::ARRAY_AS_PROPS);
+
                 $dynamicRouteUri = str_replace($segmentMatch, $uriSegments[$index], $normalizedRoute);
                 $dynamicRouteUri = preg_replace('/\(.+\)/', '', $dynamicRouteUri);
                 $dynamicRouteUri = preg_replace('/\/+/', '/', $dynamicRouteUri);
-                $dynamicRouteUriDirname = dirname($dynamicRouteUri);
-                $dynamicRouteUriDirname = rtrim($dynamicRouteUriDirname, '/');
+                $dynamicRouteUriDirname = rtrim(dirname($dynamicRouteUri), '/');
 
-                $expectedUri = '/src/app/' . $normalizedUri;
-                $expectedUri = rtrim($expectedUri, '/');
+                $expectedUri = rtrim('/src/app/' . $normalizedUri, '/');
 
                 if (strpos($normalizedRoute, 'route.php') !== false || strpos($normalizedRoute, 'index.php') !== false) {
                     if ($expectedUri === $dynamicRouteUriDirname) {
@@ -221,9 +229,9 @@ function dynamicRoute($uri)
             }
         } elseif (strpos($normalizedRoute, '[...') !== false) {
             // Clean and normalize the route
-            $cleanedNormalizedRoute = preg_replace('/\(.+\)/', '', $normalizedRoute); // Remove any public/private segment
-            $cleanedNormalizedRoute = preg_replace('/\/+/', '/', $cleanedNormalizedRoute); // Replace multiple slashes
-            $dynamicSegmentRoute = preg_replace('/\[\.\.\..*?\].*/', '', $cleanedNormalizedRoute); // Remove the dynamic segment
+            $cleanedNormalizedRoute = preg_replace('/\(.+\)/', '', $normalizedRoute);
+            $cleanedNormalizedRoute = preg_replace('/\/+/', '/', $cleanedNormalizedRoute);
+            $dynamicSegmentRoute = preg_replace('/\[\.\.\..*?\].*/', '', $cleanedNormalizedRoute);
 
             // Check if the normalized URI starts with the cleaned route
             if (strpos("/src/app/$normalizedUri", $dynamicSegmentRoute) === 0) {
@@ -364,7 +372,6 @@ function checkForDuplicateRoutes()
     }
 }
 
-
 function containsChildContent($filePath)
 {
     $fileContent = file_get_contents($filePath);
@@ -515,6 +522,7 @@ function getLoadingsFiles()
     $haveLoadingFileContent = array_reduce($loadingFiles, function ($carry, $route) use ($uri, $pathname, $dynamicRouteParams, $params, $referer) {
         $normalizeUri = str_replace('\\', '/', $route);
         $fileUrl = str_replace('./src/app', '', $normalizeUri);
+        $route = str_replace(['\\', './'], ['/', ''], $route);
 
         ob_start();
         include($route); // This will execute the PHP code in loading.php
@@ -535,8 +543,6 @@ function getLoadingsFiles()
     return '';
 }
 
-
-
 function getPrismaSettings(): \ArrayObject
 {
     $_prismaPHPSettingsFile = DOCUMENT_PATH . '/prisma-php.json';
@@ -593,6 +599,8 @@ function modifyOutputLayoutForError($contentToAdd)
         } else {
             echo $errorContent;
         }
+    } else {
+        echo $contentToAdd;
     }
     exit;
 }
@@ -628,12 +636,13 @@ register_shutdown_function(function () {
     }
 });
 
+$_prismaPHPSettings = getPrismaSettings();
+$_filesListRoutes = getFilesListRoutes();
+
 require_once SETTINGS_PATH . '/public-functions.php';
 require_once SETTINGS_PATH . '/request-methods.php';
 $_metadataFile = APP_PATH . '/metadata.php';
 $_metadataArray = file_exists($_metadataFile) ? require_once $_metadataFile : [];
-$_filesListRoutes = getFilesListRoutes();
-$_prismaPHPSettings = getPrismaSettings();
 $_fileToInclude = '';
 
 function authenticateUserToken()
@@ -683,7 +692,6 @@ $mainLayoutFooter = [];
 
 try {
     $_determineContentToInclude = determineContentToInclude();
-    checkForDuplicateRoutes();
     $_contentToInclude = $_determineContentToInclude['path'] ?? '';
     $_layoutsToInclude = $_determineContentToInclude['layouts'] ?? [];
     $uri = $_determineContentToInclude['uri'] ?? '';
@@ -692,6 +700,9 @@ try {
     if (is_file($_contentToInclude)) {
         $_fileToInclude = basename($_contentToInclude); // returns the file name
     }
+    $metadata = $_metadataArray[$uri] ?? ($_metadataArray['default'] ?? []);
+
+    checkForDuplicateRoutes();
     authenticateUserToken();
 
     if (empty($_contentToInclude)) {
@@ -739,7 +750,6 @@ try {
         exit;
     }
 
-    $metadata = $_metadataArray[$uri] ?? ($_metadataArray['default'] ?? []);
     $_parentLayoutPath = APP_PATH . '/layout.php';
     $_isParentLayout = !empty($_layoutsToInclude) && strpos($_layoutsToInclude[0], 'src/app/layout.php') !== false;
 
@@ -797,7 +807,8 @@ try {
         if ($_isContentIncluded) {
             echo "<div class='error'>The parent layout file does not contain &lt;?php echo \$content; ?&gt; Or &lt;?= \$content ?&gt;<br>" . "<strong>$_parentLayoutPath</strong></div>";
         } else {
-            echo "<div class='error'>The layout file does not contain &lt;?php echo \$childContent; ?&gt; or &lt;?= \$childContent ?&gt;<br><strong>$layoutPath</strong></div>";
+            $errorDetails = "<div class='error'>The layout file does not contain &lt;?php echo \$childContent; ?&gt; or &lt;?= \$childContent ?&gt;<br><strong>$layoutPath</strong></div>";
+            modifyOutputLayoutForError($errorDetails);
         }
     }
 } catch (Throwable $e) {

package/dist/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3.8"
 services:
   web:
     build: