Merge pull request #482 from hydephp/code-cleanup

github-actions · github-actions · commit 33b672924613 · 2022-09-09T13:26:09.000Z
Fix validation bug in rebuild command hydephp/develop@81c7d26
diff --git a/src/Commands/HydeRebuildStaticSiteCommand.php b/src/Commands/HydeRebuildStaticSiteCommand.php
@@ -98,10 +98,10 @@ public function sanitizePathString(string $path): string
     public function validate(): void
     {
         if (! (
-            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getDocumentationPagePath())) ||
-            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath())) ||
             str_starts_with($this->path, Hyde::pathToRelative(Hyde::getBladePagePath())) ||
-            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath()))
+            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPagePath())) ||
+            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath())) ||
+            str_starts_with($this->path, Hyde::pathToRelative(Hyde::getDocumentationPagePath()))
         )) {
             throw new Exception("Path [$this->path] is not in a valid source directory.", 400);
         }

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,10 @@ public function sanitizePathString(string $path): string`
`98`	`98`	`public function validate(): void`
`99`	`99`	`{`
`100`	`100`	`if (! (`
`101`		`- str_starts_with($this->path, Hyde::pathToRelative(Hyde::getDocumentationPagePath())) \|\|`
`102`		`- str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath())) \|\|`
`103`	`101`	`str_starts_with($this->path, Hyde::pathToRelative(Hyde::getBladePagePath())) \|\|`
`104`		`- str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath()))`
	`102`	`+ str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPagePath())) \|\|`
	`103`	`+ str_starts_with($this->path, Hyde::pathToRelative(Hyde::getMarkdownPostPath())) \|\|`
	`104`	`+ str_starts_with($this->path, Hyde::pathToRelative(Hyde::getDocumentationPagePath()))`
`105`	`105`	`)) {`
`106`	`106`	`throw new Exception("Path [$this->path] is not in a valid source directory.", 400);`
`107`	`107`	`}`