Laravel 9 Update (#1413)

Update to Laravel 9 and PHP 8+ Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>
2022-03-14 11:45:18 -04:00
parent 00bf18c225
commit 12848091a2
340 changed files with 6130 additions and 4502 deletions
--- a/app/Notifications/Messages/Broadcast/PirepFiled.php
+++ b/app/Notifications/Messages/Broadcast/PirepFiled.php
@@ -5,11 +5,8 @@ namespace App\Notifications\Messages\Broadcast;
 use App\Contracts\Notification;
 use App\Models\Pirep;
 use App\Notifications\Channels\Discord\DiscordMessage;
-use App\Support\Units\Distance;
 use App\Support\Units\Time;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use PhpUnitsOfMeasure\Exception\NonNumericValue;
-use PhpUnitsOfMeasure\Exception\NonStringUnitName;

 class PirepFiled extends Notification implements ShouldQueue
 {
@@ -42,25 +39,7 @@ class PirepFiled extends Notification implements ShouldQueue
    public function toDiscordChannel($pirep): ?DiscordMessage
    {
        $title = 'Flight '.$pirep->ident.' Filed';
-        $fields = [
-            'Dep.Airport' => $pirep->dpt_airport_id,
-            'Arr.Airport' => $pirep->arr_airport_id,
-            'Equipment'   => $pirep->aircraft->ident,
-            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
-        ];
-
-        if ($pirep->distance) {
-            try {
-                $distance = new Distance(
-                    $pirep->distance,
-                    config('phpvms.internal_units.distance')
-                );
-
-                $pd = $distance[$distance->unit].' '.$distance->unit;
-                $fields['Distance'] = $pd;
-            } catch (NonNumericValue|NonStringUnitName $e) {
-            }
-        }
+        $fields = $this->createFields($pirep);

        // User avatar, somehow $pirep->user->resolveAvatarUrl() is not being accepted by Discord as thumbnail
        $user_avatar = !empty($pirep->user->avatar) ? $pirep->user->avatar->url : $pirep->user->gravatar(256);
@@ -79,6 +58,27 @@ class PirepFiled extends Notification implements ShouldQueue
            ->fields($fields);
    }

+    /**
+     * @param Pirep $pirep
+     *
+     * @return array
+     */
+    public function createFields(Pirep $pirep): array
+    {
+        $fields = [
+            'Dep.Airport' => $pirep->dpt_airport_id,
+            'Arr.Airport' => $pirep->arr_airport_id,
+            'Equipment'   => $pirep->aircraft->ident,
+            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
+        ];
+
+        if ($pirep->distance) {
+            $fields['Distance'] = $pirep->distance->local(2).' '.setting('units.distance');
+        }
+
+        return $fields;
+    }
+
    /**
     * Get the array representation of the notification.
     *
--- a/app/Notifications/Messages/Broadcast/PirepPrefiled.php
+++ b/app/Notifications/Messages/Broadcast/PirepPrefiled.php
@@ -6,11 +6,8 @@ use App\Contracts\Notification;
 use App\Models\Pirep;
 use App\Notifications\Channels\Discord\DiscordMessage;
 use App\Notifications\Channels\Discord\DiscordWebhook;
-use App\Support\Units\Distance;
 use App\Support\Units\Time;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use PhpUnitsOfMeasure\Exception\NonNumericValue;
-use PhpUnitsOfMeasure\Exception\NonStringUnitName;

 /**
 * Send the PIREP accepted message to a particular user, can also be sent to Discord
@@ -49,6 +46,32 @@ class PirepPrefiled extends Notification implements ShouldQueue
        }

        $title = 'Flight '.$pirep->ident.' Prefiled';
+        $fields = $this->createFields($pirep);
+
+        $dm = new DiscordMessage();
+
+        return $dm->webhook(setting('notifications.discord_public_webhook_url'))
+            ->success()
+            ->title($title)
+            ->description(
+                $pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : ''
+            )
+            ->url(route('frontend.pireps.show', [$pirep->id]))
+            ->author([
+                'name'     => $pirep->user->ident.' - '.$pirep->user->name_private,
+                'url'      => route('frontend.profile.show', [$pirep->user_id]),
+                'icon_url' => $pirep->user->resolveAvatarUrl(),
+            ])
+            ->fields($fields);
+    }
+
+    /**
+     * @param Pirep $pirep
+     *
+     * @return array
+     */
+    public function createFields(Pirep $pirep): array
+    {
        $fields = [
            'Flight'                => $pirep->ident,
            'Departure Airport'     => $pirep->dpt_airport_id,
@@ -58,31 +81,10 @@ class PirepPrefiled extends Notification implements ShouldQueue
        ];

        if ($pirep->planned_distance) {
-            try {
-                $planned_distance = new Distance(
-                    $pirep->planned_distance,
-                    config('phpvms.internal_units.distance')
-                );
-
-                $pd = $planned_distance[$planned_distance->unit].' '.$planned_distance->unit;
-                $fields['Distance (Planned)'] = $pd;
-            } catch (NonNumericValue $e) {
-            } catch (NonStringUnitName $e) {
-            }
+            $fields['Distance'] = $pirep->planned_distance->local(2).' '.setting('units.distance');
        }

-        $dm = new DiscordMessage();
-        return $dm->webhook(setting('notifications.discord_public_webhook_url'))
-            ->success()
-            ->title($title)
-            ->description($pirep->user->discord_id ? 'Flight by <@'.$pirep->user->discord_id.'>' : '')
-            ->url(route('frontend.pireps.show', [$pirep->id]))
-            ->author([
-                'name'     => $pirep->user->ident.' - '.$pirep->user->name_private,
-                'url'      => route('frontend.profile.show', [$pirep->user_id]),
-                'icon_url' => $pirep->user->resolveAvatarUrl(),
-            ])
-            ->fields($fields);
+        return $fields;
    }

    /**
--- a/app/Notifications/Messages/Broadcast/PirepStatusChanged.php
+++ b/app/Notifications/Messages/Broadcast/PirepStatusChanged.php
@@ -10,8 +10,6 @@ use App\Notifications\Channels\Discord\DiscordWebhook;
 use App\Support\Units\Distance;
 use App\Support\Units\Time;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use PhpUnitsOfMeasure\Exception\NonNumericValue;
-use PhpUnitsOfMeasure\Exception\NonStringUnitName;

 /**
 * Send the PIREP accepted message to a particular user, can also be sent to Discord
@@ -78,36 +76,7 @@ class PirepStatusChanged extends Notification implements ShouldQueue
        }

        $title = 'Flight '.$pirep->ident.' '.self::$verbs[$pirep->status];
-        $fields = [
-            'Dep.Airport' => $pirep->dpt_airport_id,
-            'Arr.Airport' => $pirep->arr_airport_id,
-            'Equipment'   => $pirep->aircraft->ident,
-            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
-        ];
-
-        // Show the distance, but include the planned distance if it's been set
-        if ($pirep->distance) {
-            $unit = config('phpvms.internal_units.distance');
-
-            try {
-                $planned_distance = new Distance($pirep->distance, $unit);
-                $pd = $planned_distance[$planned_distance->unit];
-                $fields['Distance'] = $pd;
-
-                // Add the planned distance in
-                if ($pirep->planned_distance) {
-                    try {
-                        $planned_distance = new Distance($pirep->planned_distance, $unit);
-                        $pd = $planned_distance[$planned_distance->unit];
-                        $fields['Distance'] .= '/'.$pd;
-                    } catch (NonNumericValue|NonStringUnitName $e) {
-                    }
-                }
-
-                $fields['Distance'] .= ' '.$planned_distance->unit;
-            } catch (NonNumericValue|NonStringUnitName $e) {
-            }
-        }
+        $fields = $this->createFields($pirep);

        // User avatar, somehow $pirep->user->resolveAvatarUrl() is not being accepted by Discord as thumbnail
        $user_avatar = !empty($pirep->user->avatar) ? $pirep->user->avatar->url : $pirep->user->gravatar(256);
@@ -121,6 +90,7 @@ class PirepStatusChanged extends Notification implements ShouldQueue
            PirepStatus::PAUSED,
            PirepStatus::EMERG_DESCENT,
        ];
+
        $color = in_array($pirep->status, $danger_types, true) ? 'ED2939' : 'FD6A02';

        $dm = new DiscordMessage();
@@ -136,6 +106,38 @@ class PirepStatusChanged extends Notification implements ShouldQueue
            ->fields($fields);
    }

+    /**
+     * @param Pirep $pirep
+     *
+     * @return array
+     */
+    public function createFields(Pirep $pirep): array
+    {
+        $fields = [
+            'Dep.Airport' => $pirep->dpt_airport_id,
+            'Arr.Airport' => $pirep->arr_airport_id,
+            'Equipment'   => $pirep->aircraft->ident,
+            'Flight Time' => Time::minutesToTimeString($pirep->flight_time),
+        ];
+
+        // Show the distance, but include the planned distance if it's been set
+        $fields['Distance'] = [];
+        if ($pirep->distance) {
+            $fields['Distance'][] = $pirep->distance->local(2);
+        }
+
+        if ($pirep->planned_distance) {
+            $fields['Distance'][] = $pirep->planned_distance->local(2);
+        }
+
+        if (!empty($fields['Distance'])) {
+            $fields['Distance'] = implode('/', $fields['Distance']);
+            $fields['Distance'] .= ' '.setting('units.distance');
+        }
+
+        return $fields;
+    }
+
    /**
     * Get the array representation of the notification.
     *