deps: Upgrade to PHPStan 2.0

pact-foundation · Nov 23, 2024 · f1eb9af · f1eb9af
1 parent 251f566
commit f1eb9af
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -32,15 +32,15 @@
         "roave/security-advisories": "dev-latest",
         "friendsofphp/php-cs-fixer": "^3.0",
         "php-amqplib/php-amqplib": "^3.0",
-        "phpstan/phpstan": "^1.9",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.1.0|^11.0",
         "guzzlehttp/guzzle": "^7.8",
         "behat/behat": "^3.13",
         "galbar/jsonpath": "^3.0",
         "ramsey/uuid": "^4.7",
         "pact-foundation/example-protobuf-sync-message-provider": "@dev",
         "webonyx/graphql-php": "^15.14",
-        "rector/rector": "^1.2",
+        "rector/rector": "dev-main as 2.0",
         "clue/framework-x": "^0.16.0"
     },
     "autoload": {

diff --git a/src/PhpPact/FFI/Model/ArrayData.php b/src/PhpPact/FFI/Model/ArrayData.php
@@ -25,7 +25,7 @@ public function getSize(): int
     }
 
     /**
-     * @param array<int, string> $values
+     * @param string[] $values
      */
     public static function createFrom(array $values): ?self
     {
@@ -38,15 +38,16 @@ public static function createFrom(array $values): ?self
         if ($items === null) {
             throw new CDataNotCreatedException();
         }
-        foreach ($values as $index => $value) {
+        $index = 0;
+        foreach ($values as $value) {
             $length = \strlen($value);
             $itemSize = $length + 1;
             $item = FFI::new("char[{$itemSize}]", false);
             if ($item === null) {
                 throw new CDataNotCreatedException();
             }
             FFI::memcpy($item, $value, $length);
-            $items[$index] = $item; // @phpstan-ignore-line
+            $items[$index++] = $item; // @phpstan-ignore-line
         }
 
         return new self($items, $size);

diff --git a/src/PhpPact/Standalone/MockService/MockServerEnvConfig.php b/src/PhpPact/Standalone/MockService/MockServerEnvConfig.php
@@ -36,6 +36,7 @@ public function __construct()
 
         $version = $this->parseEnv('PACT_SPECIFICATION_VERSION');
         if (!$version) {
+            /** @var string */
             $version = static::DEFAULT_SPECIFICATION_VERSION;
         }
 

diff --git a/src/PhpPact/Standalone/StubService/StubServer.php b/src/PhpPact/Standalone/StubService/StubServer.php
@@ -94,9 +94,7 @@ private function getArguments(): array
             $results[] = "--loglevel={$this->config->getLogLevel()}";
         }
 
-        if ($this->config->getPort() !== null) {
-            $results[] = "--port={$this->config->getPort()}";
-        }
+        $results[] = "--port={$this->config->getPort()}";
 
         if ($this->config->getProviderState() !== null) {
             $results[] = "--provider-state={$this->config->getProviderState()}";

diff --git a/tests/PhpPact/Consumer/MessageBuilderTest.php b/tests/PhpPact/Consumer/MessageBuilderTest.php
@@ -135,8 +135,7 @@ public function testSetSingleCallback(): void
         foreach ($callbacks as $callback) {
             $this->assertSame($this->builder, $this->builder->setCallback($callback));
         }
-        $builderCallbacks = $this->getCallbacks();
-        $this->assertSame([end($callbacks)], $builderCallbacks);
+        $this->assertCallbacks([end($callbacks)]);
     }
 
     public function testSetMultipleCallbacks(): void
@@ -150,8 +149,7 @@ public function testSetMultipleCallbacks(): void
         foreach ($callbacks as $description => $callback) {
             $this->assertSame($this->builder, $this->builder->setCallback($callback, $description));
         }
-        $builderCallbacks = $this->getCallbacks();
-        $this->assertSame($callbacks, $builderCallbacks);
+        $this->assertCallbacks($callbacks);
     }
 
     public function testReify(): void
@@ -242,14 +240,13 @@ private function getMessage(): Message
     }
 
     /**
-     * @return array<mixed, callable>
+     * @param callable[] $expectedCallbacks
      */
-    private function getCallbacks(): array
+    private function assertCallbacks(array $expectedCallbacks): void
     {
         $reflection = new ReflectionProperty($this->builder, 'callback');
-        $callback = $reflection->getValue($this->builder);
-        $this->assertIsArray($callback);
-
-        return $callback;
+        $callbacks = $reflection->getValue($this->builder);
+        $this->assertIsArray($callbacks);
+        $this->assertSame($expectedCallbacks, $callbacks);
     }
 }
diff --git a/tests/PhpPact/FFI/ClientTest.php b/tests/PhpPact/FFI/ClientTest.php
@@ -64,19 +64,19 @@ public function testAddTextComment(): void
     public function testNewInteraction(): void
     {
         $result = $this->client->newInteraction(1, 'test');
-        $this->assertIsInt($result);
+        $this->assertNotEmpty($result);
     }
 
     public function testNewMessageInteraction(): void
     {
         $result = $this->client->newMessageInteraction(1, 'test');
-        $this->assertIsInt($result);
+        $this->assertNotEmpty($result);
     }
 
     public function testNewSyncMessageInteraction(): void
     {
         $result = $this->client->newSyncMessageInteraction(1, 'test');
-        $this->assertIsInt($result);
+        $this->assertNotEmpty($result);
     }
 
     public function testGiven(): void
@@ -130,7 +130,7 @@ public function testFreePactHandle(): void
     public function testNewPact(): void
     {
         $result = $this->client->newPact('consumer', 'provider');
-        $this->assertIsInt($result);
+        $this->assertNotEmpty($result);
         $this->client->freePactHandle($result);
     }
 

diff --git a/tests/PhpPact/FFI/Model/ArrayDataTest.php b/tests/PhpPact/FFI/Model/ArrayDataTest.php
@@ -20,7 +20,7 @@ public function testCreateFromArray(): void
         $this->assertInstanceOf(ArrayData::class, $arrayData);
         $this->assertSame(count($branches), $arrayData->getSize());
         foreach ($branches as $index => $branch) {
-            // @phpstan-ignore offsetAccess.nonOffsetAccessible
+            // @phpstan-ignore offsetAccess.nonOffsetAccessible,argument.type
             $this->assertSame($branch, FFI::string($arrayData->getItems()[$index]));
         }
     }

diff --git a/tests/PhpPact/Log/LoggerTest.php b/tests/PhpPact/Log/LoggerTest.php
@@ -67,6 +67,7 @@ public function testClone(): void
     {
         $this->expectException(Error::class);
         $this->expectExceptionMessage('Call to protected PhpPact\Log\Logger::__clone()');
+        // @phpstan-ignore expr.resultUnused
         clone $this->logger;
     }