Merge pull request #10867 from nanaya/score-rank-enum

Convert ScoreRank to enum
ppy · Jan 16, 2024 · 48d63ae · 48d63ae
2 parents 48f231e + 347e1fd
commit 48d63ae
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/app/Enums/ScoreRank.php b/app/Enums/ScoreRank.php
@@ -0,0 +1,19 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace App\Enums;
+
+enum ScoreRank: string
+{
+    case A = 'A';
+    case B = 'B';
+    case C = 'C';
+    case D = 'D';
+    case F = 'F';
+    case S = 'S';
+    case SH = 'SH';
+    case X = 'X';
+    case XH = 'XH';
+}
diff --git a/app/Libraries/ScoreRank.php b/app/Libraries/ScoreRank.php
diff --git a/app/Models/Solo/ScoreData.php b/app/Models/Solo/ScoreData.php
@@ -7,8 +7,8 @@
 
 namespace App\Models\Solo;
 
+use App\Enums\ScoreRank;
 use App\Exceptions\InvariantException;
-use App\Libraries\ScoreRank;
 use Illuminate\Contracts\Database\Eloquent\Castable;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use JsonSerializable;
@@ -103,7 +103,7 @@ public function set($model, $key, $value, $attributes)
 
     public function assertCompleted(): void
     {
-        if (!ScoreRank::isValid($this->rank)) {
+        if (ScoreRank::tryFrom($this->rank) === null) {
             throw new InvariantException("'{$this->rank}' is not a valid rank.");
         }