From aa1d67704df693aa24a7a3d363afe49e0a84a087 Mon Sep 17 00:00:00 2001 From: Frank de Jonge Date: Thu, 20 Oct 2022 15:05:16 +0200 Subject: [PATCH] Ensure simple-s3 1.1 is installed --- composer.json | 2 +- src/AsyncAwsS3/S3ClientStub.php | 2 +- src/AsyncAwsS3/composer.json | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b2b814c4e..16691ccc4 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "async-aws/s3": "^1.5", - "async-aws/simple-s3": "^1.0", + "async-aws/simple-s3": "^1.1", "sabre/dav": "^4.3.1" }, "conflict": { diff --git a/src/AsyncAwsS3/S3ClientStub.php b/src/AsyncAwsS3/S3ClientStub.php index af07df602..93002a48e 100644 --- a/src/AsyncAwsS3/S3ClientStub.php +++ b/src/AsyncAwsS3/S3ClientStub.php @@ -51,7 +51,7 @@ class S3ClientStub extends SimpleS3Client */ private $stagedResult = []; - public function __construct(S3Client $client) + public function __construct(SimpleS3Client $client) { $this->actualClient = $client; parent::__construct([], null, new MockHttpClient()); diff --git a/src/AsyncAwsS3/composer.json b/src/AsyncAwsS3/composer.json index 03597e1b1..b0959613f 100644 --- a/src/AsyncAwsS3/composer.json +++ b/src/AsyncAwsS3/composer.json @@ -15,10 +15,11 @@ "async-aws/s3": "^1.5" }, "require-dev": { - "async-aws/simple-s3": "^1.0" + "async-aws/simple-s3": "^1.1" }, "conflict": { - "symfony/http-client": "<5.2" + "symfony/http-client": "<5.2", + "async-aws/simple-s3": "<1.1" }, "license": "MIT", "authors": [