From 3db6b81eee52430b14fc6d909ed0f1e9cc0069ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Thu, 21 Dec 2017 20:50:15 +0100
Subject: [PATCH 1/5] Update dependencies to latest supported versions

---
 .gitignore          |  1 +
 composer.json       | 21 ++++++++++-----------
 phpunit.xml.dist    | 14 +++++++++++++-
 tests/bootstrap.php |  5 +++++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c97585f..2866cd9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .subsplit
 vendor
+/composer.lock
diff --git a/composer.json b/composer.json
index 686523b8..b02a7701 100644
--- a/composer.json
+++ b/composer.json
@@ -9,19 +9,18 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "react/cache": "0.4.*",
-        "react/child-process": "0.4.*",
-        "react/dns": "0.4.*",
-        "react/event-loop": "0.4.*",
-        "react/http-client": "0.4.*",
-        "react/http": "0.4.*",
-        "react/promise": "~2.1",
-        "react/socket-client": "^0.5.3",
-        "react/socket": "0.4.*",
-        "react/stream": "0.4.*"
+        "react/cache": "^0.4",
+        "react/child-process": "^0.5",
+        "react/dns": "^0.4",
+        "react/event-loop": "^0.4",
+        "react/http": "^0.8",
+        "react/http-client": "^0.5",
+        "react/promise": "^2.1",
+        "react/socket": "^0.8",
+        "react/stream": "^0.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
+        "phpunit/phpunit": "^4.8.35",
         "clue/block-react": "^1.1",
         "clue/stream-filter": "^1.3"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d7f645a3..956edbe1 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,19 @@
 >
     <testsuites>
         <testsuite name="React Test Suite">
-            <directory>./vendor/react/*/tests/</directory>
+            <directory>./vendor/react/event-loop/tests/</directory>
+            <directory>./vendor/react/stream/tests/</directory>
+            <directory>./vendor/react/promise/tests/</directory>
+            
+            <directory>./vendor/react/socket/tests/</directory>
+            <directory>./vendor/react/datagram/tests/</directory>
+                        
+            <directory>./vendor/react/http/tests/</directory>
+            <directory>./vendor/react/http-client/tests/</directory>
+            <directory>./vendor/react/dns/tests/</directory>
+            
+            <directory>./vendor/react/cache/tests/</directory>
+            <directory>./vendor/react/child-process/tests/</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6105242b..445336f0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -18,5 +18,10 @@
 
 // load all legacy test bootstrap scripts from React's components
 foreach (glob(__DIR__ . '/../vendor/react/*/tests/bootstrap.php') as $b) {
+    // skip react/promise-stream for now
+    if (strpos($b, 'react/promise-stream/tests/bootstrap.php') !== false) {
+        continue;
+    }
+
     include $b;
 }

From c19f9c7964f2c862ff9312d915b25ea543f37b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Fri, 22 Dec 2017 14:05:48 +0100
Subject: [PATCH 2/5] Update react/promise-stream to avoid work arounds for
 test

---
 composer.json       |  1 +
 phpunit.xml.dist    | 14 +-------------
 tests/bootstrap.php |  7 +------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index b02a7701..2a712c8f 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,7 @@
         "react/http": "^0.8",
         "react/http-client": "^0.5",
         "react/promise": "^2.1",
+        "react/promise-stream": "^1.1.1",
         "react/socket": "^0.8",
         "react/stream": "^0.7"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 956edbe1..d7f645a3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,19 +13,7 @@
 >
     <testsuites>
         <testsuite name="React Test Suite">
-            <directory>./vendor/react/event-loop/tests/</directory>
-            <directory>./vendor/react/stream/tests/</directory>
-            <directory>./vendor/react/promise/tests/</directory>
-            
-            <directory>./vendor/react/socket/tests/</directory>
-            <directory>./vendor/react/datagram/tests/</directory>
-                        
-            <directory>./vendor/react/http/tests/</directory>
-            <directory>./vendor/react/http-client/tests/</directory>
-            <directory>./vendor/react/dns/tests/</directory>
-            
-            <directory>./vendor/react/cache/tests/</directory>
-            <directory>./vendor/react/child-process/tests/</directory>
+            <directory>./vendor/react/*/tests/</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 445336f0..fd51842f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -10,7 +10,7 @@
         $base = dirname($b) . '/';
         foreach ($config['autoload-dev']['psr-4'] as $namespace => $paths) {
             foreach ((array)$paths as $path) {
-                $autoload->addPsr4($namespace, $base . trim($path, '\\/'));
+                $autoload->addPsr4($namespace, $base . $path);
             }
         }
     }
@@ -18,10 +18,5 @@
 
 // load all legacy test bootstrap scripts from React's components
 foreach (glob(__DIR__ . '/../vendor/react/*/tests/bootstrap.php') as $b) {
-    // skip react/promise-stream for now
-    if (strpos($b, 'react/promise-stream/tests/bootstrap.php') !== false) {
-        continue;
-    }
-
     include $b;
 }

From 011c284f066ecfde2ef257c85a55e5594549c515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Sun, 24 Dec 2017 12:56:37 +0100
Subject: [PATCH 3/5] Update react/socket component to fix critical bug with
 ext-event

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2a712c8f..ffabf895 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "react/http-client": "^0.5",
         "react/promise": "^2.1",
         "react/promise-stream": "^1.1.1",
-        "react/socket": "^0.8",
+        "react/socket": "^0.8.7",
         "react/stream": "^0.7"
     },
     "require-dev": {

From 38d5bc1f56597ee9cd5c1c136e856426d4442841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Fri, 5 Jan 2018 16:36:32 +0100
Subject: [PATCH 4/5] Update react/http component to fix fragile tests with
 ext-event

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ffabf895..2299470e 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "react/child-process": "^0.5",
         "react/dns": "^0.4",
         "react/event-loop": "^0.4",
-        "react/http": "^0.8",
+        "react/http": "^0.8.1",
         "react/http-client": "^0.5",
         "react/promise": "^2.1",
         "react/promise-stream": "^1.1.1",

From f2ff7e41c83f554fa97844d932a457032a1a446a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Sat, 6 Jan 2018 13:17:35 +0100
Subject: [PATCH 5/5] Update react/socket component to fix flaky online
 integration tests

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2299470e..1a409b27 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "react/http-client": "^0.5",
         "react/promise": "^2.1",
         "react/promise-stream": "^1.1.1",
-        "react/socket": "^0.8.7",
+        "react/socket": "^0.8.8",
         "react/stream": "^0.7"
     },
     "require-dev": {

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/reactphp/reactphp/pull/396.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/reactphp/reactphp/pull/396.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/reactphp/reactphp/pull/396.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/reactphp/reactphp/pull/396.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>