Merge branch 'main' into plugin-api-deleted

ECFMP · Aug 18, 2023 · 206131c · 206131c
2 parents 20c30ef + 2667131
commit 206131c
Show file tree

Hide file tree

Showing 11 changed files with 1,956 additions and 1,325 deletions.
diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -24,9 +24,9 @@ class Event extends Model
         'vatcan_code'
     ];
 
-    protected $dates = [
-        'date_start',
-        'date_end',
+    protected $casts = [
+        'date_start' => 'datetime',
+        'date_end' => 'datetime',
     ];
 
     public function flightInformationRegion(): BelongsTo

diff --git a/app/Models/FlowMeasure.php b/app/Models/FlowMeasure.php
@@ -35,14 +35,11 @@ class FlowMeasure extends Model
         'end_time',
     ];
 
-    protected $dates = [
-        'start_time',
-        'end_time',
-    ];
-
     protected $casts = [
         'mandatory_route' => 'array',
         'filters' => 'array',
+        'start_time' => 'datetime',
+        'end_time' => 'datetime',
     ];
 
     public function user(): BelongsTo

diff --git a/app/Models/VatsimPilot.php b/app/Models/VatsimPilot.php
@@ -23,16 +23,13 @@ class VatsimPilot extends Model
         'distance_to_destination',
     ];
 
-    protected $dates = [
-        'estimated_arrival_time',
-    ];
-
     protected $casts = [
         'cid' => 'integer',
         'altitude' => 'integer',
         'cruise_altitude' => 'integer',
         'vatsim_pilot_status_id' => VatsimPilotStatus::class,
         'distance_to_destination' => 'double',
+        'estimated_arrival_time' => 'datetime',
     ];
 
     public function getCoordinate(): Coordinate

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "doctrine/dbal": "^3.3",
         "filament/filament": "^2.14",
         "guzzlehttp/guzzle": "^7.2",
-        "laravel/framework": "^9.21",
+        "laravel/framework": "^10.5",
         "laravel/socialite": "^5.5",
         "laravel/tinker": "^2.7",
         "maatwebsite/excel": "^3.1",
@@ -22,23 +22,23 @@
         "socialiteproviders/manager": "^4.1",
         "spatie/laravel-activitylog": "^4.5",
         "spatie/laravel-markdown": "^2.2",
-        "z3d0x/filament-logger": "^0.4.0"
+        "z3d0x/filament-logger": "^0.5"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.6",
         "barryvdh/laravel-ide-helper": "^2.12",
         "fakerphp/faker": "^1.9.1",
-        "laravel-lang/lang": "^10.7",
-        "laravel-lang/publisher": "^13.0",
+        "laravel-lang/lang": "^12.0",
+        "laravel-lang/publisher": "^14.0",
         "laravel/pint": "^1.0.0",
         "laravel/sail": "^1.0.1",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^6.1",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.2",
-        "pestphp/pest-plugin-livewire": "^1.0",
-        "phpunit/phpunit": "^9.5.10",
-        "spatie/laravel-ignition": "^1.0"
+        "nunomaduro/collision": "^7.0",
+        "pestphp/pest": "^2.0",
+        "pestphp/pest-plugin-laravel": "^2.0",
+        "pestphp/pest-plugin-livewire": "^2.0",
+        "phpunit/phpunit": "^10.0",
+        "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -82,7 +82,8 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "php-http/discovery": true
         }
     },
     "minimum-stability": "dev",