From 9ab36d45980705a4d381f96f16bd14a447ed38ba Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Mar 2020 18:15:24 +0100 Subject: [PATCH] Update composer files. --- composer.json | 14 ++++++++ composer.lock | 90 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 64ab365414..7a35ebb56f 100644 --- a/composer.json +++ b/composer.json @@ -54,6 +54,20 @@ "source": "https://github.com/firefly-iii/firefly-iii", "docs": "https://docs.firefly-iii.org/" }, + "funding": [ + { + "type": "patreon", + "url": "https://www.patreon.com/JC5" + }, + { + "type": "github", + "url": "https://github.com/sponsors/JC5" + }, + { + "type": "paypal", + "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA" + } + ], "require": { "php": ">=7.3.0", "ext-bcmath": "*", diff --git a/composer.lock b/composer.lock index 9767daf171..5d9a1c3b6b 100644 --- a/composer.lock +++ b/composer.lock @@ -1390,16 +1390,16 @@ }, { "name": "laravel/framework", - "version": "v6.18.1", + "version": "v6.18.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a" + "reference": "9425a2f410d05d5bba493f62cff03854a8b19559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/367c2c8dfdfe83cb2ddbc029c0222174098d093a", - "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a", + "url": "https://api.github.com/repos/laravel/framework/zipball/9425a2f410d05d5bba493f62cff03854a8b19559", + "reference": "9425a2f410d05d5bba493f62cff03854a8b19559", "shasum": "" }, "require": { @@ -1484,7 +1484,7 @@ "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "ext-redis": "Required to use the Redis cache and queue drivers.", + "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", "filp/whoops": "Required for friendly error pages in development (^2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0|^7.0).", @@ -1532,7 +1532,7 @@ "framework", "laravel" ], - "time": "2020-03-10T14:11:04+00:00" + "time": "2020-03-17T17:08:02+00:00" }, { "name": "laravel/passport", @@ -1806,33 +1806,33 @@ }, { "name": "league/csv", - "version": "9.5.0", + "version": "9.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "b348d09d0d258a4f068efb50a2510dc63101c213" + "reference": "7351a74625601914409b42b32cabb91a93773b7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/b348d09d0d258a4f068efb50a2510dc63101c213", - "reference": "b348d09d0d258a4f068efb50a2510dc63101c213", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/7351a74625601914409b42b32cabb91a93773b7b", + "reference": "7351a74625601914409b42b32cabb91a93773b7b", "shasum": "" }, "require": { - "ext-dom": "*", "ext-json": "*", "ext-mbstring": "*", - "php": ">=7.0.10" + "php": "^7.2.5" }, "require-dev": { "ext-curl": "*", - "friendsofphp/php-cs-fixer": "^2.12", - "phpstan/phpstan": "^0.9.2", - "phpstan/phpstan-phpunit": "^0.9.4", - "phpstan/phpstan-strict-rules": "^0.9.0", - "phpunit/phpunit": "^6.0" + "friendsofphp/php-cs-fixer": "^2.16", + "phpstan/phpstan": "^0.12.0", + "phpstan/phpstan-phpunit": "^0.12.0", + "phpstan/phpstan-strict-rules": "^0.12.0", + "phpunit/phpunit": "^8.0" }, "suggest": { + "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes", "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters" }, "type": "library", @@ -1861,17 +1861,25 @@ "role": "Developer" } ], - "description": "Csv data manipulation made easy in PHP", + "description": "CSV data manipulation made easy in PHP", "homepage": "http://csv.thephpleague.com", "keywords": [ + "convert", "csv", "export", "filter", "import", "read", + "transform", "write" ], - "time": "2019-12-15T19:51:41+00:00" + "funding": [ + { + "url": "https://github.com/sponsors/nyamsprod", + "type": "github" + } + ], + "time": "2020-03-17T15:15:35+00:00" }, { "name": "league/event", @@ -1925,16 +1933,16 @@ }, { "name": "league/flysystem", - "version": "1.0.65", + "version": "1.0.66", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8" + "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8f17b3ba67097aafb8318cd5c553b1acf7c891c8", - "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", + "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", "shasum": "" }, "require": { @@ -2005,7 +2013,13 @@ "sftp", "storage" ], - "time": "2020-03-08T18:53:20+00:00" + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], + "time": "2020-03-17T18:58:12+00:00" }, { "name": "league/flysystem-replicate-adapter", @@ -5230,7 +5244,7 @@ }, { "name": "tightenco/collect", - "version": "v7.1.2", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/tightenco/collect.git", @@ -6975,12 +6989,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "f0eca1ac3194cc94726f0bb366672f38629272b4" + "reference": "b81a572cb1acffadea621e55c95af4ba94a91624" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f0eca1ac3194cc94726f0bb366672f38629272b4", - "reference": "f0eca1ac3194cc94726f0bb366672f38629272b4", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/b81a572cb1acffadea621e55c95af4ba94a91624", + "reference": "b81a572cb1acffadea621e55c95af4ba94a91624", "shasum": "" }, "conflict": { @@ -7038,6 +7052,7 @@ "firebase/php-jwt": "<2", "fooman/tcpdf": "<6.2.22", "fossar/tcpdf-parser": "<6.2.22", + "friendsofsymfony/oauth2-php": "<1.3", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", "fuel/core": "<1.8.1", @@ -7049,6 +7064,7 @@ "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", "illuminate/database": ">=4,<4.0.99|>=4.1,<4.1.29", "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", + "illuminate/view": ">=7,<7.1.2", "ivankristianto/phpwhois": "<=4.3", "james-heinrich/getid3": "<1.9.9", "joomla/session": "<1.3.1", @@ -7056,7 +7072,7 @@ "kazist/phpwhois": "<=4.2.6", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", - "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30", + "laravel/framework": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.42|>=5.6,<5.6.30|>=7,<7.1.2", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", "librenms/librenms": "<1.53", @@ -7120,6 +7136,7 @@ "socalnick/scn-social-auth": "<1.15.2", "spoonity/tcpdf": "<6.2.22", "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", + "ssddanbrown/bookstack": "<0.25.3", "stormpath/sdk": ">=0,<9.9.99", "studio-42/elfinder": "<2.1.49", "swiftmailer/swiftmailer": ">=4,<5.4.5", @@ -7227,7 +7244,17 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2020-03-03T17:52:54+00:00" + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", + "type": "tidelift" + } + ], + "time": "2020-03-15T11:13:32+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -8099,5 +8126,6 @@ "ext-tokenizer": "*", "ext-xml": "*" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" }