From 685614df95dfd77cb9c6ca830f7ec7dc499772fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Wed, 22 Jun 2022 09:02:32 +0200
Subject: [PATCH 1/2] Forward compatibility with upcoming Promise v3

---
 .github/workflows/ci.yml |  3 +++
 composer.json            | 23 ++++++++++++++++-------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c64ef6a..9db8819 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,8 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: xdebug
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
         if: ${{ matrix.php >= 7.3 }}
@@ -38,6 +40,7 @@ jobs:
     name: PHPUnit (HHVM)
     runs-on: ubuntu-18.04
     continue-on-error: true
+    if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed
     steps:
       - uses: actions/checkout@v2
       - uses: azjezz/setup-hhvm@v1
diff --git a/composer.json b/composer.json
index 03ef7d6..9fe2ddb 100644
--- a/composer.json
+++ b/composer.json
@@ -12,20 +12,29 @@
     ],
     "require": {
         "php": ">=5.3",
-        "react/promise": "^2.1 || ^1.2",
-        "react/socket": "^1.11"
+        "react/promise": "^3@dev || ^2.1 || ^1.2",
+        "react/socket": "dev-promise-3 as 1.12.0"
     },
     "require-dev": {
-        "clue/block-react": "^1.1",
-        "clue/connection-manager-extra": "^1.0 || ^0.7",
+        "clue/block-react": "^1.5",
+        "clue/connection-manager-extra": "dev-promise-v3 as 1.3.0",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-        "react/event-loop": "^1.2",
-        "react/http": "^1.6"
+        "react/event-loop": "^1.2"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Socks\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\Socks\\": "tests/" }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/WyriHaximus-labs/socket"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/clue-labs/reactphp-connection-manager-extra"
+        }
+    ]
 }

From 79117f470e56bcfca2b504aa2173c0a0f434fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Wed, 22 Jun 2022 09:07:09 +0200
Subject: [PATCH 2/2] Update to stable reactphp/socket v1.12.0

---
 .github/workflows/ci.yml |  3 ---
 composer.json            | 21 ++++++---------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9db8819..c64ef6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,8 +28,6 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: xdebug
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
         if: ${{ matrix.php >= 7.3 }}
@@ -40,7 +38,6 @@ jobs:
     name: PHPUnit (HHVM)
     runs-on: ubuntu-18.04
     continue-on-error: true
-    if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed
     steps:
       - uses: actions/checkout@v2
       - uses: azjezz/setup-hhvm@v1
diff --git a/composer.json b/composer.json
index 9fe2ddb..2a26a7a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,29 +12,20 @@
     ],
     "require": {
         "php": ">=5.3",
-        "react/promise": "^3@dev || ^2.1 || ^1.2",
-        "react/socket": "dev-promise-3 as 1.12.0"
+        "react/promise": "^3 || ^2.1 || ^1.2",
+        "react/socket": "^1.12"
     },
     "require-dev": {
         "clue/block-react": "^1.5",
-        "clue/connection-manager-extra": "dev-promise-v3 as 1.3.0",
+        "clue/connection-manager-extra": "^1.3",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-        "react/event-loop": "^1.2"
+        "react/event-loop": "^1.2",
+        "react/http": "^1.6"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Socks\\": "src/" }
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\Socks\\": "tests/" }
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/WyriHaximus-labs/socket"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/clue-labs/reactphp-connection-manager-extra"
-        }
-    ]
+    }
 }