Skip to content

Commit

Permalink
Merge pull request #100 from creative-commoners/pulls/4/guzzle
Browse files Browse the repository at this point in the history
DEP Use guzzle 7.3
  • Loading branch information
Maxime Rainville authored Mar 10, 2022
2 parents df6120e + 2509352 commit f652e8a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
4 changes: 2 additions & 2 deletions code/tasks/FTFileMakerTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
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;
Expand Down Expand Up @@ -299,7 +299,7 @@ protected function downloadFixtureFiles()

// 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;
}
Expand Down
37 changes: 18 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
}
],
"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": "[email protected]"
}
],
"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",
Expand Down

0 comments on commit f652e8a

Please sign in to comment.