fixup! feat: Calendar Import

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>

Author: SebastianKrupinski

apps/dav/lib/Command/ImportCalendar.php

@@ -93,21 +93,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$options = new CalendarImportOptions();
 		$options->setSupersede($supersede);
 		if ($errors !== null) {
-			if (!in_array($errors, CalendarImportOptions::ERROR_OPTIONS, true)) {
-				throw new InvalidArgumentException('Invalid errors option specified');
-			}
 			$options->setErrors($errors);
 		}
 		if ($validation !== null) {
-			if (!in_array($validation, CalendarImportOptions::VALIDATE_OPTIONS, true)) {
-				throw new InvalidArgumentException('Invalid validation option specified');
-			}
 			$options->setValidate($validation);
 		}
-		// evaluate if provided format is supported
-		if (!in_array($format, ImportService::FORMATS, true)) {
-			throw new InvalidArgumentException("Format <$format> is not valid.");
-		}
 		$options->setFormat($format);
 		// evaluate if a valid location was given and is usable otherwise default to stdin
 		$timeStarted = microtime(true);

lib/public/Calendar/CalendarImportOptions.php

@@ -7,6 +7,9 @@
  */
 namespace OCP\Calendar;
 
+use InvalidArgumentException;
+use OCA\DAV\CalDAV\Import\ImportService;
+
 /**
  * Calendar Import Options
  *
@@ -49,8 +52,11 @@ public function getFormat(): string {
 	 *
 	 * @param 'ical'|'jcal'|'xcal' $format
 	 */
-	public function setFormat(string $format): void {
-		$this->format = $format;
+	public function setFormat(string $value): void {
+		if (!in_array($value, ImportService::FORMATS, true)) {
+			throw new InvalidArgumentException("Format <$value> is not valid.");
+		}
+		$this->format = $value;
 	}
 
 	/**
@@ -79,15 +85,15 @@ public function getErrors(): int {
 	/**
 	 * Sets how to handle object errors
 	 *
-	 * @param int $errors 0 - continue, 1 - fail
+	 * @param int $value 0 - continue, 1 - fail
 	 *
-	 * @template $errors of self::ERROR_*
+	 * @template $value of self::ERROR_*
 	 */
-	public function setErrors(int $errors): void {
-		if (!in_array($errors, self::ERROR_OPTIONS, true)) {
-			throw new \InvalidArgumentException("Invalid errors handling type <$errors> specified, only ERROR_CONTINUE or ERROR_FAIL allowed");
+	public function setErrors(int $value): void {
+		if (!in_array($value, CalendarImportOptions::ERROR_OPTIONS, true)) {
+			throw new InvalidArgumentException('Invalid errors option specified');
 		}
-		$this->errors = $errors;
+		$this->errors = $value;
 	}
 
 	/**
@@ -102,15 +108,15 @@ public function getValidate(): int {
 	/**
 	 * Sets how to handle object validation
 	 *
-	 * @param int $validate 0 - no validation, 1 - validate and skip on issue, 2 - validate and fail on issue
+	 * @param int $value 0 - no validation, 1 - validate and skip on issue, 2 - validate and fail on issue
 	 *
-	 * @template $validate of self::VALIDATE_*
+	 * @template $value of self::VALIDATE_*
 	 */
-	public function setValidate(int $validate): void {
-		if (!in_array($validate, self::VALIDATE_OPTIONS, true)) {
-			throw new \InvalidArgumentException("Invalid validation handling type <$validate> specified, only VALIDATE_NONE, VALIDATE_SKIP or VALIDATE_FAIL allowed");
+	public function setValidate(int $value): void {
+		if (!in_array($value, CalendarImportOptions::VALIDATE_OPTIONS, true)) {
+			throw new InvalidArgumentException('Invalid validation option specified');
 		}
-		$this->validate = $validate;
+		$this->validate = $value;
 	}
 
 }