From d5523bc728443440f53d65b3dc2cd8f6d81e9861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Tue, 10 Nov 2026 14:59:05 +0100
Subject: [PATCH] Run tests on PHP 8.6 and update test environment

---
 .github/workflows/ci.yml                      | 9 ++++++---
 composer.json                                 | 2 +-
 tests/DuplexResourceStreamIntegrationTest.php | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c7c1b3..42778f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,11 @@ on:
 jobs:
   PHPUnit:
     name: PHPUnit (PHP ${{ matrix.php }})
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix:
         php:
+          - 8.6
           - 8.5
           - 8.4
           - 8.3
@@ -43,7 +44,7 @@ jobs:
       - uses: actions/checkout@v7
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.5
+          php-version: 8.6
           coverage: xdebug
           ini-file: development
       - run: composer install
@@ -52,10 +53,12 @@ jobs:
 
   PHPStan:
     name: PHPStan (PHP ${{ matrix.php }})
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-26.04
     strategy:
       matrix:
         php:
+          - 8.6
+          - 8.5
           - 8.4
           - 8.3
           - 8.2
diff --git a/composer.json b/composer.json
index ccdc075..b644711 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "react/event-loop": "^1.2",
+        "react/event-loop": "^1.6",
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
     },
     "require-dev": {
diff --git a/tests/DuplexResourceStreamIntegrationTest.php b/tests/DuplexResourceStreamIntegrationTest.php
index 2c3d2ed..2131a5c 100644
--- a/tests/DuplexResourceStreamIntegrationTest.php
+++ b/tests/DuplexResourceStreamIntegrationTest.php
@@ -309,7 +309,7 @@ public function testReadsLongChunksFromProcessPipe(callable $condition, callable
 
         $loop = $loopFactory();
 
-        $fh = popen('dd if=/dev/zero bs=12345 count=1234 2>&-', 'r');
+        $fh = popen('dd if=/dev/zero bs=12345 count=1234 2>/dev/null', 'r');
         assert(is_resource($fh));
 
         $stream = new ReadableResourceStream($fh, $loop);