Merge pull request #8 from swisnl/feature/larastan-3-pest-3

JaZo · web-flow · commit a0d3db4d0394 · 2025-02-24T11:26:06.000+01:00
Larastan 3 and Pest 3
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.3'
           coverage: none
 
       - name: Install composer dependencies
diff --git a/composer.json b/composer.json
@@ -31,14 +31,14 @@
     "require-dev": {
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^7.8|^8.1",
-        "larastan/larastan": "^2.0.1",
+        "larastan/larastan": "^2.9|^3.1",
         "orchestra/testbench": "^8.8|^9.0",
-        "pestphp/pest": "^2.20",
-        "pestphp/pest-plugin-arch": "^2.5",
-        "pestphp/pest-plugin-laravel": "^2.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "pestphp/pest": "^2.36|^3.7",
+        "pestphp/pest-plugin-arch": "^2.7|^3.0",
+        "pestphp/pest-plugin-laravel": "^2.4|^3.1",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-deprecation-rules": "^1.2|^2.0",
+        "phpstan/phpstan-phpunit": "^1.4|^2.0"
     },
     "provide": {
         "psr/http-client-implementation": "1.0"
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,4 +6,5 @@ parameters:
     paths:
         - src
     tmpDir: build/phpstan
-    checkMissingIterableValueType: false
+    checkOctaneCompatibility: true
+    checkModelProperties: true
diff --git a/src/Client.php b/src/Client.php
@@ -34,6 +34,9 @@ public function sendRequest(RequestInterface $request): ResponseInterface
             ->toPsrResponse();
     }
 
+    /**
+     * @param  array<string, mixed>  $options
+     */
     public function send(RequestInterface $request, array $options = []): ResponseInterface
     {
         return $this->newPendingRequest()
@@ -42,6 +45,9 @@ public function send(RequestInterface $request, array $options = []): ResponseIn
             ->toPsrResponse();
     }
 
+    /**
+     * @param  array<string, mixed>  $options
+     */
     public function sendAsync(RequestInterface $request, array $options = []): PromiseInterface
     {
         /** @var \GuzzleHttp\Promise\PromiseInterface */
@@ -51,13 +57,19 @@ public function sendAsync(RequestInterface $request, array $options = []): Promi
             ->send($request->getMethod(), (string) $request->getUri(), array_merge(['body' => $request->getBody()], $options));
     }
 
+    /**
+     * @param  array<string, mixed>  $options
+     */
     public function request(string $method, $uri, array $options = []): ResponseInterface
     {
         return $this->newPendingRequest()
             ->send($method, (string) $uri, $options)
             ->toPsrResponse();
     }
 
+    /**
+     * @param  array<string, mixed>  $options
+     */
     public function requestAsync(string $method, $uri, array $options = []): PromiseInterface
     {
         /** @var \GuzzleHttp\Promise\PromiseInterface */

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ public function sendRequest(RequestInterface $request): ResponseInterface`
`34`	`34`	`->toPsrResponse();`
`35`	`35`	`}`
`36`	`36`
	`37`	`+ /**`
	`38`	`+ * @param array<string, mixed> $options`
	`39`	`+ */`
`37`	`40`	`public function send(RequestInterface $request, array $options = []): ResponseInterface`
`38`	`41`	`{`
`39`	`42`	`return $this->newPendingRequest()`
`@@ -42,6 +45,9 @@ public function send(RequestInterface $request, array $options = []): ResponseIn`
`42`	`45`	`->toPsrResponse();`
`43`	`46`	`}`
`44`	`47`
	`48`	`+ /**`
	`49`	`+ * @param array<string, mixed> $options`
	`50`	`+ */`
`45`	`51`	`public function sendAsync(RequestInterface $request, array $options = []): PromiseInterface`
`46`	`52`	`{`
`47`	`53`	`/** @var \GuzzleHttp\Promise\PromiseInterface */`
`@@ -51,13 +57,19 @@ public function sendAsync(RequestInterface $request, array $options = []): Promi`
`51`	`57`	`->send($request->getMethod(), (string) $request->getUri(), array_merge(['body' => $request->getBody()], $options));`
`52`	`58`	`}`
`53`	`59`
	`60`	`+ /**`
	`61`	`+ * @param array<string, mixed> $options`
	`62`	`+ */`
`54`	`63`	`public function request(string $method, $uri, array $options = []): ResponseInterface`
`55`	`64`	`{`
`56`	`65`	`return $this->newPendingRequest()`
`57`	`66`	`->send($method, (string) $uri, $options)`
`58`	`67`	`->toPsrResponse();`
`59`	`68`	`}`
`60`	`69`
	`70`	`+ /**`
	`71`	`+ * @param array<string, mixed> $options`
	`72`	`+ */`
`61`	`73`	`public function requestAsync(string $method, $uri, array $options = []): PromiseInterface`
`62`	`74`	`{`
`63`	`75`	`/** @var \GuzzleHttp\Promise\PromiseInterface */`