Merge pull request #810 from hydephp/update-file-extension-getter-to-trim-trailing-periods-from-extension-less-page-types

emmadesilva · web-flow · commit 835fdf04efae · 2023-01-06T11:30:22.000+01:00
Update HydePage::fileExtension() getter to trim trailing periods to support extension-less page types
diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -144,7 +144,7 @@ final public static function outputDirectory(): string
      */
     final public static function fileExtension(): string
     {
-        return '.'.ltrim(static::$fileExtension, '.');
+        return rtrim('.'.ltrim(static::$fileExtension, '.'), '.');
     }
 
     /**
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
@@ -203,6 +203,13 @@ public function test_get_file_extension_forces_leading_period()
         $this->resetDirectoryConfiguration();
     }
 
+    public function test_get_file_extension_removes_trailing_period()
+    {
+        MarkdownPage::$fileExtension = 'foo.';
+        $this->assertEquals('.foo', MarkdownPage::fileExtension());
+        $this->resetDirectoryConfiguration();
+    }
+
     public function test_get_identifier_returns_identifier_property()
     {
         $page = new MarkdownPage('foo');

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ final public static function outputDirectory(): string`
`144`	`144`	`*/`
`145`	`145`	`final public static function fileExtension(): string`
`146`	`146`	`{`
`147`		`- return '.'.ltrim(static::$fileExtension, '.');`
	`147`	`+ return rtrim('.'.ltrim(static::$fileExtension, '.'), '.');`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,13 @@ public function test_get_file_extension_forces_leading_period()`
`203`	`203`	`$this->resetDirectoryConfiguration();`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ public function test_get_file_extension_removes_trailing_period()`
	`207`	`+ {`
	`208`	`+ MarkdownPage::$fileExtension = 'foo.';`
	`209`	`+ $this->assertEquals('.foo', MarkdownPage::fileExtension());`
	`210`	`+ $this->resetDirectoryConfiguration();`
	`211`	`+ }`
	`212`	`+`
`206`	`213`	`public function test_get_identifier_returns_identifier_property()`
`207`	`214`	`{`
`208`	`215`	`$page = new MarkdownPage('foo');`