Skip to content

Commit cc65e07

Browse files
hmtbackportbot[bot]
authored andcommitted
Calendar: Fix typos in import/export
1 parent 89d769f commit cc65e07

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

apps/dav/lib/Command/ExportCalendar.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ protected function configure(): void {
4343
$this->setName('calendar:export')
4444
->setDescription('Export calendar data from supported calendars to disk or stdout')
4545
->addArgument('uid', InputArgument::REQUIRED, 'Id of system user')
46-
->addArgument('uri', InputArgument::REQUIRED, 'Uri of calendar')
46+
->addArgument('uri', InputArgument::REQUIRED, 'URI of calendar')
4747
->addOption('format', null, InputOption::VALUE_REQUIRED, 'Format of output (ical, jcal, xcal) defaults to ical', 'ical')
48-
->addOption('location', null, InputOption::VALUE_REQUIRED, 'Location of where to write the output. defaults to stdout');
48+
->addOption('location', null, InputOption::VALUE_REQUIRED, 'Location of where to write the output. Defaults to stdout');
4949
}
5050

5151
protected function execute(InputInterface $input, OutputInterface $output): int {
@@ -73,11 +73,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7373
throw new InvalidArgumentException("Format <$format> is not valid.");
7474
}
7575
$options->setFormat($format);
76-
// evaluate is a valid location was given and is usable otherwise output to stdout
76+
// evaluate if a valid location was given and is usable otherwise output to stdout
7777
if ($location !== null) {
7878
$handle = fopen($location, 'wb');
7979
if ($handle === false) {
80-
throw new InvalidArgumentException("Location <$location> is not valid. Can not open location for write operation.");
80+
throw new InvalidArgumentException("Location <$location> is not valid. Cannot open location for write operation.");
8181
}
8282

8383
foreach ($this->exportService->export($calendar, $options) as $chunk) {

apps/dav/lib/Command/ImportCalendar.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ protected function configure(): void {
4545
$this->setName('calendar:import')
4646
->setDescription('Import calendar data to supported calendars from disk or stdin')
4747
->addArgument('uid', InputArgument::REQUIRED, 'Id of system user')
48-
->addArgument('uri', InputArgument::REQUIRED, 'Uri of calendar')
48+
->addArgument('uri', InputArgument::REQUIRED, 'URI of calendar')
4949
->addArgument('location', InputArgument::OPTIONAL, 'Location to read the input from, defaults to stdin.')
5050
->addOption('format', null, InputOption::VALUE_REQUIRED, 'Format of input (ical, jcal, xcal) defaults to ical', 'ical')
51-
->addOption('errors', null, InputOption::VALUE_REQUIRED, 'how to handel item errors (0 - continue, 1 - fail)')
52-
->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)')
51+
->addOption('errors', null, InputOption::VALUE_REQUIRED, 'how to handle item errors (0 - continue, 1 - fail)')
52+
->addOption('validation', null, InputOption::VALUE_REQUIRED, 'how to handle item validation (0 - no validation, 1 - validate and skip on issue, 2 - validate and fail on issue)')
5353
->addOption('supersede', null, InputOption::VALUE_NONE, 'override/replace existing items')
5454
->addOption('show-created', null, InputOption::VALUE_NONE, 'show all created items after processing')
5555
->addOption('show-updated', null, InputOption::VALUE_NONE, 'show all updated items after processing')
@@ -103,7 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
103103
if ($location !== null) {
104104
$input = fopen($location, 'r');
105105
if ($input === false) {
106-
throw new InvalidArgumentException("Location <$location> is not valid. Can not open location for read operation.");
106+
throw new InvalidArgumentException("Location <$location> is not valid. Cannot open location for read operation.");
107107
}
108108
try {
109109
$outcome = $this->importService->import($input, $calendar, $options);
@@ -113,7 +113,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
113113
} else {
114114
$input = fopen('php://stdin', 'r');
115115
if ($input === false) {
116-
throw new InvalidArgumentException('Can not open stdin for read operation.');
116+
throw new InvalidArgumentException('Cannot open stdin for read operation.');
117117
}
118118
try {
119119
$tempPath = $this->tempManager->getTemporaryFile();

0 commit comments

Comments
 (0)