Merge pull request #30 from php-service-bus/master

update amphp version to 2.6 & update dependencies
phpinnacle · Dec 4, 2021 · 97d2750 · 97d2750
2 parents b362ee6 + bafab44
commit 97d2750
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 34 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -41,7 +41,7 @@ jobs:
         run: composer install -ov
 
       - name: Run phpstan/phpstan
-        run: ./vendor/bin/phpstan analyse src --level 7
+        run: ./vendor/bin/phpstan analyse src --level 9
 
   phpunit:
     name: PHPUnit

diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
   ],
   "require": {
     "php": ">=8.0",
-    "amphp/amp": "v2.5.*",
+    "amphp/amp": "v2.6.*",
     "amphp/socket": "v1.1.*",
     "phpinnacle/buffer": "v1.2.*"
   },
   "require-dev": {
     "phpunit/phpunit": "v9.5.*",
-    "vimeo/psalm": "v4.3.*",
-    "phpstan/phpstan": "v0.12.*"
+    "vimeo/psalm": "v4.13.*",
+    "phpstan/phpstan": "v1.2.*"
   },
   "prefer-stable": true,
   "autoload": {
@@ -41,7 +41,7 @@
   },
   "scripts": {
     "psalm": "./vendor/bin/psalm --config=psalm.xml",
-    "phpstan": "./vendor/bin/phpstan analyse src --level 7",
+    "phpstan": "./vendor/bin/phpstan analyse src --level 9",
     "tests": "./vendor/bin/phpunit --configuration phpunit.xml --verbose",
     "coverage": "./vendor/bin/phpunit --configuration phpunit.xml --coverage-html ./coverage --verbose"
   },

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,13 +1,5 @@
 parameters:
-    checkGenericClassInNonGenericObjectType: false
-    checkMissingIterableValueType: false
-    ignoreErrors:
-        -
-            message: '#Unable to resolve the template type#'
-            path: %currentWorkingDirectory%/src
-        -
-            message: '#AbstractFrame given#'
-            path: %currentWorkingDirectory%/src/Channel.php
-        -
-            message: '#AbstractFrame given#'
-            path: %currentWorkingDirectory%/src/Client.php
+	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
+	ignoreErrors:
+		- '#Cannot cast mixed to int#'
diff --git a/psalm.xml b/psalm.xml
@@ -3,7 +3,6 @@
         totallyTyped="true"
         useDocblockTypes="true"
         useDocblockPropertyTypes="true"
-        allowPhpStormGenerics="true"
         strictBinaryOperands="true"
         findUnusedPsalmSuppress="true"
         ignoreInternalFunctionFalseReturn="false"
@@ -21,5 +20,6 @@
 
     <issueHandlers>
         <PropertyNotSetInConstructor errorLevel="suppress"/>
+        <UnnecessaryVarAnnotation errorLevel="suppress"/>
     </issueHandlers>
 </psalm>
diff --git a/src/Channel.php b/src/Channel.php
@@ -1108,6 +1108,7 @@ public function doPublish
         $buffer->appendUint8(206);
 
         if (!empty($body)) {
+            /* @phpstan-ignore-next-line */
             $chunks = \str_split($body, $this->properties->maxFrame());
 
             if ($chunks !== false) {
@@ -1126,23 +1127,20 @@ public function doPublish
     }
 
     /**
-     * @template T
+     * @template T of Protocol\AbstractFrame
      * @psalm-param class-string<T> $frame
      * @psalm-return Promise<T>
-     *
-     * @return Promise<Protocol\AbstractFrame>
      */
     private function await(string $frame): Promise
     {
         /** @psalm-var Deferred<T> $deferred */
         $deferred = new Deferred;
 
-        /** @psalm-var class-string<Protocol\AbstractFrame> $frame */
-
         $this->connection->subscribe(
             $this->id,
             $frame,
             static function (Protocol\AbstractFrame $frame) use ($deferred) {
+                /** @psalm-var T $frame */
                 $deferred->resolve($frame);
 
                 return true;

diff --git a/src/Client.php b/src/Client.php
@@ -158,7 +158,7 @@ function () use ($code, $reason) {
                 if ($code === 0) {
                     $promises = [];
 
-                    foreach ($this->channels as $id => $channel) {
+                    foreach ($this->channels as $channel) {
                         $promises[] = $channel->close($code, $reason);
                     }
 
@@ -400,7 +400,7 @@ private function findChannelId(): int
     }
 
     /**
-     * @template T
+     * @template T of Protocol\AbstractFrame
      * @psalm-param class-string<T> $frame
      * @psalm-return Promise<T>
      */
@@ -409,12 +409,11 @@ private function await(string $frame, int $channel = 0): Promise
         /** @psalm-var Deferred<T> $deferred */
         $deferred = new Deferred;
 
-        /** @psalm-var class-string<Protocol\AbstractFrame> $frame */
-
         $this->connection->subscribe(
             $channel,
             $frame,
             static function (Protocol\AbstractFrame $frame) use ($deferred) {
+                /** @psalm-var T $frame */
                 $deferred->resolve($frame);
 
                 return true;

diff --git a/src/Connection.php b/src/Connection.php
@@ -137,12 +137,9 @@ function () {
                             $this->parser->append($chunk);
 
                             while ($frame = $this->parser->parse()) {
-                                /** @var AbstractFrame $frame */
-
                                 $class = \get_class($frame);
 
                                 /**
-                                 * @psalm-var int $i
                                  * @psalm-var callable(AbstractFrame):Promise<bool> $callback
                                  */
                                 foreach ($this->callbacks[(int)$frame->channel][$class] ?? [] as $i => $callback) {

diff --git a/src/Properties.php b/src/Properties.php
@@ -71,10 +71,10 @@ public function __construct(string $platform, string $product, string $version,
 
     /**
      * @psalm-param array{
-     *     platform: string,
-     *     product: string,
-     *     version: string,
-     *     capabilities: array<string, bool>
+     *     platform: string|null,
+     *     product: string|null,
+     *     version: string|null,
+     *     capabilities: array<string, bool>|null
      * } $config
      */
     public static function create(array $config): self