Fix page paths on Windows (indirectly resolves #513 #514)

getformwork · Jun 2, 2024 · f56ccae · f56ccae
1 parent e39fe86
commit f56ccae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/formwork/src/Pages/Site.php b/formwork/src/Pages/Site.php
@@ -290,7 +290,7 @@ public function retrievePages(string $path, bool $recursive = false): PageCollec
         $pages = [];
 
         foreach (FileSystem::listDirectories($path) as $dir) {
-            $pagePath = FileSystem::joinPaths($path, $dir, DS);
+            $pagePath = FileSystem::joinPaths($path, $dir, '/');
 
             if ($dir[0] !== '_' && FileSystem::isDirectory($pagePath)) {
                 $page = $this->retrievePage($pagePath);
@@ -330,7 +330,7 @@ public function findPage(string $route): ?Page
             $found = false;
             foreach (FileSystem::listDirectories($path) as $dir) {
                 if (preg_replace(Page::NUM_REGEX, '', $dir) === $component) {
-                    $path .= $dir . '/';
+                    $path .= FileSystem::joinPaths($dir, '/');
                     $found = true;
                     break;
                 }

diff --git a/formwork/src/Panel/Controllers/PagesController.php b/formwork/src/Panel/Controllers/PagesController.php
@@ -519,7 +519,11 @@ protected function createPage(FieldCollection $fieldCollection): Page
 
         $scheme = $this->app->schemes()->get('pages.' . $fieldCollection->get('template')->value());
 
-        $path = $parent->path() . $this->makePageNum($parent, $scheme->options()->get('num')) . '-' . $fieldCollection->get('slug')->value() . '/';
+        $path = FileSystem::joinPaths(
+            (string) $parent->path(),
+            $this->makePageNum($parent, $scheme->options()->get('num')) . '-' . $fieldCollection->get('slug')->value(),
+            '/'
+        );
 
         FileSystem::createDirectory($path, recursive: true);