Skip to content

Commit 9685479

Browse files
committed
The variable is used for error messages, make that more clear
1 parent c59435c commit 9685479

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

webapp/src/Service/ImportExportService.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ protected function convertImportedTime(array $fields, array $data, ?string &$err
136136
return $time instanceof DateTime ? DateTimeImmutable::createFromMutable($time) : $time;
137137
}
138138

139-
public function importContestData($data, ?string &$message = null, string &$cid = null): bool
139+
public function importContestData($data, ?string &$errorMessage = null, string &$cid = null): bool
140140
{
141141
if (empty($data) || !is_array($data)) {
142-
$message = 'Error parsing YAML file.';
142+
$errorMessage = 'Error parsing YAML file.';
143143
return false;
144144
}
145145

@@ -167,20 +167,20 @@ public function importContestData($data, ?string &$message = null, string &$cid
167167
}
168168

169169
if (!empty($missingFields)) {
170-
$message = sprintf('Missing fields: %s', implode(', ', $missingFields));
170+
$errorMessage = sprintf('Missing fields: %s', implode(', ', $missingFields));
171171
return false;
172172
}
173173

174174
$invalid_regex = str_replace(['/^[', '+$/'], ['/[^', '/'], DOMJudgeService::EXTERNAL_IDENTIFIER_REGEX);
175175

176-
$startTime = $this->convertImportedTime($startTimeFields, $data, $message);
177-
if ($message) {
176+
$startTime = $this->convertImportedTime($startTimeFields, $data, $errorMessage);
177+
if ($errorMessage) {
178178
return false;
179179
}
180180

181181
// Activate time is special, it can return non empty message for parsing error or null if no field was provided
182-
$activateTime = $this->convertImportedTime($activateTimeFields, $data, $message);
183-
if ($message) {
182+
$activateTime = $this->convertImportedTime($activateTimeFields, $data, $errorMessage);
183+
if ($errorMessage) {
184184
return false;
185185
} elseif (!$activateTime) {
186186
$activateTime = new DateTime();
@@ -189,8 +189,8 @@ public function importContestData($data, ?string &$message = null, string &$cid
189189
}
190190
}
191191

192-
$deactivateTime = $this->convertImportedTime($deactivateTimeFields, $data, $message);
193-
if ($message) {
192+
$deactivateTime = $this->convertImportedTime($deactivateTimeFields, $data, $errorMessage);
193+
if ($errorMessage) {
194194
return false;
195195
}
196196

@@ -230,7 +230,7 @@ public function importContestData($data, ?string &$message = null, string &$cid
230230
if ($freezeDuration !== null) {
231231
$freezeDurationDiff = Utils::timeStringDiff($data['duration'], $freezeDuration);
232232
if (str_starts_with($freezeDurationDiff, '-')) {
233-
$message = 'Freeze duration is longer than contest length';
233+
$errorMessage = 'Freeze duration is longer than contest length';
234234
return false;
235235
}
236236
$contest->setFreezetimeString(sprintf('+%s', $freezeDurationDiff));
@@ -246,7 +246,7 @@ public function importContestData($data, ?string &$message = null, string &$cid
246246
$messages[] = sprintf('%s: %s', $error->getPropertyPath(), $error->getMessage());
247247
}
248248

249-
$message = sprintf("Contest has errors:\n\n%s", implode("\n", $messages));
249+
$errorMessage = sprintf("Contest has errors:\n\n%s", implode("\n", $messages));
250250
return false;
251251
}
252252

0 commit comments

Comments
 (0)