Feature/bump react promise support

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
           - 8080:80
     strategy:
       matrix:
-        php-versions: [ '8.0', '8.1' ]
+        php-versions: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
         composer-options: [ '--prefer-lowest', '']
     runs-on: ubuntu-latest
     steps:

Curl/CurlErrorException.php

@@ -9,9 +9,11 @@
 
 namespace evaisse\SimpleHttpBundle\Curl;
 
+use Exception;
+
 class CurlErrorException extends \RuntimeException
 {
-    public function __construct($message="", $code=0, \Exception $previous=null) {
+    public function __construct($message="", $code=0, ?Exception $previous=null) {
         parent::__construct($message,$code,$previous);
     }
 }

Curl/MultiManager.php

@@ -57,7 +57,8 @@ class MultiManager implements CurlRequest
      * @param boolean $blocking Whether the execution should block until finished or wait until
      *                          the destructor is called to block
      */
-    public function __construct(EventDispatcherInterface $dispatcher=null,$blocking=true) {
+    public function __construct(?EventDispatcherInterface $dispatcher = null, $blocking = true)
+    {
         $this->dispatcher = $dispatcher;
         $this->handle = curl_multi_init();
         $this->blocking = $blocking;

Http/Exception/RequestException.php

@@ -26,7 +26,7 @@ class RequestException extends Exception
      * @param int $code error code
      * @param Exception $previous optionnal previous exception
      */
-    public function __construct(Request $request, $message = "", $code = 0, Exception $previous = null)
+    public function __construct(Request $request, $message = "", $code = 0, ?Exception $previous = null)
     {
         parent::__construct($message, $code, $previous); // TODO: Change the autogenerated stub
         $this->setRequest($request);

Http/Statement.php

@@ -427,7 +427,11 @@ public function onProgress(callable $callable)
      */
     public function onFinish(callable $callable)
     {
-        $this->getPromise()->always($callable);
+        if (method_exists(object_or_class: $this->getPromise(), method: 'finally')) {
+            $this->getPromise()->finally($callable);
+        } else {
+            $this->getPromise()->always($callable);
+        }
         return $this;
     }
 

Service/Helper.php

@@ -58,7 +58,7 @@ public function createCookieJar(?SessionInterface $session = null): SessionCooki
      * @param Kernel|null $client http client proxy to use
      * @return Helper given service list
      */
-    public function execute(array $servicesList, ?SessionCookieJar $cookieJar = null, Kernel $client = null): static
+    public function execute(array $servicesList, ?SessionCookieJar $cookieJar = null, ?Kernel $client = null): static
     {
         $httpClient = $client ? $client : $this->httpKernel;
 

Tests/Unit/AbstractTests.php

@@ -24,6 +24,9 @@ public function __construct(?string $name = null, array $data = [], $dataName =
     }
 
 
+    /**
+     * @return array{0: Helper, 1: Kernel}
+     */
     protected function createContext()
     {
         $eventDispatcher = new EventDispatcher();

Tests/Unit/PromisesTest.php

@@ -8,6 +8,7 @@
 
 namespace evaisse\SimpleHttpBundle\Tests\Unit;
 
+use React\Promise\Promise;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class PromisesTest extends AbstractTests
@@ -37,11 +38,14 @@ public function testPromises($code, $expectedResults)
 
         $events = new \ArrayObject();
 
+        $finallyMethod = method_exists(object_or_class: Promise::class, method: 'always') ? 'always' : 'finally';
+        $catchMethod = method_exists(object_or_class: Promise::class, method: 'catch') ? 'catch' : 'otherwise';
+
         $stmt->getPromise()->then(function () use ($events) {
             $events[] = 'success';
-        })->otherwise(function () use ($events) {
+        })->$catchMethod(function () use ($events) {
             $events[] = 'error';
-        })->done(function () use ($events) {
+        })->$finallyMethod(function () use ($events) {
             $events[] = 'done';
         });
 

composer.json

@@ -14,7 +14,7 @@
   "homepage": "https://github.com/evaisse/SimpleHttpBundle",
   "require": {
     "php": "^8.0",
-    "react/promise": "^2.2",
+    "react/promise": "^2.2 || ^3.0",
     "symfony/http-foundation": "^5.4 || ^6.0",
     "symfony/browser-kit": "^5.4 || ^6.0",
     "symfony/event-dispatcher": "^5.4 || ^6.0",