fix: allow null in archive timestamp

helsingborg-stad · Feb 6, 2025 · c4a4b8b · c4a4b8b
1 parent 74c5e9b
commit c4a4b8b
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 17 deletions.
diff --git a/library/PostObject/Date/CachedTimestampResolver.php b/library/PostObject/Date/CachedTimestampResolver.php
@@ -28,7 +28,7 @@ public function __construct(
      *
      * @return int
      */
-    public function resolve(): int
+    public function resolve(): ?int
     {
         $cacheKey = "{$this->postObject->getBlogId()}_{$this->postObject->getId()}";
 

diff --git a/library/PostObject/Date/TimestampResolver.php b/library/PostObject/Date/TimestampResolver.php
@@ -31,29 +31,33 @@ public function __construct(
      *
      * @return int
      */
-    public function resolve(): int
+    public function resolve(): ?int
     {
         $archiveDateSetting = $this->archiveDateSetting->resolve();
 
         if (in_array($archiveDateSetting, $this->defaultTimestamps)) {
             return $this->getDefaultTimestamp($archiveDateSetting);
         }
 
+        if ($archiveDateSetting === 'none') {
+            return null;
+        }
+
         return $this->getDateMetaValue($archiveDateSetting);
     }
 
     /**
      * Get the date meta value.
      */
-    private function getDateMetaValue(string $archiveDateSetting): int
+    private function getDateMetaValue(string $archiveDateSetting): ?int
     {
         $metaValue = $this->wpService->getPostMeta($this->postObject->getId(), $archiveDateSetting, true);
 
         if ($metaValue) {
             return strtotime($metaValue);
         }
 
-        return 0;
+        return null;
     }
 
     /**

diff --git a/library/PostObject/Date/TimestampResolverInterface.php b/library/PostObject/Date/TimestampResolverInterface.php
@@ -9,5 +9,5 @@ interface TimestampResolverInterface
      *
      * @return int
      */
-    public function resolve(): int;
+    public function resolve(): ?int;
 }
diff --git a/library/PostObject/Decorators/BackwardsCompatiblePostObject.php b/library/PostObject/Decorators/BackwardsCompatiblePostObject.php
@@ -135,7 +135,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/Decorators/IconResolvingPostObject.php b/library/PostObject/Decorators/IconResolvingPostObject.php
@@ -93,7 +93,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/Decorators/PostObjectArchiveDateFormat.php b/library/PostObject/Decorators/PostObjectArchiveDateFormat.php
@@ -103,7 +103,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/Decorators/PostObjectArchiveDateTimestamp.php b/library/PostObject/Decorators/PostObjectArchiveDateTimestamp.php
@@ -103,7 +103,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->timestampResolver->resolve();
     }

diff --git a/library/PostObject/Decorators/PostObjectFromOtherBlog.php b/library/PostObject/Decorators/PostObjectFromOtherBlog.php
@@ -126,7 +126,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/Decorators/PostObjectFromWpPost.php b/library/PostObject/Decorators/PostObjectFromWpPost.php
@@ -98,7 +98,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/Decorators/PostObjectWithSeoRedirect.php b/library/PostObject/Decorators/PostObjectWithSeoRedirect.php
@@ -107,7 +107,7 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
         return $this->postObject->getArchiveDateTimestamp();
     }

diff --git a/library/PostObject/PostObject.php b/library/PostObject/PostObject.php
@@ -93,9 +93,9 @@ public function getModifiedTime(bool $gmt = false): int
     /**
      * @inheritDoc
      */
-    public function getArchiveDateTimestamp(): int
+    public function getArchiveDateTimestamp(): ?int
     {
-        return 0;
+        return null;
     }
 
     /**

diff --git a/library/PostObject/PostObject.test.php b/library/PostObject/PostObject.test.php
@@ -79,9 +79,9 @@ public function testGetBlogIdReturns1()
     /**
      * @testdox getArchiveDateTimestamp() returns 0
      */
-    public function testGetArchiveDateTimestampReturns0()
+    public function testGetArchiveDateTimestampReturnsNull()
     {
-        $this->assertEquals(0, $this->instance->getArchiveDateTimestamp());
+        $this->assertEquals(null, $this->instance->getArchiveDateTimestamp());
     }
 
     /**

diff --git a/library/PostObject/PostObjectInterface.php b/library/PostObject/PostObjectInterface.php
@@ -78,7 +78,7 @@ public function getModifiedTime(bool $gmt = false): int;
      *
      * @return int
      */
-    public function getArchiveDateTimestamp(): int;
+    public function getArchiveDateTimestamp(): ?int;
 
     /**
      * Get the post object date format.