Skip to content

Commit 6600c94

Browse files
authored
[Bug] Fix placeholder erorr messages (alexjustesen#1965)
1 parent 29bc59d commit 6600c94

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

app/Helpers/Ookla.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ class Ookla
1212
public static function getErrorMessage(ProcessFailedException $exception): string
1313
{
1414
$messages = explode(PHP_EOL, $exception->getMessage());
15+
$errorMessages = [];
1516

16-
// Extract only the "message" part from each JSON error message
17-
$errorMessages = array_map(function ($message) {
17+
foreach ($messages as $message) {
1818
$decoded = json_decode($message, true);
1919
if (json_last_error() === JSON_ERROR_NONE && isset($decoded['message'])) {
20-
return $decoded['message'];
20+
$errorMessages[] = $decoded['message'];
2121
}
22+
}
2223

23-
// Placeholder for invalid JSON or missing "message"
24-
return 'An unexpected error occurred while running the Ookla CLI.';
25-
}, $messages);
26-
27-
// Filter out empty messages and concatenate
28-
$errorMessage = implode(' | ', array_filter($errorMessages));
24+
// If no valid messages, use the placeholder
25+
if (empty($errorMessages)) {
26+
$errorMessages[] = 'An unexpected error occurred while running the Ookla CLI.';
27+
}
2928

30-
return $errorMessage;
29+
// Remove duplicates and concatenate
30+
return implode(' | ', array_unique($errorMessages));
3131
}
3232

3333
public static function getConfigServers(): ?array

0 commit comments

Comments
 (0)