From 743f9119a624490473d7479c1d75a083dc072ff2 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Sun, 5 Jul 2020 09:46:57 +0800 Subject: [PATCH] upgrade dependencies --- composer.json | 2 +- composer.lock | 105 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 85 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index 6037053e..016453ac 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "erusev/parsedown": "^1.7", "facade/ignition": "^2.0", "gregwar/captcha": "1.*", - "guzzlehttp/guzzle": "^6.3", + "guzzlehttp/guzzle": "^7.0", "intervention/image": "^2.5", "laravel/framework": "^7.0", "laravel/passport": "^9.2", diff --git a/composer.lock b/composer.lock index bf957c41..904df3df 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "acd5824d113ee88d35694b130b2fd465", + "content-hash": "ee267a786a1a9a0c93991abead0718f7", "packages": [ { "name": "blessing/filter", @@ -1298,37 +1298,44 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.5.5", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" + "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2", + "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "php": "^7.2.5", + "psr/http-client": "^1.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "ergebnis/composer-normalize": "^2.0", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "php-http/client-integration-tests": "dev-phpunit8", + "phpunit/phpunit": "^8.5.5", "psr/log": "^1.1" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.0-dev" } }, "autoload": { @@ -1348,6 +1355,11 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "Guzzle is a PHP HTTP client library", @@ -1358,10 +1370,12 @@ "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], - "time": "2020-06-16T21:01:06+00:00" + "time": "2020-06-27T10:33:25+00:00" }, { "name": "guzzlehttp/promises", @@ -1708,16 +1722,16 @@ }, { "name": "laravel/framework", - "version": "v7.17.1", + "version": "v7.18.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6633c4017b311d3aaae842edabd567c637afc39c" + "reference": "116b508bafd81de97b1c09744445d32a91076b60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6633c4017b311d3aaae842edabd567c637afc39c", - "reference": "6633c4017b311d3aaae842edabd567c637afc39c", + "url": "https://api.github.com/repos/laravel/framework/zipball/116b508bafd81de97b1c09744445d32a91076b60", + "reference": "116b508bafd81de97b1c09744445d32a91076b60", "shasum": "" }, "require": { @@ -1861,26 +1875,26 @@ "framework", "laravel" ], - "time": "2020-06-23T15:22:07+00:00" + "time": "2020-06-30T13:52:36+00:00" }, { "name": "laravel/passport", - "version": "v9.2.1", + "version": "v9.3.0", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "0931d75235283d651b767d291a79cafba5d6ce68" + "reference": "724acaea99204728a1baf7b9b730bf97debbf94c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/0931d75235283d651b767d291a79cafba5d6ce68", - "reference": "0931d75235283d651b767d291a79cafba5d6ce68", + "url": "https://api.github.com/repos/laravel/passport/zipball/724acaea99204728a1baf7b9b730bf97debbf94c", + "reference": "724acaea99204728a1baf7b9b730bf97debbf94c", "shasum": "" }, "require": { "ext-json": "*", "firebase/php-jwt": "^5.0", - "guzzlehttp/guzzle": "^6.0", + "guzzlehttp/guzzle": "^6.0|^7.0", "illuminate/auth": "^6.0|^7.0", "illuminate/console": "^6.0|^7.0", "illuminate/container": "^6.0|^7.0", @@ -1934,7 +1948,7 @@ "oauth", "passport" ], - "time": "2020-05-14T08:24:43+00:00" + "time": "2020-06-30T20:21:17+00:00" }, { "name": "lcobucci/jwt", @@ -3153,6 +3167,55 @@ ], "time": "2019-01-08T18:20:26+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-factory", "version": "1.0.1",