Return null as modification date if the version does not exist

getkirby · May 21, 2024 · bc29672 · bc29672
1 parent 00105f6
commit bc29672
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Content/Version.php b/src/Content/Version.php
@@ -154,8 +154,11 @@ public function model(): ModelWithContent
 	public function modified(
 		string $language = 'default'
 	): int|null {
-		$this->ensure($language);
-		return $this->model->storage()->modified($this->id, $this->language($language));
+		if ($this->exists($language) === true) {
+			return $this->model->storage()->modified($this->id, $this->language($language));
+		}
+
+		return null;
 	}
 
 	/**

diff --git a/tests/Content/VersionTest.php b/tests/Content/VersionTest.php
@@ -369,6 +369,22 @@ public function testModifiedMultiLanguage(): void
 		$this->assertSame($modified, $version->modified('de'));
 	}
 
+	/**
+	 * @covers ::modified
+	 */
+	public function testModifiedMultiLanguageIfNotExists(): void
+	{
+		$this->setUpMultiLanguage();
+
+		$version = new Version(
+			model: $this->model,
+			id: VersionId::published()
+		);
+
+		$this->assertNull($version->modified('en'));
+		$this->assertNull($version->modified('de'));
+	}
+
 	/**
 	 * @covers ::modified
 	 */
@@ -386,6 +402,21 @@ public function testModifiedSingleLanguage(): void
 		$this->assertSame($modified, $version->modified());
 	}
 
+	/**
+	 * @covers ::modified
+	 */
+	public function testModifiedSingleLanguageIfNotExists(): void
+	{
+		$this->setUpSingleLanguage();
+
+		$version = new Version(
+			model: $this->model,
+			id: VersionId::published()
+		);
+
+		$this->assertNull($version->modified());
+	}
+
 	/**
 	 * @covers ::read
 	 */