fixup! feat: Calendar Import

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

Author: SebastianKrupinski

apps/dav/lib/CalDAV/Import/ImportService.php

@@ -221,7 +221,7 @@ public function importProcess(CalendarImpl $calendar, CalendarImportOptions $opt
 		$calendarId = $calendar->getKey();
 		$principalUri = $calendar->getPrincipalUri();
 		$outcome = [];
-		foreach ($generator($options) as $vObject) {
+		foreach ($generator() as $vObject) {
 			$components = $vObject->getBaseComponents();
 			// determine if the object has no base component types
 			if (count($components) === 0) {

apps/dav/lib/Command/ImportCalendar.php

@@ -46,8 +46,8 @@ protected function configure(): void {
 			->setDescription('Import calendar data to supported calendars from disk or stdin')
 			->addArgument('uid', InputArgument::REQUIRED, 'Id of system user')
 			->addArgument('uri', InputArgument::REQUIRED, 'Uri of calendar')
+			->addArgument('location', InputArgument::OPTIONAL, 'Location of where to write the input. defaults to stdin')
 			->addOption('format', null, InputOption::VALUE_REQUIRED, 'Format of input (ical, jcal, xcal) defaults to ical', 'ical')
-			->addOption('location', null, InputOption::VALUE_REQUIRED, 'Location of where to write the input. defaults to stdin')
 			->addOption('errors', null, InputOption::VALUE_REQUIRED, 'how to handel item errors (0 - continue, 1 - fail)')
 			->addOption('validation', null, InputOption::VALUE_REQUIRED, 'how to handel item validation (0 - no validation, 1 - validate and skip on issue, 2 - validate and fail on issue)')
 			->addOption('supersede', null, InputOption::VALUE_NONE, 'override/replace existing items')
@@ -60,8 +60,8 @@ protected function configure(): void {
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$userId = $input->getArgument('uid');
 		$calendarId = $input->getArgument('uri');
+		$location = $input->getArgument('location');
 		$format = $input->getOption('format');
-		$location = $input->getOption('location');
 		$errors = is_numeric($input->getOption('errors')) ? (int)$input->getOption('errors') : null;
 		$validation = is_numeric($input->getOption('validation')) ? (int)$input->getOption('validation') : null;
 		$supersede = $input->getOption('supersede');

lib/public/Calendar/CalendarImportOptions.php

@@ -55,7 +55,7 @@ public function getFormat(): string {
 	 */
 	public function setFormat(string $value): void {
 		if (!in_array($value, self::FORMATS, true)) {
-			throw new InvalidArgumentException("Format is not valid.");
+			throw new InvalidArgumentException('Format is not valid.');
 		}
 		$this->format = $value;
 	}