Feature/deps update fix phpstan

.github/workflows/build.yml

@@ -12,13 +12,12 @@ jobs:
         strategy:
             matrix:
                 php:
-                    - "8.2"
-                    - "8.3"
+                    - "8.4"
 #                dependencies:
 #                    - "lowest"
 #                    - "highest"
                 include:
-                    -   php-version: "8.3"
+                    -   php-version: "8.4"
                         composer-options: "--ignore-platform-reqs"
         steps:
             - name: Checkout

.run/PHPUnit.run.xml

@@ -1,10 +1,5 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PHPUnit" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
-    <CommandLine>
-      <PhpTestInterpreterSettings>
-        <option name="interpreterName" value="PHP 8.3" />
-      </PhpTestInterpreterSettings>
-    </CommandLine>
     <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml" coverage_engine="PCov" scope="XML" use_alternative_configuration_file="true" />
     <method v="2" />
   </configuration>

benchmarking/benchmark.php

@@ -364,4 +364,4 @@
     fclose($fp);
 }
 
-echo 'Total time: ' . round($totalTime) . 'ms' . PHP_EOL;
+echo 'Total time: ' . round($totalTime) . 'ms' . PHP_EOL;

composer.json

@@ -3,8 +3,8 @@
     "description": "Multi-probe consistent hashing implementation for PHP",
     "type": "library",
     "require-dev": {
-        "phpunit/phpunit": "^11.2",
-        "phpstan/phpstan": "^1.11"
+        "phpunit/phpunit": "^11.5",
+        "phpstan/phpstan": "^2.1"
     },
     "license": "GPL-3.0-only",
     "authors": [
@@ -14,7 +14,8 @@
     ],
     "autoload": {
         "psr-4": {
-            "Jspeedz\\PhpConsistentHashing\\": "src/"
+            "Jspeedz\\PhpConsistentHashing\\": "src/",
+            "Jspeedz\\PhpConsistentHashing\\Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -30,7 +31,7 @@
         "phpstanpro": "Runs PHPStan in PRO mode!"
     },
     "require": {
-        "php": ">=8.2"
+        "php": ">=8.4"
     },
     "config": {
         "process-timeout": 0

phpstan.neon

@@ -1,9 +1,9 @@
 parameters:
-	level: 9
-	paths:
-		- src
-		- tests
-	ignoreErrors:
-	    -
-	        message: '#Variable \$oneHundredAndTwentyNodes in isset\(\) always exists and is always null#'
-	        path: tests/MultiProbeConsistentHashTest.php
+    level: 9
+    paths:
+        - src
+        - tests
+    ignoreErrors:
+        -
+            message: '#Variable \$oneHundredAndTwentyNodes in isset\(\) always exists and is always null#'
+            path: tests/MultiProbeConsistentHashTest.php

phpunit.xml

@@ -24,7 +24,7 @@
     <coverage includeUncoveredFiles="true"
               pathCoverage="false"
               ignoreDeprecatedCodeUnits="true"
-              disableCodeCoverageIgnore="true">
+              disableCodeCoverageIgnore="false">
         <report>
             <cobertura outputFile="cobertura.xml"/>
             <clover outputFile="clover.xml"/>

src/Benchmark.php

@@ -67,8 +67,14 @@ public function fetchKeys(): array {
             $keys,
         );
         shuffle($keys);
+
+        return array_map(function(mixed $key): string {
+            if(is_scalar($key) || (is_object($key) && method_exists($key, '__toString'))) {
+                return (string) $key;
+            }
 
-        return $keys;
+            throw new Exception('Key cannot be cast to string');
+        }, $keys);
     }
 
     /**
@@ -199,4 +205,4 @@ public function printResults(array $results): string {
 
         return $string;
     }
-}
+}

src/HashFunctions/Accurate.php

@@ -31,4 +31,4 @@ function(string $key): float|int {
             },
         ];
     }
-}
+}

src/HashFunctions/Standard.php

@@ -24,4 +24,4 @@ function(string $key): int|float {
             },
         ];
     }
-}
+}

src/MultiProbeConsistentHash.php

@@ -68,4 +68,4 @@ public function getNode(string $key): ?string {
 
         return $targetNode;
     }
-}
+}

tests/BenchmarkTest.php

@@ -4,33 +4,39 @@
 
 use Jspeedz\PhpConsistentHashing\Benchmark;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
 #[CoversClass(Benchmark::class)]
 class BenchmarkTest extends TestCase {
-    public function testGetAvailableHashCallbacks(): void {
+    #[Test]
+    public function getAvailableHashCallbacks(): void {
         $benchmark = new Benchmark();
         $results = $benchmark->getAvailableHashCallbacks();
 
-        $this->assertIsArray($results);
         $this->assertNotEmpty($results);
         foreach($results as $result) {
+            // Ignore this one, as there is no guarantee that the element is actually callable.
+            // @phpstan-ignore method.alreadyNarrowedType
             $this->assertIsCallable($result);
         }
 
         $results = $benchmark->getAvailableHashCallbacks([
-            'someHashAlgorithm',
+            'md5',
         ]);
 
-        $this->assertIsArray($results);
         $this->assertCount(1, $results);
         foreach($results as $result) {
+            // Ignore this one, as there is no guarantee that the element is actually callable.
+            // @phpstan-ignore method.alreadyNarrowedType
             $this->assertIsCallable($result);
+            $this->assertSame(3895525021, $result('someValue'));
         }
     }
 
-    public function testGetCombinations(): void {
+    #[Test]
+    public function getCombinations(): void {
         $benchmark = new Benchmark();
 
         // Test case 1: Normal case
@@ -74,7 +80,8 @@ public function testGetCombinations(): void {
         $this->assertEquals($expected, $benchmark->getCombinations($array, $length));
     }
 
-    public function testSortByTwoColumns(): void {
+    #[Test]
+    public function sortByTwoColumns(): void {
         $benchmark = new Benchmark();
 
         // Test case 1: Normal case with ascending sort
@@ -132,7 +139,8 @@ public function testSortByTwoColumns(): void {
         $this->assertEquals($expected, $array);
     }
 
-    public function testFormatNumber(): void {
+    #[Test]
+    public function formatNumber(): void {
         $class = new ReflectionClass(Benchmark::class);
         $method = $class->getMethod('formatNumber');
         $method->setAccessible(true);
@@ -230,7 +238,8 @@ public function testFormatNumber(): void {
         );
     }
 
-    public function testPrintResults(): void {
+    #[Test]
+    public function printResults(): void {
         $mock = $this->getMockBuilder(Benchmark::class)
             ->onlyMethods(['formatNumber'])
             ->getMock();
@@ -294,4 +303,4 @@ function(int|float $number): string {
 
         $this->assertEquals($expected, $mock->printResults($results));
     }
-}
+}

tests/HashFunctions/AccurateTest.php

@@ -4,21 +4,17 @@
 
 use Jspeedz\PhpConsistentHashing\HashFunctions\Accurate;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(Accurate::class)]
 class AccurateTest extends TestCase {
-    public function testStandardCallbacks(): void {
+    #[Test]
+    public function standardCallbacks(): void {
         $callbacks = (new Accurate())();
 
         $this->assertCount(5, $callbacks);
 
-        $this->assertIsCallable($callbacks[0]);
-        $this->assertIsCallable($callbacks[1]);
-        $this->assertIsCallable($callbacks[2]);
-        $this->assertIsCallable($callbacks[3]);
-        $this->assertIsCallable($callbacks[4]);
-
         $this->assertSame(
             crc32('test'),
             $callbacks[0]('test'),
@@ -40,4 +36,4 @@ public function testStandardCallbacks(): void {
             $callbacks[4]('test'),
         );
     }
-}
+}

tests/HashFunctions/StandardTest.php

@@ -4,19 +4,17 @@
 
 use Jspeedz\PhpConsistentHashing\HashFunctions\Standard;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 
 #[CoversClass(Standard::class)]
 class StandardTest extends TestCase {
-    public function testStandardCallbacks(): void {
+    #[Test]
+    public function standardCallbacks(): void {
         $callbacks = (new Standard())();
 
         $this->assertCount(3, $callbacks);
 
-        $this->assertIsCallable($callbacks[0]);
-        $this->assertIsCallable($callbacks[1]);
-        $this->assertIsCallable($callbacks[2]);
-
         $this->assertSame(
             crc32('test'),
             $callbacks[0]('test'),
@@ -30,4 +28,4 @@ public function testStandardCallbacks(): void {
             $callbacks[2]('test'),
         );
     }
-}
+}