create-prisma-php-app 1.11.8 → 1.11.10

package/dist/bootstrap.php

@@ -18,6 +18,7 @@ function determineContentToInclude()
     $scriptUrl = $_SERVER['REQUEST_URI'];
     $scriptUrl = explode('?', $scriptUrl, 2)[0];
     $uri = $_SERVER['SCRIPT_URL'] ?? uriExtractor($scriptUrl);
+    $uri = ltrim($uri, '/');
     $baseDir = APP_PATH;
     $includePath = '';
     $layoutsToInclude = [];
@@ -249,9 +250,12 @@ $childContent = "";
 function containsChildContent($filePath)
 {
     $fileContent = file_get_contents($filePath);
-    $pattern = '/<\?(?:php)?[^?]*\$childContent[^?]*\?>/is';
-
-    if (preg_match($pattern, $fileContent)) {
+    if (
+        (strpos($fileContent, 'echo $childContent') === false &&
+            strpos($fileContent, 'echo $childContent;') === false) &&
+        (strpos($fileContent, '<?= $childContent ?>') === false) &&
+        (strpos($fileContent, '<?= $childContent; ?>') === false)
+    ) {
         return true;
     } else {
         return false;
@@ -261,8 +265,12 @@ function containsChildContent($filePath)
 function containsContent($filePath)
 {
     $fileContent = file_get_contents($filePath);
-    $pattern = '/<\?(?:php\s+)?(?:=|echo|print)\s*\$content\s*;?\s*\?>/i';
-    if (preg_match($pattern, $fileContent)) {
+    if (
+        (strpos($fileContent, 'echo $content') === false &&
+            strpos($fileContent, 'echo $content;') === false) &&
+        (strpos($fileContent, '<?= $content ?>') === false) &&
+        (strpos($fileContent, '<?= $content; ?>') === false)
+    ) {
         return true;
     } else {
         return false;
@@ -299,8 +307,10 @@ try {
     $parentLayoutPath = APP_PATH . '/layout.php';
     $isParentLayout = !empty($layoutsToInclude) && strpos($layoutsToInclude[0], 'src/app/layout.php') !== false;
 
-    if (!containsContent($parentLayoutPath)) {
-        $content .= "<div class='error'>The parent layout file does not contain &lt;?php echo \$content ?&gt; Or &lt;?= \$content ?&gt;<br>" . "<strong>$parentLayoutPath</strong></div>";
+    $isContentIncluded = false;
+    $isChildContentIncluded = false;
+    if (containsContent($parentLayoutPath)) {
+        $isContentIncluded = true;
     }
 
     ob_start();
@@ -311,13 +321,16 @@ try {
             $childContent = ob_get_clean();
         }
         foreach (array_reverse($layoutsToInclude) as $layoutPath) {
-            ob_start();
-            if ($parentLayoutPath === $layoutPath) continue;
+            if ($parentLayoutPath === $layoutPath) {
+                continue;
+            }
+
             if (containsChildContent($layoutPath)) {
-                require_once $layoutPath;
-            } else {
-                $content .= "<div class='error'>The layout file does not contain &lt;?php echo \$childContent ?&gt; Or &lt;?= \$childContent ?&gt<br>" . "<strong>$layoutPath</strong></div>";
+                $isChildContentIncluded = true;
             }
+
+            ob_start();
+            require_once $layoutPath;
             $childContent = ob_get_clean();
         }
     } else {
@@ -332,11 +345,19 @@ try {
         $childContent = ob_get_clean();
     }
 
-    $content .= $childContent;
-
-    ob_start();
-    require_once APP_PATH . '/layout.php';
-    echo ob_get_clean();
+    if (!$isContentIncluded && !$isChildContentIncluded) {
+        $content .= $childContent;
+        ob_start();
+        require_once APP_PATH . '/layout.php';
+    } else {
+        if ($isContentIncluded) {
+            $content .= "<div class='error'>The parent layout file does not contain &lt;?php echo \$content; ?&gt; Or &lt;?= \$content ?&gt;<br>" . "<strong>$parentLayoutPath</strong></div>";
+            modifyOutputLayoutForError($content);
+        } else {
+            $content .= "<div class='error'>The layout file does not contain &lt;?php echo \$childContent; ?&gt; or &lt;?= \$childContent ?&gt;<br><strong>$layoutPath</strong></div>";
+            modifyOutputLayoutForError($content);
+        }
+    }
 } catch (Throwable $e) {
     $content = ob_get_clean();
     $content .=  "<div class='error'>Unhandled Exception: " . htmlspecialchars($e->getMessage(), ENT_QUOTES, 'UTF-8') . "</div>";

package/dist/src/app/index.php

@@ -1,6 +1,6 @@
 <div class="flex flex-col min-h-[100vh]">
     <header class="px-4 lg:px-6 h-14 flex items-center">
-        <a class="flex items-center justify-center" href="#">
+        <a class="flex items-center justify-center" href="/">
             <img class="h-10 w-10" src="<?= $baseUrl ?>assets/images/prisma-php.png" alt="Prisma PHP">
             <span class="sr-only">Prisma PHP</span>
         </a>

package/package.json

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