From 250935238db3e88c3391b27201a56058b40c346e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 8 Mar 2022 17:10:14 +1300 Subject: [PATCH] DEP Use guzzle 7.3 --- code/tasks/FTFileMakerTask.php | 4 ++-- composer.json | 37 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/code/tasks/FTFileMakerTask.php b/code/tasks/FTFileMakerTask.php index f1008bf..5b19a0b 100644 --- a/code/tasks/FTFileMakerTask.php +++ b/code/tasks/FTFileMakerTask.php @@ -6,7 +6,7 @@ use SilverStripe\Assets\Image; use SilverStripe\Dev\BuildTask; use SilverStripe\ORM\DB; use GuzzleHttp\Client; -use GuzzleHttp\Promise; +use GuzzleHttp\Promise\Utils; use SilverStripe\Security\Member; use SilverStripe\Security\Security; use SilverStripe\Core\Path; @@ -299,7 +299,7 @@ class FTFileMakerTask extends BuildTask // Wait on all of the requests to complete. Throws a ConnectException // if any of the requests fail - Promise\unwrap($promises); + Utils::unwrap($promises); return $paths; } diff --git a/composer.json b/composer.json index bfeb44b..a487203 100644 --- a/composer.json +++ b/composer.json @@ -1,24 +1,23 @@ { - "name": "silverstripe/frameworktest", - "description": "Aids core and module developers in testing their code against a set of sample data and behaviour.", + "name": "silverstripe/frameworktest", + "description": "Aids core and module developers in testing their code against a set of sample data and behaviour.", "type": "silverstripe-vendormodule", - "keywords": ["silverstripe", "frameworktest", "testing"], - "license": "BSD-3-Clause", - "authors": [ - { - "name": "Ingo Schommer", - "email": "ingo@silverstripe.com" - } - ], - "require": - { - "silverstripe/framework": "~4.0", - "silverstripe/cms": "~4.0", - "guzzlehttp/guzzle": "~6.0", - "fzaninotto/faker": "^1.7", - "silverstripe/vendor-plugin": "^1.0", - "silverstripe/registry": "~2" - }, + "keywords": ["silverstripe", "frameworktest", "testing"], + "license": "BSD-3-Clause", + "authors": [ + { + "name": "Ingo Schommer", + "email": "ingo@silverstripe.com" + } + ], + "require": { + "silverstripe/framework": "^4", + "silverstripe/cms": "^4", + "guzzlehttp/guzzle": "^7.3", + "fzaninotto/faker": "^1.7", + "silverstripe/vendor-plugin": "^1", + "silverstripe/registry": "^2" + }, "extra": { "expose": [ "client/dist",