From 83dd170dcb8af3c6dfa68672c1e768747e84c90a Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 20 Dec 2019 08:25:46 +0100 Subject: [PATCH] Update libraries. --- app/Providers/FireflyServiceProvider.php | 8 +- composer.json | 13 +- composer.lock | 462 +++++++---------------- config/app.php | 2 +- 4 files changed, 157 insertions(+), 328 deletions(-) diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index 392e42ce97..ec57adec7b 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -66,7 +66,7 @@ use FireflyIII\Support\Twig\Translation; use FireflyIII\Validation\FireflyValidator; use Illuminate\Support\ServiceProvider; use Twig; -use Twig_Extension_Debug; +use Twig\Extension\DebugExtension; use TwigBridge\Extension\Loader\Functions; use Validator; @@ -90,14 +90,14 @@ class FireflyServiceProvider extends ServiceProvider return new FireflyValidator($translator, $data, $rules, $messages); } ); - $config = app('config'); - Twig::addExtension(new Functions($config)); + //$config = app('config'); + //Twig::addExtension(new Functions($config)); Twig::addExtension(new General); Twig::addExtension(new TransactionGroupTwig); Twig::addExtension(new Translation); Twig::addExtension(new Rule); Twig::addExtension(new AmountFormat); - Twig::addExtension(new Twig_Extension_Debug); + //Twig::addExtension(new DebugExtension); } /** diff --git a/composer.json b/composer.json index 0f68c36c67..7e009ef0cf 100644 --- a/composer.json +++ b/composer.json @@ -71,14 +71,13 @@ "adldap2/adldap2-laravel": "6.*", "bacon/bacon-qr-code": "1.*", "bunq/sdk_php": "dev-master", - "danhunsaker/laravel-flysystem-others": "1.*", "davejamesmiller/laravel-breadcrumbs": "5.*", "doctrine/dbal": "2.*", "fideloper/proxy": "4.*", "jc5/google2fa-laravel": "2.0.3", - "laravel/framework": "5.8.*", - "laravel/passport": "7.*", - "laravelcollective/html": "5.8.*", + "laravel/framework": "^6.0", + "laravel/passport": "8.*", + "laravelcollective/html": "6.*", "league/commonmark": "1.*", "league/csv": "9.*", "league/flysystem-replicate-adapter": "1.*", @@ -86,16 +85,16 @@ "league/fractal": "0.*", "litipk/flysystem-fallback-adapter": "0.*", "mschindler83/fints-hbci-php": "1.*", - "pragmarx/google2fa": "6.1.3", + "pragmarx/google2fa": "^7.0", "pragmarx/recovery": "^0.1.0", "predis/predis": "^1.1", - "rcrowe/twigbridge": "0.9.*" + "rcrowe/twigbridge": "^0.11.2" }, "require-dev": { "barryvdh/laravel-ide-helper": "2.*", "filp/whoops": "2.*", "fzaninotto/faker": "1.*", - "johnkary/phpunit-speedtrap": "^3.0", + "johnkary/phpunit-speedtrap": "^3.1", "mockery/mockery": "1.*", "phpunit/phpunit": "8.*", "roave/security-advisories": "dev-master" diff --git a/composer.lock b/composer.lock index 1b06c6729e..2cb43071ac 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": "1e3454ca8ca83a4e72686abb44c79d67", + "content-hash": "e0b59edc736110ad9b968c6c46c1f740", "packages": [ { "name": "adldap2/adldap2", @@ -229,178 +229,6 @@ ], "time": "2019-09-16T07:15:00+00:00" }, - { - "name": "danhunsaker/laravel-flysystem-others", - "version": "v1.3.5", - "source": { - "type": "git", - "url": "https://github.com/danhunsaker/laravel-flysystem-others.git", - "reference": "46f06b924e1030c68c9021af3f802e5ce4807916" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/danhunsaker/laravel-flysystem-others/zipball/46f06b924e1030c68c9021af3f802e5ce4807916", - "reference": "46f06b924e1030c68c9021af3f802e5ce4807916", - "shasum": "" - }, - "require": { - "danhunsaker/laravel-flysystem-service": "^1.1", - "illuminate/filesystem": "^5.0", - "illuminate/support": "^5.0", - "league/flysystem": "^1.0" - }, - "suggest": { - "aliyuncs/aliyun-oss-flysystem": "One of the options to use the 'oss' adapter (^1.2)", - "aobozhang/aliyun-oss-adapter": "One of the options to use the 'oss' adapter (^1.0)", - "apollopy/flysystem-aliyun-oss": "One of the options to use the 'oss' adapter (^1.2)", - "argentcrusade/flysystem-selectel": "Required to use the 'selectel' adapter (^1.2)", - "arhitector/yandex-disk-flysystem": "Required to use the 'yandex' adapter (^1.0)", - "boofw/flysystem-qiniu": "One of the options to use the 'qiniu' adapter (^1.0)", - "carlosocarvalho/flysystem-cloudinary": "One of the options to use the 'cloudinary' adapter (^1.0)", - "cedricziel/flysystem-gcs": "One of the options to use the 'google' adapter (^2.0)", - "danhunsaker/flysystem-redis": "Required to use the 'redis' adapter (^1.0)", - "emgag/flysystem-tempdir": "Required to use the 'temp' adapter (^0.1)", - "engineor/flysystem-runabove": "Required to use the 'runabove' adapter (^1.0)", - "enl/flysystem-cloudinary": "One of the options to use the 'cloudinary' adapter (^1.1)", - "eqingdan/flysystem-qiniu": "One of the options to use the 'qiniu' adapter (^0.1)", - "freyo/flysystem-qcloud-cos-v3": "One of the options to use the 'qcloud' adapter (^)", - "freyo/flysystem-qcloud-cos-v4": "One of the options to use the 'qcloud' adapter (^)", - "freyo/flysystem-qcloud-cos-v5": "One of the options to use the 'qcloud' adapter (^)", - "ignited/flysystem-google-drive": "One of the options to use the 'gdrive' adapter (dev-master)", - "ignited/flysystem-onedrive": "One of the options to use the 'onedrive' adapter (dev-master)", - "integral/flysystem-pdo-adapter": "One of the options to use the 'pdo' adapter (^1.0)", - "jacekbarecki/flysystem-onedrive": "One of the options to use the 'onedrive' adapter (^1.0)", - "jellybool/flysystem-upyun": "Required to use the 'upyun' adapter (^1.0)", - "kapersoft/flysystem-sharefile": "Required to use the 'sharefile' adapter (^1.1)", - "litipk/flysystem-fallback-adapter": "Required to use the 'fallback' adapter, and with league/flysystem-replicate-adapter, the 'mirror' adapter (^0.1)", - "mgriego/flysystem-clamav": "Scans files for viruses before storing them on an actual filesystem (^1.0)", - "mhetreramesh/flysystem-backblaze": "Required to use the 'backblaze' adapter (^1.1)", - "monster/flysystem-aliyun-oss": "One of the options to use the 'oss' adapter, but not recommended, since it uses the League namespace without being a Leage package (^1.0)", - "nao-pon/flysystem-google-drive": "One of the options to use the 'gdrive' adapter (^1.1)", - "nicolasbeauvais/flysystem-onedrive": "One of the options to use the 'onedrive' adapter (^1.0)", - "nimbusoft/flysystem-openstack-swift": "Required to use the 'openstack' adapter (^0.2)", - "orzcc/aliyun-oss": "One of the options to use the 'oss' adapter (dev-master)", - "overtrue/flysystem-qiniu": "One of the options to use the 'qiniu' adapter (^1.0)", - "phlib/flysystem-pdo": "One of the options to use the 'pdo' adapter (^1.1)", - "potherca/flysystem-github": "Required to use the 'github' adapter (^0.2)", - "private-it/flysystem-google-drive": "One of the options to use the 'gdrive' adapter (dev-master)", - "robgridley/flysystem-smb": "Required to use the 'smb' adapter (dev-master)", - "rokde/flysystem-local-database-adapter": "Required to use the 'eloquent' adapter (^0.0)", - "shion/aliyun-oss": "One of the options to use the 'oss' adapter (dev-master)", - "spatie/flysystem-dropbox": "Required to use the 'dropbox' adapter in PHP 7 (^1.0)", - "srmklive/flysystem-dropbox-v2": "Required to use the 'dropbox' adapter in PHP 5 (^1.0)", - "superbalist/flysystem-google-storage": "One of the options to use the 'google' adapter (^7.0)", - "t3chnik/flysystem-cloudinary-adapter": "One of the options to use the 'cloudinary' adapter (dev-master)", - "twistor/flysystem-guzzle": "One of the options to use the (read-only) 'http' adapter (^6.0)", - "twistor/flysystem-http": "One of the options to use the (read-only) 'http' adapter (^0.2)", - "twistor/flysystem-stream-wrapper": "Allows access to Flysystem drives using 'drive://path' streams (^1.0)", - "xxtime/flysystem-aliyun-oss": "One of the options to use the 'oss' adapter (^1.2)", - "zhuxiaoqiao/flysystem-baidu-bos": "Required to use the 'bos' adapter (^1.0)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - }, - "laravel": { - "providers": [ - "Danhunsaker\\Laravel\\Flysystem\\FlysystemOtherServiceProvider" - ], - "dont-discover": [ - "danhunsaker/laravel-flysystem-service" - ] - } - }, - "autoload": { - "psr-4": { - "Danhunsaker\\Laravel\\Flysystem\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel Hunsaker", - "email": "danhunsaker@gmail.com" - } - ], - "description": "Automatically registers every third-party Flysystem adapter it recognizes as a Laravel Filesystem Driver.", - "keywords": [ - "Flysystem", - "laravel" - ], - "time": "2019-12-16T06:57:38+00:00" - }, - { - "name": "danhunsaker/laravel-flysystem-service", - "version": "v1.3", - "source": { - "type": "git", - "url": "https://github.com/danhunsaker/laravel-flysystem-service.git", - "reference": "a604090fbde62a60515d246781aad0c73f10be06" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/danhunsaker/laravel-flysystem-service/zipball/a604090fbde62a60515d246781aad0c73f10be06", - "reference": "a604090fbde62a60515d246781aad0c73f10be06", - "shasum": "" - }, - "require": { - "illuminate/filesystem": "^5.0 || ^6.0", - "illuminate/support": "^5.0 || ^6.0", - "league/flysystem": "^1.0" - }, - "suggest": { - "league/flysystem-aws-s3-v3": "Required to use the 's3' adapter (^1.0)", - "league/flysystem-azure-blob-storage": "Required to use the 'azure' adapter (^1.0)", - "league/flysystem-cached-adapter": "Required to use metadata caching (^1.0)", - "league/flysystem-eventable-filesystem": "Required to hook into filesystem Events (^1.0)", - "league/flysystem-gridfs": "Required to use the 'gridfs' adapter (^1.0)", - "league/flysystem-memory": "Required to use the 'memory' adapter (^1.0)", - "league/flysystem-phpcr": "Required to use the 'phpcr' adapter (^1.0)", - "league/flysystem-rackspace": "Required to use the 'rackspace' adapter (^1.0)", - "league/flysystem-replicate-adapter": "Required to use the 'replicate' adapter (^1.0)", - "league/flysystem-sftp": "Required to use the 'sftp' adapter (^1.0)", - "league/flysystem-vfs": "Required to use the 'vfs' adapter (^1.0)", - "league/flysystem-webdav": "Required to use the 'webdav' adapter (^1.0)", - "league/flysystem-ziparchive": "Required to use the 'zip' adapter (^1.0)", - "madewithlove/illuminate-psr-cache-bridge": "Required to use Laravel's cache implementation for Flysystem caching (^1.0)" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - }, - "laravel": { - "providers": [ - "Danhunsaker\\Laravel\\Flysystem\\FlysystemServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Danhunsaker\\Laravel\\Flysystem\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel Hunsaker", - "email": "danhunsaker@gmail.com" - } - ], - "description": "Automatically registers every Flysystem adapter it recognizes as a Laravel Filesystem Driver.", - "keywords": [ - "Flysystem", - "laravel" - ], - "time": "2019-12-16T06:14:57+00:00" - }, { "name": "davejamesmiller/laravel-breadcrumbs", "version": "5.3.1", @@ -1191,13 +1019,13 @@ "authors": [ { "name": "Neuman Vong", - "role": "Developer", - "email": "neuman+pear@twilio.com" + "email": "neuman+pear@twilio.com", + "role": "Developer" }, { "name": "Anant Narayanan", - "role": "Developer", - "email": "anant@php.net" + "email": "anant@php.net", + "role": "Developer" } ], "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", @@ -1472,43 +1300,43 @@ }, { "name": "laravel/framework", - "version": "v5.8.36", + "version": "v6.9.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95" + "reference": "60610be97ca389fa4b959d4d13fb3690970d9fb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ccf857af50897eda43ceaf12e318cf214e0e4e95", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95", + "url": "https://api.github.com/repos/laravel/framework/zipball/60610be97ca389fa4b959d4d13fb3690970d9fb7", + "reference": "60610be97ca389fa4b959d4d13fb3690970d9fb7", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.1.10", "erusev/parsedown": "^1.7", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "^1.0.8", - "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3 || ^2.0", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", "opis/closure": "^3.1", - "php": "^7.1.3", + "php": "^7.2", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.2", - "symfony/debug": "^4.2", - "symfony/finder": "^4.2", - "symfony/http-foundation": "^4.2", - "symfony/http-kernel": "^4.2", - "symfony/process": "^4.2", - "symfony/routing": "^4.2", - "symfony/var-dumper": "^4.2", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "^3.3" }, @@ -1548,47 +1376,45 @@ "require-dev": { "aws/aws-sdk-php": "^3.0", "doctrine/dbal": "^2.6", - "filp/whoops": "^2.1.4", + "filp/whoops": "^2.4", "guzzlehttp/guzzle": "^6.3", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.0", + "mockery/mockery": "^1.2.3", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.8.*", + "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5|^8.0", + "phpunit/phpunit": "^8.3", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.2", - "symfony/dom-crawler": "^4.2", + "symfony/cache": "^4.3", "true/punycode": "^2.1" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "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.", - "filp/whoops": "Required for friendly error pages in development (^2.1.4).", + "ext-redis": "Required to use the Redis cache and queue drivers.", + "filp/whoops": "Required for friendly error pages in development (^2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0).", "laravel/tinker": "Required to use the tinker console command (^1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", - "nexmo/client": "Required to use the Nexmo transport (^1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -1616,49 +1442,49 @@ "framework", "laravel" ], - "time": "2019-12-17T16:00:14+00:00" + "time": "2019-12-19T18:16:22+00:00" }, { "name": "laravel/passport", - "version": "v7.5.1", + "version": "v8.0.2", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08" + "reference": "952722f4f1817485bd30190e45fe4dc87ba67441" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08", - "reference": "d63cdd672c3d65b3c35b73d0ef13a9dbfcb71c08", + "url": "https://api.github.com/repos/laravel/passport/zipball/952722f4f1817485bd30190e45fe4dc87ba67441", + "reference": "952722f4f1817485bd30190e45fe4dc87ba67441", "shasum": "" }, "require": { "ext-json": "*", - "firebase/php-jwt": "~3.0|~4.0|~5.0", - "guzzlehttp/guzzle": "~6.0", - "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", - "league/oauth2-server": "^7.0", - "php": ">=7.1", + "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", + "league/oauth2-server": "^8.0", + "php": "^7.2", "phpseclib/phpseclib": "^2.0", - "symfony/psr-http-message-bridge": "~1.0", - "zendframework/zend-diactoros": "~1.0|~2.0" + "symfony/psr-http-message-bridge": "^1.0", + "zendframework/zend-diactoros": "^2.0" }, "require-dev": { "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.4|^8.0" + "phpunit/phpunit": "^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "8.x-dev" }, "laravel": { "providers": [ @@ -1687,39 +1513,39 @@ "oauth", "passport" ], - "time": "2019-10-08T16:45:24+00:00" + "time": "2019-11-26T17:35:30+00:00" }, { "name": "laravelcollective/html", - "version": "v5.8.1", + "version": "v6.0.3", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29" + "reference": "bcc317d21a7e04eebcc81c4109fa84feaab63590" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a1c9974ea629eed96e101a24e3852ced382eb29", - "reference": "3a1c9974ea629eed96e101a24e3852ced382eb29", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/bcc317d21a7e04eebcc81c4109fa84feaab63590", + "reference": "bcc317d21a7e04eebcc81c4109fa84feaab63590", "shasum": "" }, "require": { - "illuminate/http": "5.8.*", - "illuminate/routing": "5.8.*", - "illuminate/session": "5.8.*", - "illuminate/support": "5.8.*", - "illuminate/view": "5.8.*", - "php": ">=7.1.3" + "illuminate/http": "^6.0", + "illuminate/routing": "^6.0", + "illuminate/session": "^6.0", + "illuminate/support": "^6.0", + "illuminate/view": "^6.0", + "php": ">=7.2" }, "require-dev": { - "illuminate/database": "5.8.*", + "illuminate/database": "^6.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "~7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.0-dev" }, "laravel": { "providers": [ @@ -1755,7 +1581,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2019-09-05T12:32:25+00:00" + "time": "2019-10-02T00:37:39+00:00" }, { "name": "lcobucci/jwt", @@ -2240,24 +2066,25 @@ }, { "name": "league/oauth2-server", - "version": "7.4.0", + "version": "8.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf" + "reference": "e1dc4d708c56fcfa205be4bb1862b6d525b4baac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf", - "reference": "2eb1cf79e59d807d89c256e7ac5e2bf8bdbd4acf", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/e1dc4d708c56fcfa205be4bb1862b6d525b4baac", + "reference": "e1dc4d708c56fcfa205be4bb1862b6d525b4baac", "shasum": "" }, "require": { - "defuse/php-encryption": "^2.1", + "defuse/php-encryption": "^2.2.1", + "ext-json": "*", "ext-openssl": "*", - "lcobucci/jwt": "^3.2.2", - "league/event": "^2.1", - "php": ">=7.0.0", + "lcobucci/jwt": "^3.3.1", + "league/event": "^2.2", + "php": ">=7.1.0", "psr/http-message": "^1.0.1" }, "replace": { @@ -2265,12 +2092,11 @@ "lncd/oauth2": "*" }, "require-dev": { - "phpstan/phpstan": "^0.9.2", - "phpstan/phpstan-phpunit": "^0.9.4", - "phpstan/phpstan-strict-rules": "^0.9.0", - "phpunit/phpunit": "^6.3 || ^7.0", + "phpstan/phpstan": "^0.11.8", + "phpstan/phpstan-phpunit": "^0.11.2", + "phpunit/phpunit": "^7.5.13 || ^8.2.3", "roave/security-advisories": "dev-master", - "zendframework/zend-diactoros": "^1.3.2" + "zendframework/zend-diactoros": "^2.1.2" }, "type": "library", "autoload": { @@ -2285,15 +2111,15 @@ "authors": [ { "name": "Alex Bilbie", - "role": "Developer", "email": "hello@alexbilbie.com", - "homepage": "http://www.alexbilbie.com" + "homepage": "http://www.alexbilbie.com", + "role": "Developer" }, { "name": "Andy Millington", - "role": "Developer", "email": "andrew@noexceptions.io", - "homepage": "https://www.noexceptions.io" + "homepage": "https://www.noexceptions.io", + "role": "Developer" } ], "description": "A lightweight and powerful OAuth 2.0 authorization and resource server library with support for all the core specification grants. This library will allow you to secure your API with OAuth and allow your applications users to approve apps that want to access their data from your API.", @@ -2313,7 +2139,7 @@ "secure", "server" ], - "time": "2019-05-05T09:22:01+00:00" + "time": "2019-07-13T18:58:26+00:00" }, { "name": "litipk/flysystem-fallback-adapter", @@ -2358,21 +2184,21 @@ }, { "name": "monolog/monolog", - "version": "1.25.2", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", - "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f9d56fd2f5533322caccdfcddbb56aedd622ef1c", + "reference": "f9d56fd2f5533322caccdfcddbb56aedd622ef1c", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -2380,33 +2206,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2432,7 +2261,7 @@ "logging", "psr-3" ], - "time": "2019-11-13T10:00:05+00:00" + "time": "2019-11-13T10:27:43+00:00" }, { "name": "mschindler83/fints-hbci-php", @@ -2856,16 +2685,16 @@ }, { "name": "pragmarx/google2fa", - "version": "v6.1.3", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa.git", - "reference": "cce23ec9b276d29ce9afc6830b12c20452993875" + "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/cce23ec9b276d29ce9afc6830b12c20452993875", - "reference": "cce23ec9b276d29ce9afc6830b12c20452993875", + "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/0afb47f8a686bd203fe85a05bab85139f3c1971e", + "reference": "0afb47f8a686bd203fe85a05bab85139f3c1971e", "shasum": "" }, "require": { @@ -2908,7 +2737,7 @@ "Two Factor Authentication", "google2fa" ], - "time": "2019-10-02T18:46:33+00:00" + "time": "2019-10-21T17:49:22+00:00" }, { "name": "pragmarx/google2fa-qrcode", @@ -2953,8 +2782,8 @@ "authors": [ { "name": "Antonio Carlos Ribeiro", - "role": "Creator & Designer", - "email": "acr@antoniocarlosribeiro.com" + "email": "acr@antoniocarlosribeiro.com", + "role": "Creator & Designer" } ], "description": "QR Code package for Google2FA", @@ -3013,9 +2842,9 @@ "authors": [ { "name": "Antonio Carlos Ribeiro", - "role": "Developer", "email": "acr@antoniocarlosribeiro.com", - "homepage": "https://antoniocarlosribeiro.com" + "homepage": "https://antoniocarlosribeiro.com", + "role": "Developer" } ], "description": "Create random chars, numbers, strings", @@ -3075,9 +2904,9 @@ "authors": [ { "name": "Antonio Carlos Ribeiro", - "role": "Developer", "email": "acr@antoniocarlosribeiro.com", - "homepage": "https://antoniocarlosribeiro.com" + "homepage": "https://antoniocarlosribeiro.com", + "role": "Developer" } ], "description": "Create recovery codes for two factor auth", @@ -3520,28 +3349,28 @@ }, { "name": "rcrowe/twigbridge", - "version": "v0.9.12", + "version": "v0.11.2", "source": { "type": "git", "url": "https://github.com/rcrowe/TwigBridge.git", - "reference": "5c4e94cb3ff8f3c2f5c331c5a2314de1e7eaf4ad" + "reference": "b8bd5db744d51adb11623547f281dfaf5ac60230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/5c4e94cb3ff8f3c2f5c331c5a2314de1e7eaf4ad", - "reference": "5c4e94cb3ff8f3c2f5c331c5a2314de1e7eaf4ad", + "url": "https://api.github.com/repos/rcrowe/TwigBridge/zipball/b8bd5db744d51adb11623547f281dfaf5ac60230", + "reference": "b8bd5db744d51adb11623547f281dfaf5ac60230", "shasum": "" }, "require": { - "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/view": "5.5.*|5.6.*|5.7.*|5.8.*", - "php": ">=7", - "twig/twig": "~1.30" + "illuminate/support": "^5.5|^6", + "illuminate/view": "^5.5|^6", + "php": ">=7.1", + "twig/twig": "~2.0" }, "require-dev": { - "laravel/framework": "5.0.*", + "laravel/framework": "5.5.*", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "~6.0", "satooshi/php-coveralls": "~0.6", "squizlabs/php_codesniffer": "~1.5" }, @@ -3552,7 +3381,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.10-dev" + "dev-master": "0.11-dev" }, "laravel": { "providers": [ @@ -3574,13 +3403,13 @@ "MIT" ], "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - }, { "name": "Rob Crowe", "email": "hello@vivalacrowe.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" } ], "description": "Adds the power of Twig to Laravel", @@ -3588,7 +3417,7 @@ "laravel", "twig" ], - "time": "2019-02-27T16:14:57+00:00" + "time": "2019-10-03T08:22:24+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5294,21 +5123,22 @@ }, { "name": "twig/twig", - "version": "v1.42.4", + "version": "v2.12.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" + "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", + "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", "shasum": "" }, "require": { - "php": ">=5.5.0", - "symfony/polyfill-ctype": "^1.8" + "php": "^7.0", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "psr/container": "^1.0", @@ -5318,7 +5148,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.42-dev" + "dev-master": "2.12-dev" } }, "autoload": { @@ -5356,7 +5186,7 @@ "keywords": [ "templating" ], - "time": "2019-11-11T16:49:32+00:00" + "time": "2019-11-11T16:52:09+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/config/app.php b/config/app.php index 3071573b6f..8d7e55374d 100644 --- a/config/app.php +++ b/config/app.php @@ -135,7 +135,7 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - //'Twig' => TwigBridge\Facade\Twig::class, + 'Twig' => TwigBridge\Facade\Twig::class, 'Form' => Collective\Html\FormFacade::class, 'Html' => Collective\Html\HtmlFacade::class, 'Preferences' => \FireflyIII\Support\Facades\Preferences::class,