Merge branch 'master' into realtime-multiplayer-fail-allowance

Author: nanaya

app/Http/Controllers/BeatmapsController.php

@@ -79,6 +79,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType,
         $scoreTransformer = new ScoreTransformer($scoreTransformerType);
 
         $results = [
+            'score_count' => UserRank::getCount($esFetch->baseParams),
             'scores' => json_collection(
                 $scores,
                 $scoreTransformer,

app/Http/Controllers/BeatmapsetsController.php

@@ -112,6 +112,8 @@ public function show($id)
     }
 
     /**
+     * Search Beatmapset
+     *
      * TODO: documentation
      *
      * @usesCursor

app/Libraries/Score/BeatmapScores.php

@@ -14,8 +14,8 @@
 
 class BeatmapScores
 {
+    public ScoreSearchParams $baseParams;
     public array $result;
-    private ScoreSearchParams $baseParams;
 
     public function __construct(private array $rawParams)
     {
@@ -48,7 +48,6 @@ public function rank(SoloScore $score): int
 
         $params = clone $this->baseParams;
         $params->beforeScore = $score;
-        $params->setSort(null);
 
         return UserRank::getRank($params);
     }

app/Libraries/Score/UserRank.php

@@ -11,12 +11,9 @@
 
 class UserRank
 {
-    public static function getRank(ScoreSearchParams $params): int
+    public static function getCount(ScoreSearchParams $params): int
     {
-        if ($params->beforeTotalScore === null && $params->beforeScore === null) {
-            throw new InvariantException('beforeScore or beforeTotalScore must be specified');
-        }
-
+        $params->setSort(null);
         $search = new ScoreSearch($params);
 
         $search->size(0);
@@ -27,6 +24,15 @@ public static function getRank(ScoreSearchParams $params): int
         $response = $search->response();
         $search->assertNoError();
 
-        return 1 + $response->aggregations($aggName)['value'];
+        return $response->aggregations($aggName)['value'];
+    }
+
+    public static function getRank(ScoreSearchParams $params): int
+    {
+        if ($params->beforeTotalScore === null && $params->beforeScore === null) {
+            throw new InvariantException('beforeScore or beforeTotalScore must be specified');
+        }
+
+        return 1 + static::getCount($params);
     }
 }

composer.json

@@ -52,11 +52,11 @@
   "require-dev": {
     "beyondcode/laravel-query-detector": "*",
     "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-    "dms/phpunit-arraysubset-asserts": "^0.3.0",
+    "dms/phpunit-arraysubset-asserts": "^0.5.0",
     "laravel/dusk": "*",
     "mockery/mockery": "*",
     "nunomaduro/collision": "^6.1",
-    "phpunit/phpunit": ">=9.5",
+    "phpunit/phpunit": ">=10.0",
     "slevomat/coding-standard": "^8.15",
     "spatie/laravel-ignition": "^2.0",
     "squizlabs/php_codesniffer": "^3.10",