Remove unnecessary logic in storage handler exists method

getkirby · May 21, 2024 · b26d23e · b26d23e
1 parent 8c18e60
commit b26d23e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 65 deletions.
diff --git a/src/Content/ContentStorage.php b/src/Content/ContentStorage.php
@@ -156,18 +156,13 @@ public function dynamicVersions(): array
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string|null $lang Code `'default'` in a single-lang installation
 	 */
 	public function exists(
 		VersionId $versionId,
-		string|null $lang
+		string $lang
 	): bool {
-		if ($lang !== null) {
-			$lang = $this->language($lang);
-		}
-
-		return $this->handler->exists($versionId, $lang);
+		return $this->handler->exists($versionId, $this->language($lang));
 	}
 
 	/**

diff --git a/src/Content/ContentStorageHandler.php b/src/Content/ContentStorageHandler.php
@@ -40,10 +40,9 @@ public function delete(VersionId $versionId, string $lang): void;
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string $lang Code `'default'` in a single-lang installation
 	 */
-	public function exists(VersionId $versionId, string|null $lang): bool;
+	public function exists(VersionId $versionId, string $lang): bool;
 
 	/**
 	 * Returns the modification timestamp of a version if it exists

diff --git a/src/Content/PlainTextContentStorageHandler.php b/src/Content/PlainTextContentStorageHandler.php
@@ -205,21 +205,10 @@ public function delete(VersionId $versionId, string $lang): void
 	/**
 	 * Checks if a version exists
 	 *
-	 * @param string|null $lang Code `'default'` in a single-lang installation;
-	 *                          checks for "any language" if not provided
+	 * @param string|null $lang Code `'default'` in a single-lang installation
 	 */
-	public function exists(VersionId $versionId, string|null $lang): bool
+	public function exists(VersionId $versionId, string $lang): bool
 	{
-		if ($lang === null) {
-			foreach ($this->contentFiles($versionId) as $file) {
-				if (is_file($file) === true) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
 		return is_file($this->contentFile($versionId, $lang)) === true;
 	}
 

diff --git a/tests/Content/PlainTextContentStorageHandlerTest.php b/tests/Content/PlainTextContentStorageHandlerTest.php
@@ -169,56 +169,16 @@ public function testDeletePublishedSingleLang()
 	 * @covers ::exists
 	 * @dataProvider existsProvider
 	 */
-	public function testExistsNoneExisting(VersionId $id, string|null $language)
+	public function testExistsNoneExisting(VersionId $id, string $language)
 	{
 		$this->assertFalse($this->storage->exists($id, $language));
 	}
 
-	/**
-	 * @covers ::exists
-	 * @dataProvider existsProvider
-	 */
-	public function testExistsSomeExistingMultiLang(VersionId $id, string|null $language, array $expected)
-	{
-		Dir::make(static::TMP . '/_changes');
-		touch(static::TMP . '/article.txt');
-		touch(static::TMP . '/_changes/article.en.txt');
-
-		new App([
-			'languages' => [
-				[
-					'code' => 'en',
-					'default' => true
-				],
-				[
-					'code' => 'de'
-				]
-			]
-		]);
-
-		$this->assertSame($expected[0], $this->storage->exists($id, $language));
-	}
-
-	/**
-	 * @covers ::exists
-	 * @dataProvider existsProvider
-	 */
-	public function testExistsSomeExistingSingleLang(VersionId $id, string|null $language, array $expected)
-	{
-		Dir::make(static::TMP . '/_changes');
-		touch(static::TMP . '/article.txt');
-		touch(static::TMP . '/_changes/article.en.txt');
-
-		$this->assertSame($expected[1], $this->storage->exists($id, $language));
-	}
-
 	public static function existsProvider(): array
 	{
 		return [
-			[VersionId::changes(), null, [true, false]],
 			[VersionId::changes(), 'default', [false, false]],
 			[VersionId::changes(), 'en', [true, true]],
-			[VersionId::published(), null, [false, true]],
 			[VersionId::published(), 'default', [true, true]],
 			[VersionId::published(), 'en', [false, false]]
 		];