Rename RangeBoundary to ScoreBoundary

amphp · Feb 18, 2023 · a3e8dc3 · a3e8dc3
1 parent ed5555e
commit a3e8dc3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/RedisSortedSet.php b/src/RedisSortedSet.php
@@ -65,7 +65,7 @@ public function getRangeWithScores(int $start, int $end, ?RangeOptions $options
     /**
      * @return Promise<list<string>>
      */
-    public function getRangeByScore(RangeBoundary $start, RangeBoundary $end, ?RangeOptions $options = null): Promise
+    public function getRangeByScore(ScoreBoundary $start, ScoreBoundary $end, ?RangeOptions $options = null): Promise
     {
         $query = ['zrange', $this->key, $start->toQuery(), $end->toQuery(), 'BYSCORE'];
         if ($options !== null) {
@@ -78,7 +78,7 @@ public function getRangeByScore(RangeBoundary $start, RangeBoundary $end, ?Range
     /**
      * @return Promise<array<string, float>>
      */
-    public function getRangeByScoreWithScores(RangeBoundary $start, RangeBoundary $end, ?RangeOptions $options = null): Promise
+    public function getRangeByScoreWithScores(ScoreBoundary $start, ScoreBoundary $end, ?RangeOptions $options = null): Promise
     {
         $query = ['zrange', $this->key, $start->toQuery(), $end->toQuery(), 'BYSCORE', 'WITHSCORES'];
         if ($options !== null) {
@@ -226,7 +226,7 @@ public function removeRankRange(int $start, int $stop): Promise
     /**
      * @return Promise<int>
      */
-    public function removeRangeByScore(RangeBoundary $min, RangeBoundary $max): Promise
+    public function removeRangeByScore(ScoreBoundary $min, ScoreBoundary $max): Promise
     {
         return $this->queryExecutor->execute(['zremrangebyscore', $this->key, $min->toQuery(), $max->toQuery()]);
     }

diff --git a/src/RangeBoundary.php → src/ScoreBoundary.php b/src/RangeBoundary.php → src/ScoreBoundary.php
@@ -2,7 +2,7 @@
 
 namespace Amp\Redis;
 
-final class RangeBoundary
+final class ScoreBoundary
 {
     public static function exclusive(float $value): self
     {

diff --git a/test/RedisSortedSetTest.php b/test/RedisSortedSetTest.php
@@ -32,19 +32,19 @@ public function testScoredSet(): \Generator
         $this->assertSame(['foo', 'bar'], yield $set->getRange(0, 1));
         $this->assertSame(['bar'], yield $set->getRange(1, 2));
 
-        $this->assertSame(['foo'], yield $set->getRangeByScore(RangeBoundary::inclusive(1), RangeBoundary::inclusive(2)));
-        $this->assertSame(['foo' => 1.0], yield $set->getRangeByScoreWithScores(RangeBoundary::inclusive(1), RangeBoundary::exclusive(3)));
-        $this->assertSame(['foo', 'bar'], yield $set->getRangeByScore(RangeBoundary::negativeInfinity(), RangeBoundary::inclusive(3)));
-        $this->assertSame(['foo'], yield $set->getRangeByScore(RangeBoundary::inclusive(1), RangeBoundary::exclusive(3)));
+        $this->assertSame(['foo'], yield $set->getRangeByScore(ScoreBoundary::inclusive(1), ScoreBoundary::inclusive(2)));
+        $this->assertSame(['foo' => 1.0], yield $set->getRangeByScoreWithScores(ScoreBoundary::inclusive(1), ScoreBoundary::exclusive(3)));
+        $this->assertSame(['foo', 'bar'], yield $set->getRangeByScore(ScoreBoundary::negativeInfinity(), ScoreBoundary::inclusive(3)));
+        $this->assertSame(['foo'], yield $set->getRangeByScore(ScoreBoundary::inclusive(1), ScoreBoundary::exclusive(3)));
 
 
         $this->assertSame(['bar', 'foo'], yield $set->getRange(0, 1, (new RangeOptions())->withReverseOrder()));
         $this->assertSame(['bar' => 3.0], yield $set->getRangeWithScores(0, 0, (new RangeOptions())->withReverseOrder()));
         $this->assertSame(['foo'], yield $set->getRange(1, 2, (new RangeOptions())->withReverseOrder()));
 
-        $this->assertSame(['foo'], yield $set->getRangeByScore(RangeBoundary::inclusive(2), RangeBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
-        $this->assertSame(['bar' => 3.0, 'foo' => 1.0], yield $set->getRangeByScoreWithScores(RangeBoundary::positiveInfinity(), RangeBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
-        $this->assertSame(['bar', 'foo'], yield $set->getRangeByScore(RangeBoundary::inclusive(3), RangeBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
+        $this->assertSame(['foo'], yield $set->getRangeByScore(ScoreBoundary::inclusive(2), ScoreBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
+        $this->assertSame(['bar' => 3.0, 'foo' => 1.0], yield $set->getRangeByScoreWithScores(ScoreBoundary::positiveInfinity(), ScoreBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
+        $this->assertSame(['bar', 'foo'], yield $set->getRangeByScore(ScoreBoundary::inclusive(3), ScoreBoundary::inclusive(1), (new RangeOptions())->withReverseOrder()));
 
         $this->assertSame(0, yield $set->getRank('foo'));
         $this->assertSame(1, yield $set->getRank('bar'));
@@ -67,8 +67,8 @@ public function testRemove(): \Generator
             'baz' => 3.3,
         ]));
 
-        yield $set->removeRangeByScore(RangeBoundary::exclusive(2.2), RangeBoundary::positiveInfinity());
-        $this->assertSame(['foo', 'bar'], yield $set->getRangeByScore(RangeBoundary::negativeInfinity(), RangeBoundary::positiveInfinity()));
+        yield $set->removeRangeByScore(ScoreBoundary::exclusive(2.2), ScoreBoundary::positiveInfinity());
+        $this->assertSame(['foo', 'bar'], yield $set->getRangeByScore(ScoreBoundary::negativeInfinity(), ScoreBoundary::positiveInfinity()));
     }
 
     public function testLexSet(): \Generator