fixup! feat: Calendar Import

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

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

@@ -23,8 +23,6 @@
  */
 class ImportService {
 
-	public const FORMATS = ['ical', 'jcal', 'xcal'];
-
 	private $source;
 
 	public function __construct(
@@ -68,7 +66,7 @@ public function import($source, CalendarImpl $calendar, CalendarImportOptions $o
 	 *
 	 * @return Generator<\Sabre\VObject\Component\VCalendar>
 	 */
-	private function importText(CalendarImportOptions $options): Generator {
+	private function importText(): Generator {
 		$importer = new TextImporter($this->source);
 		$structure = $importer->structure();
 		$sObjectPrefix = $importer::OBJECT_PREFIX;
@@ -117,7 +115,7 @@ private function importText(CalendarImportOptions $options): Generator {
 	 *
 	 * @return Generator<\Sabre\VObject\Component\VCalendar>
 	 */
-	private function importXml(CalendarImportOptions $options): Generator {
+	private function importXml(): Generator {
 		$importer = new XmlImporter($this->source);
 		$structure = $importer->structure();
 		$sObjectPrefix = $importer::OBJECT_PREFIX;
@@ -159,7 +157,7 @@ private function importXml(CalendarImportOptions $options): Generator {
 	 *
 	 * @return Generator<\Sabre\VObject\Component\VCalendar>
 	 */
-	private function importJson(CalendarImportOptions $options): Generator {
+	private function importJson(): Generator {
 		/** @var VCALENDAR $importer */
 		$importer = Reader::readJson($this->source);
 		// calendar time zones

apps/dav/lib/Command/ImportCalendar.php

@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		}
 		$calendar = $calendars[0];
 		if (!$calendar instanceof CalendarImpl) {
-			throw new InvalidArgumentException("Calendar <$calendarId> dose support this function");
+			throw new InvalidArgumentException("Calendar <$calendarId> doesn't support this function");
 		}
 		if (!$calendar->isWritable()) {
 			throw new InvalidArgumentException("Calendar <$calendarId> is not writeable");

lib/public/Calendar/CalendarImportOptions.php

@@ -17,6 +17,8 @@
  */
 final class CalendarImportOptions {
 
+	public const FORMATS = ['ical', 'jcal', 'xcal'];
+
 	public const VALIDATE_NONE = 0;
 	public const VALIDATE_SKIP = 1;
 	public const VALIDATE_FAIL = 2;
@@ -50,10 +52,10 @@ public function getFormat(): string {
 	/**
 	 * Sets the import format
 	 *
-	 * @param 'ical'|'jcal'|'xcal' $format
+	 * @param 'ical'|'jcal'|'xcal' $value
 	 */
 	public function setFormat(string $value): void {
-		if (!in_array($value, ImportService::FORMATS, true)) {
+		if (!in_array($value, self::FORMATS, true)) {
 			throw new InvalidArgumentException("Format <$value> is not valid.");
 		}
 		$this->format = $value;