Throw exception in Translations::findByKey if the language does not e…

…xist
getkirby · Jun 21, 2024 · 78b12f5 · 78b12f5
1 parent 1cfb2e5
commit 78b12f5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/Content/Translations.php b/src/Content/Translations.php
@@ -6,7 +6,6 @@
 use Kirby\Cms\Language;
 use Kirby\Cms\Languages;
 use Kirby\Cms\ModelWithContent;
-use Kirby\Exception\NotFoundException;
 
 /**
  * @package   Kirby Content
@@ -52,11 +51,7 @@ public static function create(
 	 */
 	public function findByKey(string $key): Translation|null
 	{
-		try {
-			return parent::get(Language::ensure($key)->code());
-		} catch (NotFoundException) {
-			return null;
-		}
+		return parent::get(Language::ensure($key)->code());
 	}
 
 	/**

diff --git a/tests/Content/TranslationsTest.php b/tests/Content/TranslationsTest.php
@@ -2,6 +2,8 @@
 
 namespace Kirby\Content;
 
+use Kirby\Exception\NotFoundException;
+
 /**
  * @coversDefaultClass \Kirby\Content\Translations
  * @covers ::__construct
@@ -87,7 +89,6 @@ public function testFindByKeyMultiLanguage()
 		$this->assertSame('en', $translations->findByKey('default')->language()->code());
 		$this->assertSame('en', $translations->findByKey('current')->language()->code());
 		$this->assertSame('de', $translations->findByKey('de')->language()->code());
-		$this->assertNull($translations->findByKey('fr'));
 	}
 
 	/**
@@ -107,6 +108,24 @@ public function testFindByKeySingleLanguage()
 		$this->assertSame('en', $translations->findByKey('current')->language()->code());
 	}
 
+	/**
+	 * @covers ::findByKey
+	 */
+	public function testFindByKeyWithInvalidLanguage()
+	{
+		$this->setUpMultiLanguage();
+
+		$translations = Translations::load(
+			model: $this->model,
+			version: $this->model->version()
+		);
+
+		$this->expectException(NotFoundException::class);
+		$this->expectExceptionMessage('Invalid language: fr');
+
+		$translations->findByKey('fr');
+	}
+
 	/**
 	 * @covers ::load
 	 */