tonyair
/
silverstripe-frameworktest
mirror of https://github.com/silverstripe/silverstripe-frameworktest
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent df6120e015 250935238d
commit f652e8a775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/tasks/FTFileMakerTask.php
View File

@ -6,7 +6,7 @@ use SilverStripe\Assets\Image;
use SilverStripe\Dev\BuildTask; use SilverStripe\Dev\BuildTask;
use SilverStripe\ORM\DB; use SilverStripe\ORM\DB;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Promise; use GuzzleHttp\Promise\Utils;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\Core\Path; use SilverStripe\Core\Path;
@ -299,7 +299,7 @@ class FTFileMakerTask extends BuildTask
// Wait on all of the requests to complete. Throws a ConnectException // Wait on all of the requests to complete. Throws a ConnectException
// if any of the requests fail // if any of the requests fail
Promise\unwrap($promises); Utils::unwrap($promises);
return $paths; return $paths;
} }

37
composer.json
View File

@ -1,24 +1,23 @@
{ {
"name": "silverstripe/frameworktest", "name": "silverstripe/frameworktest",
"description": "Aids core and module developers in testing their code against a set of sample data and behaviour.", "description": "Aids core and module developers in testing their code against a set of sample data and behaviour.",
"type": "silverstripe-vendormodule", "type": "silverstripe-vendormodule",
"keywords": ["silverstripe", "frameworktest", "testing"], "keywords": ["silverstripe", "frameworktest", "testing"],
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"authors": [ "authors": [
{ {
"name": "Ingo Schommer", "name": "Ingo Schommer",
"email": "ingo@silverstripe.com" "email": "ingo@silverstripe.com"
} }
], ],
"require": "require": {
{ "silverstripe/framework": "^4",
"silverstripe/framework": "~4.0", "silverstripe/cms": "^4",
"silverstripe/cms": "~4.0", "guzzlehttp/guzzle": "^7.3",
"guzzlehttp/guzzle": "~6.0", "fzaninotto/faker": "^1.7",
"fzaninotto/faker": "^1.7", "silverstripe/vendor-plugin": "^1",
"silverstripe/vendor-plugin": "^1.0", "silverstripe/registry": "^2"
"silverstripe/registry": "~2" },
},
"extra": { "extra": {
"expose": [ "expose": [
"client/dist", "client/dist",