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

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e0f721..f93f1e8 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 remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP
         if: ${{ matrix.php == 5.3 }}
       - run: composer install
@@ -40,6 +42,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 37a0fdf..712abe9 100644
--- a/composer.json
+++ b/composer.json
@@ -12,18 +12,17 @@
     ],
     "require": {
         "php": ">=5.3",
-        "clue/socks-react": "^1.0",
+        "clue/socks-react": "dev-promise-v3 as 1.4.0",
         "react/child-process": "^0.6",
         "react/event-loop": "^1.2",
-        "react/promise": "^2.1 || ^1.2.1",
-        "react/socket": "^1.9",
+        "react/promise": "^3@dev || ^2.1 || ^1.2.1",
+        "react/socket": "dev-promise-3 as 1.12.0",
         "react/stream": "^1.2"
     },
     "require-dev": {
-        "clue/block-react": "^1.3",
+        "clue/block-react": "^1.5",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36",
-        "react/http": "^1.5",
-        "react/mysql": "^0.5.5"
+        "react/mysql": "dev-promise-v3 as 0.5.7"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\SshProxy\\": "src/" },
@@ -31,5 +30,19 @@
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"} 
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/WyriHaximus-labs/socket"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/clue-labs/reactphp-socks"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/clue-labs/mysql"
+        }
+    ]
 }

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

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f93f1e8..9e0f721 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 remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP
         if: ${{ matrix.php == 5.3 }}
       - run: composer install
@@ -42,7 +40,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 712abe9..b732b01 100644
--- a/composer.json
+++ b/composer.json
@@ -12,17 +12,18 @@
     ],
     "require": {
         "php": ">=5.3",
-        "clue/socks-react": "dev-promise-v3 as 1.4.0",
+        "clue/socks-react": "^1.4",
         "react/child-process": "^0.6",
         "react/event-loop": "^1.2",
-        "react/promise": "^3@dev || ^2.1 || ^1.2.1",
-        "react/socket": "dev-promise-3 as 1.12.0",
+        "react/promise": "^3 || ^2.1 || ^1.2.1",
+        "react/socket": "^1.12.0",
         "react/stream": "^1.2"
     },
     "require-dev": {
         "clue/block-react": "^1.5",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36",
-        "react/mysql": "dev-promise-v3 as 0.5.7"
+        "react/http": "^1.5",
+        "react/mysql": "^0.5.5"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\SshProxy\\": "src/" },
@@ -30,19 +31,5 @@
     },
     "autoload-dev": {
         "psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"} 
-    },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/WyriHaximus-labs/socket"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/clue-labs/reactphp-socks"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/clue-labs/mysql"
-        }
-    ]
+    }
 }