IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-22 08:56:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into dependabot/composer/develop/phpunit/phpunit-9.2.6

Browse Source
This commit is contained in:
James Cole 2020-07-29 09:11:36 +00:00 committed by GitHub
commit c5e0ced4bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 91 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -89,7 +89,7 @@
"fideloper/proxy": "4.*",
"jc5/google2fa-laravel": "2.0.5",
"laravel/framework": "^7.0",
"laravel/passport": "8.*",
"laravel/passport": "9.*",
"laravel/ui": "^2.0",
"laravelcollective/html": "6.*",
"league/commonmark": "1.*",

117
composer.lock generated
View File

@ -1099,37 +1099,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": {
@ -1149,6 +1156,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",
@ -1159,10 +1171,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",
@ -1674,33 +1688,33 @@
},
{
"name": "laravel/passport",
"version": "v8.5.0",
"version": "v9.3.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
"reference": "6affa6ed600c5f8909385fbae7cf6f8af3db2d39"
"reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/6affa6ed600c5f8909385fbae7cf6f8af3db2d39",
"reference": "6affa6ed600c5f8909385fbae7cf6f8af3db2d39",
"url": "https://api.github.com/repos/laravel/passport/zipball/192fe387c1c173c12f82784e2a1b51be8bd1bf45",
"reference": "192fe387c1c173c12f82784e2a1b51be8bd1bf45",
"shasum": ""
},
"require": {
"ext-json": "*",
"firebase/php-jwt": "^3.0|^4.0|^5.0",
"guzzlehttp/guzzle": "^6.0",
"illuminate/auth": "^6.0|^7.0",
"illuminate/console": "^6.0|^7.0",
"illuminate/container": "^6.0|^7.0",
"illuminate/contracts": "^6.0|^7.0",
"illuminate/cookie": "^6.0|^7.0",
"illuminate/database": "^6.0|^7.0",
"illuminate/encryption": "^6.0|^7.0",
"illuminate/http": "^6.0|^7.0",
"illuminate/support": "^6.0|^7.0",
"firebase/php-jwt": "^5.0",
"guzzlehttp/guzzle": "^6.0|^7.0",
"illuminate/auth": "^6.18.31|^7.22.4",
"illuminate/console": "^6.18.31|^7.22.4",
"illuminate/container": "^6.18.31|^7.22.4",
"illuminate/contracts": "^6.18.31|^7.22.4",
"illuminate/cookie": "^6.18.31|^7.22.4",
"illuminate/database": "^6.18.31|^7.22.4",
"illuminate/encryption": "^6.18.31|^7.22.4",
"illuminate/http": "^6.18.31|^7.22.4",
"illuminate/support": "^6.18.31|^7.22.4",
"laminas/laminas-diactoros": "^2.2",
"league/oauth2-server": "^8.0",
"league/oauth2-server": "^8.1",
"nyholm/psr7": "^1.0",
"php": "^7.2",
"phpseclib/phpseclib": "^2.0",
@ -1714,7 +1728,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "8.x-dev"
"dev-master": "9.x-dev"
},
"laravel": {
"providers": [
@ -1743,7 +1757,7 @@
"oauth",
"passport"
],
"time": "2020-05-05T14:25:53+00:00"
"time": "2020-07-27T18:34:39+00:00"
},
{
"name": "laravel/ui",
@ -3412,6 +3426,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",