changed: $page->date renamed to $page->dateTime | Return value \DateT…

…imeImmutable
genug · Dec 23, 2022 · a575e32 · a575e32
1 parent 4e63b46
commit a575e32
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/genug_user/view/index.php b/genug_user/view/index.php
@@ -7,7 +7,7 @@
 </head>
 <body>
     <h1><?= $genug->requestedPage->title ?></h1>
-    <p><time datetime="<?= $genug->requestedPage->date ?>"><?= $genug->requestedPage->date?->format(DATE_RFC1123) ?></time></p>
+    <p><time datetime="<?= $genug->requestedPage->dateTime ?>"><?= $genug->requestedPage->dateTime?->format(DATE_RFC1123) ?></time></p>
     <ul>
         <li>PageGroup: <?= $genug->requestedPage->group; ?></li>
         <?php $currentGroup = $genug->groups->fetchOrNull($genug->requestedPage->group); ?>

diff --git a/src/Lib/ValueObject/DateTimeTrait.php → src/Lib/AbstractDateTime.php b/src/Lib/ValueObject/DateTimeTrait.php → src/Lib/AbstractDateTime.php
@@ -11,37 +11,29 @@
  * License: MIT License
  */
 
-namespace genug\Lib\ValueObject;
+namespace genug\Lib;
 
-use DateTime;
+use DateTimeImmutable;
 use InvalidArgumentException;
-
-use function trim;
+use Stringable;
 
 /**
  *
  * @author David Ringsdorf http://davidringsdorf.de
  * @license MIT License
  */
-trait DateTimeTrait
+abstract class AbstractDateTime extends DateTimeImmutable implements Stringable
 {
-    protected readonly DateTime $dateTime;
-
     public function __construct(string $dateTime)
     {
         if ('' === trim($dateTime)) {
             throw new InvalidArgumentException('`$dateTime` is empty or consists of white space. Use `\'now\'` to use the current date and time.');
         }
-        $this->dateTime = new DateTime($dateTime);
-    }
-
-    public function format(string $format): string
-    {
-        return $this->dateTime->format($format);
+        parent::__construct($dateTime);
     }
 
     public function __toString(): string
     {
-        return $this->dateTime->format('c');
+        return $this->format('c');
     }
 }
diff --git a/src/Page/DateInterface.php → src/Page/AbstractDateTime.php b/src/Page/DateInterface.php → src/Page/AbstractDateTime.php
@@ -13,14 +13,13 @@
 
 namespace genug\Page;
 
-use Stringable;
+use genug\Lib\AbstractDateTime as LibAbstractDateTime;
 
 /**
  *
  * @author David Ringsdorf http://davidringsdorf.de
  * @license MIT License
  */
-interface DateInterface extends Stringable
+abstract class AbstractDateTime extends LibAbstractDateTime
 {
-    public function format(string $format): string;
 }
diff --git a/src/Page/Date.php → src/Page/DateTime.php b/src/Page/Date.php → src/Page/DateTime.php
@@ -18,7 +18,6 @@
  * @author David Ringsdorf http://davidringsdorf.de
  * @license MIT License
  */
-final class Date implements DateInterface
+final class DateTime extends AbstractDateTime
 {
-    use \genug\Lib\ValueObject\DateTimeTrait;
 }
diff --git a/src/Page/Entity.php b/src/Page/Entity.php
@@ -24,7 +24,7 @@ public function __construct(
         public readonly AbstractId $id,
         public readonly ?AbstractGroup $group,
         public readonly ?TitleInterface $title,
-        public readonly ?DateInterface $date,
+        public readonly ?AbstractDateTime $dateTime,
         public readonly ?ContentInterface $content
     ) {
     }

diff --git a/src/Page/Repository.php b/src/Page/Repository.php
@@ -209,22 +209,22 @@ protected function _parseFrontMatterString(string $str): array
             return new Title($fm['title']);
         })();
 
-        $date = (function () use ($_data, $idString, $logger): ?Date {
+        $dateTime = (function () use ($_data, $idString, $logger): ?DateTime {
             $fm = $_data->frontMatter();
             if (! isset($fm['date'])) {
                 $logger->debug(
                     sprintf('No date found for Page "%s"', $idString)
                 );
                 return null;
             }
-            return new Date($fm['date']);
+            return new DateTime($fm['date']);
         })();
 
         $entity = new Entity(
             new Id($idString),
             $group,
             $title,
-            $date,
+            $dateTime,
             new Content($_data->content())
         );