Merge branch 'master' into dont-reset-playcounts

Author: nanaya

app/Http/Controllers/Payments/XsollaController.php

@@ -7,7 +7,6 @@
 
 use App\Exceptions\InvalidSignatureException;
 use App\Exceptions\Store\OrderException;
-use App\Libraries\OrderCheckout;
 use App\Libraries\Payments\XsollaPaymentProcessor;
 use App\Libraries\Payments\XsollaSignature;
 use App\Libraries\Payments\XsollaUserNotFoundException;
@@ -106,9 +105,9 @@ public function callback(HttpRequest $request)
     public function completed()
     {
         $orderNumber = Request::input('foreignInvoice') ?? '';
-        $order = OrderCheckout::for($orderNumber)->completeCheckout();
+        $order = Order::whereOrderNumber($orderNumber)->firstOrFail();
 
-        return redirect(route('store.invoice.show', ['invoice' => $order->order_id, 'thanks' => 1]));
+        return redirect(route('store.invoice.show', ['invoice' => $order->getKey(), 'thanks' => 1]));
     }
 
     private function errorResponse(string $message, string $code, int $status)

app/Models/User.php

@@ -329,7 +329,7 @@ public function usernameChangeCost()
         $tier = max(
             $this->usernameChangeHistory()
                 ->paid()
-                ->where('timestamp', '>', Carbon::now()->subYears(3))
+                ->where('timestamp', '>', Carbon::now()->subYearsNoOverflow(3))
                 ->count(),
             $minTier,
         );

tests/Models/UserTest.php

@@ -145,7 +145,7 @@ public function testResetSessions(): void
     public function testUsernameAvailableAtForDefaultGroup()
     {
         config_set('osu.user.allowed_rename_groups', ['default']);
-        $allowedAtUpTo = now()->addYears(5);
+        $allowedAtUpTo = now()->addYearsNoOverflow(5);
         $user = User::factory()->withGroup('default')->create();
 
         $this->assertLessThanOrEqual($allowedAtUpTo, $user->getUsernameAvailableAt());
@@ -154,7 +154,7 @@ public function testUsernameAvailableAtForDefaultGroup()
     public function testUsernameAvailableAtForNonDefaultGroup()
     {
         config_set('osu.user.allowed_rename_groups', ['default']);
-        $allowedAt = now()->addYears(10);
+        $allowedAt = now()->addYearsNoOverflow(10);
         $user = User::factory()->withGroup('gmt')->create(['group_id' => app('groups')->byIdentifier('default')]);
 
         $this->assertGreaterThanOrEqual($allowedAt, $user->getUsernameAvailableAt());
@@ -185,11 +185,11 @@ public function testUsernameChangeCostMultiple()
         ]);
 
         // 1 change in last 3 years
-        $this->travelTo(CarbonImmutable::now()->addYears(3));
+        $this->travelTo(CarbonImmutable::now()->addYearsNoOverflow(3));
         $this->assertSame(8, $user->usernameChangeCost());
 
         // 0 changes in last 3 years
-        $this->travelTo(CarbonImmutable::now()->addYears(1));
+        $this->travelTo(CarbonImmutable::now()->addYearsNoOverflow(1));
         $this->assertSame(8, $user->usernameChangeCost());
 
         $user->usernameChangeHistory()->create([
@@ -211,10 +211,10 @@ public function testUsernameChangeCostMultiple()
         $this->assertSame(16, $user->usernameChangeCost());
 
         // 1 changes in last 3 years
-        $this->travelTo(CarbonImmutable::now()->addYears(3));
+        $this->travelTo(CarbonImmutable::now()->addYearsNoOverflow(3));
         $this->assertSame(8, $user->usernameChangeCost());
         // 0 changes in last 3 years
-        $this->travelTo(CarbonImmutable::now()->addYears(1));
+        $this->travelTo(CarbonImmutable::now()->addYearsNoOverflow(1));
         $this->assertSame(8, $user->usernameChangeCost());
     }
 
@@ -236,20 +236,22 @@ public function testUsernameChangeCostType(string $type, int $cost)
     public function testUsernameChangeCostWindow(int $years, int $cost)
     {
         $now = CarbonImmutable::now();
-        $this->travelTo(CarbonImmutable::now()->subYears(3));
+        $this->travelTo($now->subYearsNoOverflow(3));
 
         $user = User::factory()->create();
-        while (CarbonImmutable::now()->isBefore($now)) {
+        // every 6 months for 3 years = 6
+        // using isBefore to setup adds too many when run at month boundaries.
+        for ($i = 0; $i < 6; $i++) {
             $user->usernameChangeHistory()->create([
                 'timestamp' => CarbonImmutable::now(),
                 'type' => 'paid',
                 'username' => 'marty',
             ]);
 
-            $this->travelTo(CarbonImmutable::now()->addMonths(6));
+            $this->travelTo(CarbonImmutable::now()->addMonthsNoOverflow(6));
         }
 
-        $this->travelTo($now->addYears($years));
+        $this->travelTo($now->addYearsNoOverflow($years));
         $this->assertSame($cost, $user->usernameChangeCost());
     }