Laravel 11 (#1201)

* wip * chore: fix carbon3 breaking changes * build: upgrade schema
iBotPeaches · Mar 24, 2024 · e7259b3 · e7259b3
1 parent d71b092
commit e7259b3
Show file tree

Hide file tree

Showing 6 changed files with 453 additions and 490 deletions.
diff --git a/app/Models/MedalAnalytic.php b/app/Models/MedalAnalytic.php
@@ -54,9 +54,9 @@ public static function purgeSeason(Medal $medal, ?Season $season = null): void
         $query->delete();
     }
 
-    public function getTimePlayedAttribute(): int
+    public function getTimePlayedAttribute(): float
     {
-        return now()->addSeconds($this->total_seconds_played)->diffInHours();
+        return now()->addSeconds($this->total_seconds_played)->diffInHours(absolute: true);
     }
 
     public function medal(): BelongsTo

diff --git a/app/Models/ServiceRecord.php b/app/Models/ServiceRecord.php
@@ -99,9 +99,9 @@ public function getAverageScoreAttribute(): float
         return $this->total_score / $this->total_matches;
     }
 
-    public function getTimePlayedAttribute(): int
+    public function getTimePlayedAttribute(): float
     {
-        return now()->addSeconds($this->total_seconds_played)->diffInHours();
+        return now()->addSeconds($this->total_seconds_played)->diffInHours(absolute: true);
     }
 
     public function getWinPercentColorAttribute(): string

diff --git a/app/Support/Analytics/Stats/MostTimePlayedServiceRecord.php b/app/Support/Analytics/Stats/MostTimePlayedServiceRecord.php
@@ -40,7 +40,7 @@ public function property(): string
 
     public function displayProperty(Analytic $analytic): string
     {
-        return number_format(now()->addSeconds((int) $analytic->value)->diffInHours());
+        return number_format(now()->addSeconds((int) $analytic->value)->diffInHours(absolute: true));
     }
 
     public function results(int $limit = 10): ?Collection

diff --git a/composer.json b/composer.json
@@ -9,9 +9,8 @@
         "doctrine/dbal": "^3.2",
         "guzzlehttp/guzzle": "^7.4",
         "jaybizzle/laravel-crawler-detect": "^1.3",
-        "laravel/framework": "^10.0",
+        "laravel/framework": "^11.0",
         "laravel/horizon": "^v5.15.0",
-        "laravel/sanctum": "^3.2",
         "laravel/socialite": "^5.5",
         "laravel/tinker": "^2.5",
         "league/csv": "^9.8",
@@ -24,7 +23,7 @@
         "fakerphp/faker": "^1.9.1",
         "laravel/pint": "^1.5",
         "mockery/mockery": "^1.4.4",
-        "nunomaduro/collision": "^7.0",
+        "nunomaduro/collision": "^8.1",
         "larastan/larastan": "2.9.2",
         "phpunit/phpunit": "^10.0",
         "spatie/laravel-ignition": "^2.0"