Merge pull request #100 from creative-commoners/pulls/4/guzzle

DEP Use guzzle 7.3
This commit is contained in:
Maxime Rainville 2022-03-11 11:39:13 +13:00 committed by GitHub
commit f652e8a775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 21 deletions

View File

@ -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;
}

View File

@ -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",