Merge pull request #16 from 8fold/fix-title

joshbruce · web-flow · commit 381b78274b56 · 2023-04-21T19:34:17.000-04:00
fix: Page title passed directly to Document
diff --git a/src/Document.php b/src/Document.php
@@ -20,15 +20,15 @@ class Document implements Stringable
     private array $body = [];
 
     public static function create(
-        string $title,
+        string|Stringable $title,
         string $lang = 'en',
         string $charset = 'utf-8'
     ): Document {
         return new static($title, $lang, $charset);
     }
 
     final private function __construct(
-        private string $title,
+        private string|Stringable $title,
         private string $lang,
         private string $charset
     ) {
@@ -48,10 +48,18 @@ public function body(string|Stringable ...$content): Document
 
     public function __toString(): string
     {
+        $pageTitle = $this->title();
+        if (
+            is_string($pageTitle) and
+            str_starts_with($pageTitle, '<title>') === false
+        ) {
+            $pageTitle = Element::title($this->title());
+        }
+
         $doctype = '<!doctype html>' . "\n";
         $html = (string) Element::html(
             Element::head(
-                Element::title($this->title()),
+                $pageTitle,
                 Element::meta()->omitEndTag()->props($this->charset()),
                 ...$this->headContent()
             ),
@@ -60,7 +68,7 @@ public function __toString(): string
         return $doctype . $html;
     }
 
-    private function title(): string
+    private function title(): string|Stringable
     {
         return $this->title;
     }
diff --git a/tests/DocumentBaselineTest.php b/tests/DocumentBaselineTest.php
@@ -9,8 +9,30 @@
 
 use Eightfold\HTMLBuilder\Element;
 
+use Eightfold\HTMLBuilder\Components\PageTitle;
+
 class DocumentBaselineTest extends TestCase
 {
+    /**
+     * @test
+     */
+    public function can_use_page_title(): void // phpcs:ignore
+    {
+        $expected = <<<html
+        <!doctype html>
+        <html lang="en"><head><title>Second | First</title><meta charset="utf-8"></head><body></body></html>
+        html;
+
+        $result = (string) Document::create(
+            PageTitle::create(['Second', 'First'])
+        );
+
+        $this->assertSame(
+            $expected,
+            $result
+        );
+    }
+
     /**
      * @test
      */
diff --git a/tests/Forms/SelectTest.php b/tests/Forms/SelectTest.php
@@ -5,11 +5,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-// use Eightfold\HTMLBuilder\Tests\Extensions\ElementExtension;
-
-// use Eightfold\XMLBuilder\Comment;
-
-// use Eightfold\HTMLBuilder\Document;
 use Eightfold\HTMLBuilder\Forms\Select;
 
 class SelectTest extends TestCase
