Laravel 10.x Shift

.gitignore

@@ -7,7 +7,7 @@
 
 .env
 .env.backup
-.phpunit.result.cache
+/.phpunit.cache
 Homestead.json
 Homestead.yaml
 auth.json

.phpunit.result.cache

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"Tests\\Unit\\ExampleTest::test_that_true_is_true":0.001,"Tests\\Feature\\ExampleTest::test_the_application_returns_a_successful_response":0.125}}

app/Console/Commands/InstallCommand.php

@@ -23,10 +23,8 @@ class InstallCommand extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         if (! $this->option('force')) {
             $this->newLine(2);

app/Console/Commands/RunSpeedtest.php

@@ -24,10 +24,8 @@ class RunSpeedtest extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle()
+    public function handle(): int
     {
         $speedtest = [];
 

app/Console/Commands/TestInfluxDB.php

@@ -24,17 +24,15 @@ class TestInfluxDB extends Command
 
     /**
      * Execute the console command.
-     *
-     * @return int
      */
-    public function handle(InfluxDbSettings $settings)
+    public function handle(InfluxDbSettings $settings): int
     {
         $influxdb = [
             'enabled' => $settings->v2_enabled,
-            'url' => optional($settings)->v2_url,
-            'org' => optional($settings)->v2_org,
-            'bucket' => optional($settings)->v2_bucket,
-            'token' => optional($settings)->v2_token,
+            'url' => $settings?->v2_url,
+            'org' => $settings?->v2_org,
+            'bucket' => $settings?->v2_bucket,
+            'token' => $settings?->v2_token,
         ];
 
         if ($influxdb['enabled'] == true) {

app/Console/Kernel.php

@@ -10,10 +10,8 @@ class Kernel extends ConsoleKernel
 {
     /**
      * Define the application's command schedule.
-     *
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         $schedule->job(new SearchForSpeedtests())->everyMinute();
 
@@ -24,10 +22,8 @@ protected function schedule(Schedule $schedule)
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
 

app/Exceptions/Handler.php

@@ -8,25 +8,7 @@
 class Handler extends ExceptionHandler
 {
     /**
-     * A list of exception types with their corresponding custom log levels.
-     *
-     * @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
-     */
-    protected $levels = [
-        //
-    ];
-
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array<int, class-string<\Throwable>>
-     */
-    protected $dontReport = [
-        //
-    ];
-
-    /**
-     * A list of the inputs that are never flashed to the session on validation exceptions.
+     * The list of the inputs that are never flashed to the session on validation exceptions.
      *
      * @var array<int, string>
      */
@@ -38,10 +20,8 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             //

app/Filament/Pages/Settings/GeneralPage.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Pages\Settings;
 
-use App\Rules\ValidCronExpression;
+use App\Rules\Cron;
 use App\Settings\GeneralSettings;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;
@@ -75,7 +75,7 @@ protected function getFormSchema(): array
                             Section::make('Speedtest Settings')
                                 ->schema([
                                     TextInput::make('speedtest_schedule')
-                                        ->rules([new ValidCronExpression()])
+                                        ->rules([new Cron()])
                                         ->helperText('Leave empty to disable the schedule. You can also use the cron expression generator [HERE](https://crontab.cronhub.io/) to help you make schedules.')
                                         ->nullable()
                                         ->columnSpan(1),

app/Filament/Pages/Settings/NotificationPage.php

@@ -6,9 +6,9 @@
 use App\Forms\Components\TestMailNotification;
 use App\Forms\Components\TestTelegramNotification;
 use App\Mail\Test;
+use App\Notifications\Telegram\TestNotification as TelegramTestNotification;
 use App\Settings\GeneralSettings;
 use App\Settings\NotificationSettings;
-use App\Telegram\TelegramNotification;
 use Closure;
 use Filament\Forms\Components\Card;
 use Filament\Forms\Components\Fieldset;
@@ -21,6 +21,7 @@
 use Filament\Notifications\Notification;
 use Filament\Pages\SettingsPage;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Notification as FacadesNotification;
 
 class NotificationPage extends SettingsPage
 {
@@ -179,7 +180,7 @@ protected function getFormSchema(): array
         ];
     }
 
-    public function sendTestDatabaseNotification()
+    public function sendTestDatabaseNotification(): void
     {
         $recipient = auth()->user();
 
@@ -198,55 +199,65 @@ public function sendTestDatabaseNotification()
             ->send();
     }
 
-    public function sendTestMailNotification()
+    public function sendTestMailNotification(): void
     {
         $notificationSettings = new (NotificationSettings::class);
 
-        if (! empty($notificationSettings->mail_recipients)) {
-            foreach ($notificationSettings->mail_recipients as $recipient) {
-                Mail::to($recipient)
-                    ->send(new Test());
-            }
-
-            Notification::make()
-                ->title('Test mail notification sent.')
-                ->success()
-                ->send();
-        } else {
+        if (blank($notificationSettings->mail_recipients)) {
             Notification::make()
-                ->title('You need to add recipients to receive mail notifications.')
+                ->title('You need to add mail recipients.')
+                ->body('Make sure to click "Save changes" before testing mail notifications.')
                 ->warning()
                 ->send();
+
+            return;
+        }
+
+        foreach ($notificationSettings->mail_recipients as $recipient) {
+            Mail::to($recipient)
+                ->send(new Test());
         }
+
+        Notification::make()
+            ->title('Test mail notification sent.')
+            ->success()
+            ->send();
     }
 
-    public function sendTestTelegramNotification()
+    public function sendTestTelegramNotification(): void
     {
         $notificationSettings = new (NotificationSettings::class);
 
         $bot = config('telegram.bot');
 
         if (blank($bot)) {
             Notification::make()
-                ->title('First you need to add \'TELEGRAM_BOT_TOKEN\' on your .env file or add it as environment variable')
-                ->warning()
+                ->title('No Telegram bot provided.')
+                ->body('You need to add "TELEGRAM_BOT_TOKEN" in your .env file or add it as environment variable')
+                ->danger()
                 ->send();
+
+            return;
         }
-        if (! empty($notificationSettings->telegram_recipients)) {
-            foreach ($notificationSettings->telegram_recipients as $recipient) {
-                \Illuminate\Support\Facades\Notification::route('telegram_chat_id', $recipient['telegram_chat_id'])
-                    ->notify(new TelegramNotification('Test notification channel *telegram*'));
-            }
 
+        if (blank($notificationSettings->telegram_recipients)) {
             Notification::make()
-                ->title('Test Telegram notification sent.')
-                ->success()
-                ->send();
-        } else {
-            Notification::make()
-                ->title('You need to add recipients to receive Telegram notifications.')
+                ->title('You need to add Telegram recipients.')
+                ->body('Make sure to click "Save changes" before testing Telegram notifications.')
                 ->warning()
                 ->send();
+
+            return;
         }
+
+        foreach ($notificationSettings->telegram_recipients as $recipient) {
+            FacadesNotification::route('telegram_chat_id', $recipient['telegram_chat_id'])
+                ->notify(new TelegramTestNotification);
+        }
+
+        Notification::make()
+            ->title('Test Telegram notification sent.')
+            ->success()
+            ->send();
     }
 }

app/Filament/Resources/ResultResource.php

@@ -162,7 +162,7 @@ public static function table(Table $table): Table
                     Action::make('view result')
                         ->label('View on Speedtest.net')
                         ->icon('heroicon-o-link')
-                        ->url(fn (Result $record): string|null => optional($record)->url)
+                        ->url(fn (Result $record): string|null => $record?->url)
                         ->hidden(fn (Result $record): bool => ! $record->is_successful)
                         ->openUrlInNewTab(),
                     Tables\Actions\ViewAction::make(),

app/Http/Controllers/API/Speedtest/GetLatestController.php

@@ -4,15 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Result;
+use Illuminate\Http\JsonResponse;
 
 class GetLatestController extends Controller
 {
     /**
      * Handle the incoming request.
-     *
-     * @return \Illuminate\Http\Response
      */
-    public function __invoke()
+    public function __invoke(): JsonResponse
     {
         $latest = Result::query()
             ->latest()

app/Http/Controllers/Controller.php

@@ -3,11 +3,10 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests, ValidatesRequests;
 }

app/Http/Kernel.php

@@ -40,19 +40,19 @@ class Kernel extends HttpKernel
 
         'api' => [
             // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
-            'throttle:api',
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
     ];
 
     /**
-     * The application's route middleware.
+     * The application's middleware aliases.
      *
-     * These middleware may be assigned to groups or used individually.
+     * Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
      *
      * @var array<string, class-string|string>
      */
-    protected $routeMiddleware = [
+    protected $middlewareAliases = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,

app/Http/Middleware/Authenticate.php

@@ -3,16 +3,14 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Http\Request;
 
 class Authenticate extends Middleware
 {
     /**
      * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string|null
      */
-    protected function redirectTo($request)
+    protected function redirectTo(Request $request): ?string
     {
         if (! $request->expectsJson()) {
             return route('admin/login');

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -6,17 +6,16 @@
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\Response;
 
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
      *
      * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @param  string|null  ...$guards
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
      */
-    public function handle(Request $request, Closure $next, ...$guards)
+    public function handle(Request $request, Closure $next, string ...$guards): Response
     {
         $guards = empty($guards) ? [null] : $guards;
 

app/Http/Middleware/TrustHosts.php

@@ -11,7 +11,7 @@ class TrustHosts extends Middleware
      *
      * @return array<int, string|null>
      */
-    public function hosts()
+    public function hosts(): array
     {
         return [
             $this->allSubdomainsOfApplicationUrl(),

app/Http/Middleware/ValidateSignature.php

@@ -7,11 +7,11 @@
 class ValidateSignature extends Middleware
 {
     /**
-     * The names of the parameters that should be ignored.
+     * The names of the query string parameters that should be ignored.
      *
      * @var array<int, string>
      */
-    protected $ignore = [
+    protected $except = [
         // 'fbclid',
         // 'utm_campaign',
         // 'utm_content',