Skip to content

Commit

Permalink
Merge branch 'main' into 1920-acknowledge-healty
Browse files Browse the repository at this point in the history
  • Loading branch information
svenvg93 authored Dec 20, 2024
2 parents 581da8e + 07b8c59 commit bd224e8
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 43 deletions.
3 changes: 2 additions & 1 deletion app/Helpers/Ookla.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public static function getErrorMessage(ProcessFailedException $exception): strin
return $decoded['message'];
}

return ''; // If it's not valid JSON or doesn't contain "message", return an empty string
// Placeholder for invalid JSON or missing "message"
return 'An unexpected error occurred while running the Ookla CLI.';
}, $messages);

// Filter out empty messages and concatenate
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"guzzlehttp/guzzle": "^7.9.2",
"influxdata/influxdb-client-php": "^3.6",
"laravel-notification-channels/telegram": "^5.0",
"laravel/framework": "^11.35.1",
"laravel/framework": "^11.36.1",
"laravel/prompts": "^0.3.2",
"laravel/sanctum": "^4.0.6",
"laravel/sanctum": "^4.0.7",
"laravel/tinker": "^2.10.0",
"livewire/livewire": "^3.5.17",
"lorisleiva/laravel-actions": "^2.8.4",
"maennchen/zipstream-php": "^2.4",
"spatie/laravel-settings": "^3.4",
"spatie/laravel-webhook-server": "^3.8.1",
"spatie/laravel-webhook-server": "^3.8.2",
"timokoerber/laravel-one-time-operations": "^1.4.4"
},
"require-dev": {
Expand Down Expand Up @@ -68,7 +68,8 @@
"@php artisan filament:upgrade"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
"@php artisan vendor:publish --tag=laravel-assets --ansi --force",
"@php composer bump"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
Expand Down
72 changes: 36 additions & 36 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions config/speedtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

return [

'build_date' => Carbon::parse('2024-12-16'),
'build_date' => Carbon::parse('2024-12-18'),

'build_version' => 'v1.0.1',
'build_version' => 'v1.0.2',

/**
* General settings.
Expand Down

0 comments on commit bd224e8

Please sign in to comment.