Use CombinedCancellationToken from Amp v2.2.0

I've moved the current implementation into the amphp/amp package and made it non-internal.
amphp · Aug 2, 2019 · 0eb48fe · 0eb48fe
1 parent b416ab9
commit 0eb48fe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 85 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "amphp/amp": "^2",
+        "amphp/amp": "^2.2",
         "amphp/byte-stream": "^1.6",
         "amphp/hpack": "^2",
         "amphp/http": "^1.3",

diff --git a/src/Connection/DefaultConnectionPool.php b/src/Connection/DefaultConnectionPool.php
@@ -5,7 +5,7 @@
 use Amp\ByteStream\StreamException;
 use Amp\CancellationToken;
 use Amp\CancelledException;
-use Amp\Http\Client\Internal\CombinedCancellationToken;
+use Amp\CombinedCancellationToken;
 use Amp\Http\Client\Request;
 use Amp\Http\Client\SocketException;
 use Amp\Http\Client\TimeoutException;

diff --git a/src/Connection/Http1Connection.php b/src/Connection/Http1Connection.php
@@ -7,12 +7,12 @@
 use Amp\CancellationToken;
 use Amp\CancellationTokenSource;
 use Amp\CancelledException;
+use Amp\CombinedCancellationToken;
 use Amp\Deferred;
 use Amp\Emitter;
 use Amp\Http;
 use Amp\Http\Client\Connection\Internal\Http1Parser;
 use Amp\Http\Client\HttpException;
-use Amp\Http\Client\Internal\CombinedCancellationToken;
 use Amp\Http\Client\Internal\ResponseBodyStream;
 use Amp\Http\Client\ParseException;
 use Amp\Http\Client\Request;

diff --git a/src/Internal/CombinedCancellationToken.php b/src/Internal/CombinedCancellationToken.php