Merge pull request #61 from getkirby/fix/clean-content-throw-exception

Fix throwing exception in `clean:content` command

commands/clean/content.php

@@ -4,7 +4,7 @@
 
 use Kirby\CLI\CLI;
 
-function clean(
+$cleanContent = function (
 	Generator $collection,
 	array|null $ignore = null,
 	string|null $lang = null
@@ -36,18 +36,14 @@ function clean(
 			$data = array_map(fn ($value) => null, array_flip($fieldsToBeDeleted));
 
 			// try to update the page with the data
-			try {
-				$item->update($data, $lang);
-			} catch (Exception $e) {
-				throw $e->getMessage();
-			}
+			$item->update($data, $lang);
 		}
 	}
-}
+};
 
 return [
 	'description' => 'Deletes all fields from page, file or user content files that are not defined in the blueprint, no matter if they contain content or not.',
-	'command' => static function (CLI $cli): void {
+	'command' => static function (CLI $cli) use ($cleanContent): void {
 
 		$cli->confirmToContinue('This will delete all fields from content files that are not defined in blueprints, no matter if they contain content or not. Are you sure?');
 
@@ -63,17 +59,21 @@ function clean(
 		$ignore = ['uuid', 'title', 'slug', 'template', 'sort', 'focus'];
 
 		// call the script for all languages if multilang
-		if ($kirby->multilang() === true) {
-			$languages = $kirby->languages();
+		try {
+			if ($kirby->multilang() === true) {
+				$languages = $kirby->languages();
+
+				foreach ($languages as $language) {
+					$cleanContent($collection, $ignore, $language->code());
+				}
 
-			foreach ($languages as $language) {
-				clean($collection, $ignore, $language->code());
+			} else {
+				$cleanContent($collection, $ignore);
 			}
 
-		} else {
-			clean($collection, $ignore);
+			$cli->success('The content files have been cleaned');
+		} catch (Exception $e) {
+			$cli->error($e->getMessage());
 		}
-
-		$cli->success('The content files have been cleaned');
 	}
 ];