adjust to promise template annotations

.github/workflows/static.yml

@@ -15,6 +15,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Remove phpspec
+        run: composer remove --dev friends-of-phpspec/phpspec-code-coverage phpspec/phpspec
+
       - name: PHPStan
         uses: docker://oskarstark/phpstan-ga
         with:

composer.json

@@ -20,7 +20,7 @@
     ],
     "require": {
         "php": "^7.1 || ^8.0",
-        "php-http/promise": "^1.1",
+        "php-http/promise": "dev-template-exception as 1.2.2",
         "psr/http-client": "^1.0",
         "psr/http-message": "^1.0 || ^2.0"
     },

src/Exception/RequestAwareTrait.php

@@ -16,9 +16,6 @@ private function setRequest(RequestInterface $request)
         $this->request = $request;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getRequest(): RequestInterface
     {
         return $this->request;

src/HttpAsyncClient.php

@@ -4,6 +4,7 @@
 
 use Http\Promise\Promise;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Sends a PSR-7 Request in an asynchronous way by returning a Promise.
@@ -17,7 +18,7 @@ interface HttpAsyncClient
      *
      * Exceptions related to processing the request are available from the returned Promise.
      *
-     * @return Promise resolves a PSR-7 Response or fails with an Http\Client\Exception
+     * @return Promise<ResponseInterface, Exception> resolves a PSR-7 Response or fails with an Http\Client\Exception
      *
      * @throws \Exception If processing the request is impossible (eg. bad configuration).
      */

src/Promise/HttpFulfilledPromise.php

@@ -6,6 +6,9 @@
 use Http\Promise\Promise;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @implements Promise<ResponseInterface, Exception>
+ */
 final class HttpFulfilledPromise implements Promise
 {
     /**
@@ -18,9 +21,6 @@
         $this->response = $response;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function then(callable $onFulfilled = null, callable $onRejected = null)
     {
         if (null === $onFulfilled) {
@@ -28,26 +28,20 @@
         }
 
         try {
             return new self($onFulfilled($this->response));
         } catch (Exception $e) {
             return new HttpRejectedPromise($e);
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getState()
     {
         return Promise::FULFILLED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function wait($unwrap = true)
     {
         if ($unwrap) {
             return $this->response;
         }
     }

src/Promise/HttpRejectedPromise.php

@@ -4,7 +4,11 @@
 
 use Http\Client\Exception;
 use Http\Promise\Promise;
+use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @implements Promise<ResponseInterface, Exception>
+ */
 final class HttpRejectedPromise implements Promise
 {
     /**
@@ -17,9 +21,6 @@
         $this->exception = $exception;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function then(callable $onFulfilled = null, callable $onRejected = null)
     {
         if (null === $onRejected) {
@@ -32,26 +33,20 @@
                 return $result;
             }
 
             return new HttpFulfilledPromise($result);
         } catch (Exception $e) {
             return new self($e);
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getState()
     {
         return Promise::REJECTED;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function wait($unwrap = true)
     {
         if ($unwrap) {
             throw $this->exception;
         }
     }