fix issues with newer depdendencies removing some functions

src/ApiClient.php

@@ -4,7 +4,7 @@
 
 use eLife\ApiClient\HttpClient\UserAgentPrependingHttpClient;
 use GuzzleHttp\Promise\PromiseInterface;
-use function GuzzleHttp\Psr7\build_query;
+use GuzzleHttp\Psr7\Query;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\StreamInterface;
@@ -64,7 +64,7 @@ final protected function putRequest(
     final protected function createUri(array $parts) : UriInterface
     {
         if (!empty($parts['query'])) {
-            $parts['query'] = build_query(array_filter($parts['query']), false);
+            $parts['query'] = Query::build(array_filter($parts['query']), false);
         }
 
         return Uri::fromParts($parts);

src/HttpClient/BatchingHttpClient.php

@@ -3,8 +3,8 @@
 namespace eLife\ApiClient\HttpClient;
 
 use eLife\ApiClient\HttpClient;
-use function GuzzleHttp\Promise\all;
 use GuzzleHttp\Promise\PromiseInterface;
+use GuzzleHttp\Promise\Utils;
 use Psr\Http\Message\RequestInterface;
 
 final class BatchingHttpClient implements HttpClient
@@ -40,7 +40,7 @@ private function filterResolvedRequests()
 
     private function waitOnBatch()
     {
-        all($this->batch)->wait();
+        Utils::all($this->batch)->wait();
 
         $this->batch = [];
     }

src/HttpClient/ForbiddingHttpClient.php

@@ -4,14 +4,14 @@
 
 use eLife\ApiClient\Exception\UnintendedInteraction;
 use eLife\ApiClient\HttpClient;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Promise\PromiseInterface;
-use function GuzzleHttp\Promise\rejection_for;
 use Psr\Http\Message\RequestInterface;
 
 final class ForbiddingHttpClient implements HttpClient
 {
     public function send(RequestInterface $request) : PromiseInterface
     {
-        return rejection_for(new UnintendedInteraction('Forbidden call', $request));
+        return Create::rejectionFor(new UnintendedInteraction('Forbidden call', $request));
     }
 }

src/HttpClient/Guzzle6HttpClient.php

@@ -16,7 +16,7 @@
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
-use function GuzzleHttp\Promise\exception_for;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Promise\PromiseInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -41,7 +41,7 @@ function (ResponseInterface $response) {
                 }
             )->otherwise(
                 function ($reason) {
-                    $e = exception_for($reason);
+                    $e = Create::exceptionFor($reason);
 
                     if ($e instanceof BadResponseException) {
                         if ('application/problem+json' === $e->getResponse()->getHeaderLine('Content-Type')) {

src/Log/HttpMessageProcessor.php

@@ -4,7 +4,7 @@
 
 use eLife\ApiClient\Exception\BadResponse;
 use eLife\ApiClient\Exception\HttpProblem;
-use GuzzleHttp\Psr7;
+use GuzzleHttp\Psr7\Message;
 use Psr\Http\Message\MessageInterface;
 
 final class HttpMessageProcessor
@@ -26,6 +26,6 @@ public function __invoke(array $record)
 
     private function dumpHttpMessage(MessageInterface $message)
     {
-        return str_replace("\r", '', Psr7\str($message));
+        return str_replace("\r", '', Message::toString($message));
     }
 }

src/MediaType.php

@@ -3,7 +3,7 @@
 namespace eLife\ApiClient;
 
 use Assert\Assertion;
-use function GuzzleHttp\Psr7\parse_header;
+use GuzzleHttp\Psr7\Header;
 
 final class MediaType
 {
@@ -23,7 +23,7 @@ public static function fromString(string $header)
     {
         Assertion::notBlank($header, 'Media type is blank');
 
-        $contentType = parse_header($header)[0];
+        $contentType = Header::parse($header)[0];
 
         Assertion::keyExists($contentType, 0, "'$header' is not a valid media type");
         Assertion::keyExists($contentType, 'version', "Media type '$header' is missing a version parameter");

src/Result/ArrayResult.php

@@ -8,7 +8,7 @@
 use eLife\ApiClient\Result;
 use Iterator;
 use IteratorAggregate;
-use function JmesPath\search;
+use JmesPath\Env;
 
 final class ArrayResult implements IteratorAggregate, Result
 {
@@ -37,7 +37,7 @@ public function search(string $expression)
             throw new BadMethodCallException('Requires mtdowling/jmespath.php');
         }
 
-        return search($expression, $this->data);
+        return Env::search($expression, $this->data);
     }
 
     public function offsetExists($offset) : bool

src/Result/HttpResult.php

@@ -7,7 +7,6 @@
 use InvalidArgumentException;
 use Iterator;
 use IteratorAggregate;
-use function JmesPath\search;
 use Psr\Http\Message\ResponseInterface;
 use UnexpectedValueException;
 

test/HttpClient/NotifyingHttpClientTest.php

@@ -4,7 +4,7 @@
 
 use eLife\ApiClient\HttpClient;
 use PHPUnit\Framework\TestCase;
-use function GuzzleHttp\Promise\promise_for;
+use GuzzleHttp\Promise\Create;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
 use RuntimeException;
@@ -34,7 +34,7 @@ public function it_allows_listeners_to_monitor_requests()
         $this->originalClient->expects($this->once())
             ->method('send')
             ->with($request)
-            ->will($this->returnValue(promise_for($response)));
+            ->will($this->returnValue(Create::promiseFor($response)));
         $this->sentRequests = [];
         $this->client->addRequestListener(function ($request) {
             $this->sentRequests[] = $request;