Merge pull request #906 from hydephp/move-project-configuration-prope…

…rties-to-the-hyde-kernel Move internal data store for the site output directory to the HydeKernel
hydephp · Feb 1, 2023 · e2c2492 · e2c2492
2 parents fbcf709 + 96c5b5d
commit e2c2492
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/packages/framework/src/Facades/Site.php b/packages/framework/src/Facades/Site.php
@@ -6,7 +6,6 @@
 
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 use Hyde\Hyde;
-use function unslash;
 
 /**
  * Object representation for the HydePHP site and its configuration.
@@ -15,8 +14,6 @@
  */
 final class Site
 {
-    protected static string $outputPath = '_site';
-
     public static function url(): ?string
     {
         return config('site.url');
@@ -39,11 +36,11 @@ public static function metadata(): GlobalMetadataBag
 
     public static function getOutputPath(): string
     {
-        return self::$outputPath;
+        return Hyde::kernel()->getOutputPath();
     }
 
     public static function setOutputPath(string $outputPath): void
     {
-        self::$outputPath = unslash(Hyde::pathToRelative($outputPath));
+        Hyde::kernel()->setOutputPath($outputPath);
     }
 }
diff --git a/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php b/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
@@ -49,6 +49,16 @@ public function setSourceRoot(string $sourceRoot): void
         $this->sourceRoot = rtrim($sourceRoot, '/\\');
     }
 
+    public function getOutputPath(): string
+    {
+        return $this->outputPath;
+    }
+
+    public function setOutputPath(string $outputPath): void
+    {
+        $this->outputPath = rtrim($outputPath, '/\\');
+    }
+
     /**
      * Developer Information.
      *

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
@@ -48,6 +48,7 @@ class HydeKernel implements SerializableContract
 
     protected string $basePath;
     protected string $sourceRoot = '';
+    protected string $outputPath = '_site';
 
     protected Filesystem $filesystem;
     protected Hyperlinks $hyperlinks;

diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -308,6 +308,17 @@ public function test_can_set_source_root()
         $this->assertSame('foo', Hyde::getSourceRoot());
     }
 
+    public function test_can_get_output_path()
+    {
+        $this->assertSame('_site', Hyde::getOutputPath());
+    }
+
+    public function test_can_set_output_path()
+    {
+        Hyde::setOutputPath('foo');
+        $this->assertSame('foo', Hyde::getOutputPath());
+    }
+
     public function test_can_access_kernel_fluently_using_the_facade()
     {
         $this->assertInstanceOf(HydeKernel::class, Hyde::kernel());

diff --git a/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php
@@ -71,19 +71,9 @@ public function test_site_output_directory_can_be_changed_in_configuration()
         File::deleteDirectory(Hyde::path('_site/build'));
     }
 
-    public function test_site_output_directory_path_is_normalized_to_be_relative()
-    {
-        Site::setOutputPath(Hyde::path('_site'));
-        $this->assertEquals('_site', Site::getOutputPath());
-
-        Site::setOutputPath('_site');
-    }
-
     public function test_site_output_directory_path_is_normalized_to_trim_trailing_slashes()
     {
         Site::setOutputPath('foo/bar/');
         $this->assertEquals('foo/bar', Site::getOutputPath());
-
-        Site::setOutputPath('_site');
     }
 }