diff --git a/.env.example b/.env.example index 7c381ad27e..142e6edc75 100644 --- a/.env.example +++ b/.env.example @@ -60,6 +60,12 @@ PGSQL_SSL_CRL_FILE=null CACHE_DRIVER=file SESSION_DRIVER=file +# If you set either of these to 'redis', you might want to update these settings too +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 +REDIS_DB="0" # always use quotes + # You can configure another file storage backend if you cannot use the local storage option. # To set this up, fill in the following variables. The upload path is used to store uploaded # files and the export path is to store exported data (before download). @@ -171,9 +177,6 @@ APP_NAME=FireflyIII ADLDAP_CONNECTION=default BROADCAST_DRIVER=log QUEUE_DRIVER=sync -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 CACHE_PREFIX=firefly SEARCH_RESULT_LIMIT=50 PUSHER_KEY= diff --git a/composer.json b/composer.json index 01e0e3033c..59160ed8e8 100644 --- a/composer.json +++ b/composer.json @@ -61,9 +61,10 @@ "ext-fileinfo": "*", "ext-gd": "*", "ext-intl": "*", - "ext-session": "*", "ext-json": "*", "ext-openssl": "*", + "ext-pdo": "*", + "ext-session": "*", "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xml": "*", @@ -74,6 +75,7 @@ "davejamesmiller/laravel-breadcrumbs": "5.*", "doctrine/dbal": "2.*", "fideloper/proxy": "4.*", + "jc5/google2fa-laravel": "2.*", "laravel/framework": "5.8.*", "laravel/passport": "7.*", "laravelcollective/html": "5.8.*", @@ -85,10 +87,9 @@ "litipk/flysystem-fallback-adapter": "0.*", "mschindler83/fints-hbci-php": "1.*", "pragmarx/google2fa": "6.1.3", - "pragmarx/google2fa-laravel": "1.*", "pragmarx/recovery": "^0.1.0", - "rcrowe/twigbridge": "0.9.*", - "ext-pdo": "*" + "predis/predis": "^1.1", + "rcrowe/twigbridge": "0.9.*" }, "require-dev": { "barryvdh/laravel-ide-helper": "2.*", diff --git a/composer.lock b/composer.lock index ddf94034f2..951cdf54b7 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": "026bc983de9696e7d03ed986dc7c15b4", + "content-hash": "aab8986d8f659600448665fe949d0c7c", "packages": [ { "name": "adldap2/adldap2", @@ -525,16 +525,16 @@ }, { "name": "doctrine/cache", - "version": "1.9.1", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55" + "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/89a5c76c39c292f7798f964ab3c836c3f8192a55", - "reference": "89a5c76c39c292f7798f964ab3c836c3f8192a55", + "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62", + "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62", "shasum": "" }, "require": { @@ -601,10 +601,9 @@ "memcached", "php", "redis", - "riak", "xcache" ], - "time": "2019-11-15T14:31:57+00:00" + "time": "2019-11-29T15:36:20+00:00" }, { "name": "doctrine/dbal", @@ -1393,6 +1392,83 @@ ], "time": "2019-07-01T23:21:34+00:00" }, + { + "name": "jc5/google2fa-laravel", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/JC5/google2fa-laravel.git", + "reference": "fc975354c4aeb581cfc29eea2f3954f7deb88edc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JC5/google2fa-laravel/zipball/fc975354c4aeb581cfc29eea2f3954f7deb88edc", + "reference": "fc975354c4aeb581cfc29eea2f3954f7deb88edc", + "shasum": "" + }, + "require": { + "laravel/framework": ">=5.4.36", + "php": ">=7.3", + "pragmarx/google2fa-qrcode": "^1.0" + }, + "require-dev": { + "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*", + "phpunit/phpunit": "~5|~6|~7|~8", + "roave/security-advisories": "dev-master" + }, + "suggest": { + "bacon/bacon-qr-code": "Required to generate inline QR Codes.", + "pragmarx/recovery": "Generate recovery codes." + }, + "type": "library", + "extra": { + "component": "package", + "frameworks": [ + "Laravel" + ], + "branch-alias": { + "dev-master": "0.2-dev" + }, + "laravel": { + "providers": [ + "PragmaRX\\Google2FALaravel\\ServiceProvider" + ], + "aliases": { + "Google2FA": "PragmaRX\\Google2FALaravel\\Facade" + } + } + }, + "autoload": { + "psr-4": { + "PragmaRX\\Google2FALaravel\\": "src/", + "PragmaRX\\Google2FALaravel\\Tests\\": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Antonio Carlos Ribeiro", + "email": "acr@antoniocarlosribeiro.com", + "role": "Creator & Designer" + }, + { + "name": "James Cole", + "email": "thegrumpydictator@gmail.com", + "role": "Developer" + } + ], + "description": "A One Time Password Authentication package, compatible with Google Authenticator.", + "keywords": [ + "Authentication", + "Two Factor Authentication", + "google2fa", + "laravel" + ], + "time": "2019-12-07T16:40:45+00:00" + }, { "name": "laravel/framework", "version": "v5.8.35", @@ -2464,16 +2540,16 @@ }, { "name": "opis/closure", - "version": "3.4.1", + "version": "3.5.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7" + "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7", - "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7", + "url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969", + "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969", "shasum": "" }, "require": { @@ -2486,7 +2562,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3.x-dev" + "dev-master": "3.5.x-dev" } }, "autoload": { @@ -2521,7 +2597,7 @@ "serialization", "serialize" ], - "time": "2019-10-19T18:38:51+00:00" + "time": "2019-11-29T22:36:02+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -2632,33 +2708,33 @@ }, { "name": "phpoption/phpoption", - "version": "1.5.2", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793" + "reference": "f4e7a6a1382183412246f0d361078c29fb85089e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/2ba2586380f8d2b44ad1b9feb61c371020b27793", - "reference": "2ba2586380f8d2b44ad1b9feb61c371020b27793", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/f4e7a6a1382183412246f0d361078c29fb85089e", + "reference": "f4e7a6a1382183412246f0d361078c29fb85089e", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^5.5.9 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.7|^5.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.6-dev" } }, "autoload": { - "psr-0": { - "PhpOption\\": "src/" + "psr-4": { + "PhpOption\\": "src/PhpOption/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2669,6 +2745,10 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com" + }, + { + "name": "Graham Campbell", + "email": "graham@alt-three.com" } ], "description": "Option Type for PHP", @@ -2678,7 +2758,7 @@ "php", "type" ], - "time": "2019-11-06T22:27:00+00:00" + "time": "2019-11-30T20:20:49+00:00" }, { "name": "phpseclib/phpseclib", @@ -2828,77 +2908,6 @@ ], "time": "2019-10-02T18:46:33+00:00" }, - { - "name": "pragmarx/google2fa-laravel", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/antonioribeiro/google2fa-laravel.git", - "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa-laravel/zipball/4ccc17dbf5ab5f752113cb6088a5afce5191309e", - "reference": "4ccc17dbf5ab5f752113cb6088a5afce5191309e", - "shasum": "" - }, - "require": { - "laravel/framework": ">=5.4.36", - "php": ">=7.0", - "pragmarx/google2fa-qrcode": "^1.0" - }, - "require-dev": { - "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*", - "phpunit/phpunit": "~5|~6|~7|~8" - }, - "suggest": { - "bacon/bacon-qr-code": "Required to generate inline QR Codes.", - "pragmarx/recovery": "Generate recovery codes." - }, - "type": "library", - "extra": { - "component": "package", - "frameworks": [ - "Laravel" - ], - "branch-alias": { - "dev-master": "0.2-dev" - }, - "laravel": { - "providers": [ - "PragmaRX\\Google2FALaravel\\ServiceProvider" - ], - "aliases": { - "Google2FA": "PragmaRX\\Google2FALaravel\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "PragmaRX\\Google2FALaravel\\": "src/", - "PragmaRX\\Google2FALaravel\\Tests\\": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Antonio Carlos Ribeiro", - "email": "acr@antoniocarlosribeiro.com", - "role": "Creator & Designer" - } - ], - "description": "A One Time Password Authentication package, compatible with Google Authenticator.", - "keywords": [ - "Authentication", - "Two Factor Authentication", - "google2fa", - "laravel" - ], - "time": "2019-10-21T18:34:37+00:00" - }, { "name": "pragmarx/google2fa-qrcode", "version": "v1.0.3", @@ -3084,6 +3093,56 @@ ], "time": "2017-09-19T16:58:00+00:00" }, + { + "name": "predis/predis", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/nrk/predis.git", + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1", + "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + }, + "type": "library", + "autoload": { + "psr-4": { + "Predis\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net" + } + ], + "description": "Flexible and feature-complete Redis client for PHP and HHVM", + "homepage": "http://github.com/nrk/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], + "time": "2016-06-16T16:22:20+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -3372,44 +3431,46 @@ }, { "name": "ramsey/uuid", - "version": "3.8.0", + "version": "3.9.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3" + "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3", - "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", + "reference": "5ac2740e0c8c599d2bbe7f113a939f2b5b216c67", "shasum": "" }, "require": { - "paragonie/random_compat": "^1.0|^2.0|9.99.99", - "php": "^5.4 || ^7.0", + "ext-json": "*", + "paragonie/random_compat": "^1 | ^2 | 9.99.99", + "php": "^5.4 | ^7", "symfony/polyfill-ctype": "^1.8" }, "replace": { "rhumsaa/uuid": "self.version" }, "require-dev": { - "codeception/aspect-mock": "^1.0 | ~2.0.0", - "doctrine/annotations": "~1.2.0", - "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0", - "ircmaxell/random-lib": "^1.1", + "codeception/aspect-mock": "^1 | ^2", + "doctrine/annotations": "^1.2", + "goaop/framework": "1.0.0-alpha.2 | ^1 | ^2.1", "jakub-onderka/php-parallel-lint": "^0.9.0", "mockery/mockery": "^0.9.9", "moontoast/math": "^1.1", - "php-mock/php-mock-phpunit": "^0.3|^1.1", - "phpunit/phpunit": "^4.7|^5.0|^6.5", + "paragonie/random-lib": "^2", + "php-mock/php-mock-phpunit": "^0.3 | ^1.1", + "phpunit/phpunit": "^4.8 | ^5.4 | ^6.5", "squizlabs/php_codesniffer": "^2.3" }, "suggest": { "ext-ctype": "Provides support for PHP Ctype functions", "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator", + "ext-openssl": "Provides the OpenSSL extension for use with the OpenSslGenerator", "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator", - "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter", "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).", + "paragonie/random-lib": "Provides RandomLib for use with the RandomLibAdapter", "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid", "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type." }, @@ -3422,13 +3483,21 @@ "autoload": { "psr-4": { "Ramsey\\Uuid\\": "src/" - } + }, + "files": [ + "src/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Ben Ramsey", + "email": "ben@benramsey.com", + "homepage": "https://benramsey.com" + }, { "name": "Marijn Huizendveld", "email": "marijn.huizendveld@gmail.com" @@ -3436,11 +3505,6 @@ { "name": "Thibaud Fabre", "email": "thibaud@aztech.io" - }, - { - "name": "Ben Ramsey", - "email": "ben@benramsey.com", - "homepage": "https://benramsey.com" } ], "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).", @@ -3450,7 +3514,7 @@ "identifier", "uuid" ], - "time": "2018-07-19T23:38:55+00:00" + "time": "2019-12-01T04:55:27+00:00" }, { "name": "rcrowe/twigbridge", @@ -3588,16 +3652,16 @@ }, { "name": "symfony/console", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8" + "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", - "reference": "35d9077f495c6d184d9930f7a7ecbd1ad13c7ab8", + "url": "https://api.github.com/repos/symfony/console/zipball/f0aea3df20d15635b3cb9730ca5eea1c65b7f201", + "reference": "f0aea3df20d15635b3cb9730ca5eea1c65b7f201", "shasum": "" }, "require": { @@ -3660,11 +3724,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-11-13T07:39:40+00:00" + "time": "2019-12-01T10:06:17+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3717,16 +3781,16 @@ }, { "name": "symfony/debug", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "b24b791f817116b29e52a63e8544884cf9a40757" + "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/b24b791f817116b29e52a63e8544884cf9a40757", - "reference": "b24b791f817116b29e52a63e8544884cf9a40757", + "url": "https://api.github.com/repos/symfony/debug/zipball/b8600a1d7d20b0e80906398bb1f50612fa074a8e", + "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e", "shasum": "" }, "require": { @@ -3769,20 +3833,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-11-10T17:54:30+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/error-handler", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf" + "reference": "a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/e1acb58dc6a8722617fe56565f742bcf7e8744bf", - "reference": "e1acb58dc6a8722617fe56565f742bcf7e8744bf", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b", + "reference": "a1ad02d62789efed1d2b2796f1c15e0c6a00fc3b", "shasum": "" }, "require": { @@ -3825,20 +3889,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2019-11-17T22:49:13+00:00" + "time": "2019-12-01T08:46:01+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1" + "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ab1c43e17fff802bef0a898f3bc088ac33b8e0e1", - "reference": "ab1c43e17fff802bef0a898f3bc088ac33b8e0e1", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b3c3068a72623287550fe20b84a2b01dcba2686f", + "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f", "shasum": "" }, "require": { @@ -3895,7 +3959,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-11-08T22:40:51+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3957,7 +4021,7 @@ }, { "name": "symfony/finder", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -4006,16 +4070,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c" + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/502040dd2b0cf0a292defeb6145f4d7a4753c99c", - "reference": "502040dd2b0cf0a292defeb6145f4d7a4753c99c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", "shasum": "" }, "require": { @@ -4057,20 +4121,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-11-17T10:10:42+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0" + "reference": "e4187780ed26129ee86d5234afbebf085e144f88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5a5e7237d928aa98ff8952050cbbf0135899b6b0", - "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e4187780ed26129ee86d5234afbebf085e144f88", + "reference": "e4187780ed26129ee86d5234afbebf085e144f88", "shasum": "" }, "require": { @@ -4147,20 +4211,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-11-21T07:08:15+00:00" + "time": "2019-12-01T14:06:38+00:00" }, { "name": "symfony/mime", - "version": "v5.0.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e" + "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/76f3c09b7382bf979af7bcd8e6f8033f1324285e", - "reference": "76f3c09b7382bf979af7bcd8e6f8033f1324285e", + "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", + "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", "shasum": "" }, "require": { @@ -4209,11 +4273,11 @@ "mime", "mime-type" ], - "time": "2019-11-18T17:27:11+00:00" + "time": "2019-11-30T14:12:50+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -4271,7 +4335,7 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", @@ -4330,7 +4394,7 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", @@ -4392,7 +4456,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -4451,7 +4515,7 @@ }, { "name": "symfony/polyfill-php56", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", @@ -4507,7 +4571,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -4562,7 +4626,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -4620,7 +4684,7 @@ }, { "name": "symfony/polyfill-util", - "version": "v1.13.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", @@ -4672,16 +4736,16 @@ }, { "name": "symfony/process", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06" + "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/75ad33d9b6f25325ebc396d68ad86fd74bcfbb06", - "reference": "75ad33d9b6f25325ebc396d68ad86fd74bcfbb06", + "url": "https://api.github.com/repos/symfony/process/zipball/51c0135ef3f44c5803b33dc60e96bf4f77752726", + "reference": "51c0135ef3f44c5803b33dc60e96bf4f77752726", "shasum": "" }, "require": { @@ -4717,7 +4781,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-10-28T20:30:34+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -4786,16 +4850,16 @@ }, { "name": "symfony/routing", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "cf6d72cf0348775f5243b8389169a7096221ea40" + "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/cf6d72cf0348775f5243b8389169a7096221ea40", - "reference": "cf6d72cf0348775f5243b8389169a7096221ea40", + "url": "https://api.github.com/repos/symfony/routing/zipball/51f3f20ad29329a0bdf5c0e2f722d3764b065273", + "reference": "51f3f20ad29329a0bdf5c0e2f722d3764b065273", "shasum": "" }, "require": { @@ -4858,24 +4922,24 @@ "uri", "url" ], - "time": "2019-11-20T13:44:34+00:00" + "time": "2019-12-01T08:39:58+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "9d99e1556417bf227a62e14856d630672bf10eaf" + "reference": "144c5e51266b281231e947b51223ba14acf1a749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/9d99e1556417bf227a62e14856d630672bf10eaf", - "reference": "9d99e1556417bf227a62e14856d630672bf10eaf", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749", + "reference": "144c5e51266b281231e947b51223ba14acf1a749", "shasum": "" }, "require": { - "php": "^7.2.9", + "php": "^7.2.5", "psr/container": "^1.0" }, "suggest": { @@ -4916,11 +4980,11 @@ "interoperability", "standards" ], - "time": "2019-11-09T09:18:34+00:00" + "time": "2019-11-18T17:27:11+00:00" }, { "name": "symfony/translation", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", @@ -4996,20 +5060,20 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.0.0", + "version": "v2.0.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297" + "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8feb81e6bb1a42d6a3b1429c751d291eb6d05297", - "reference": "8feb81e6bb1a42d6a3b1429c751d291eb6d05297", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/8cc682ac458d75557203b2f2f14b0b92e1c744ed", + "reference": "8cc682ac458d75557203b2f2f14b0b92e1c744ed", "shasum": "" }, "require": { - "php": "^7.2.9" + "php": "^7.2.5" }, "suggest": { "symfony/translation-implementation": "" @@ -5049,20 +5113,20 @@ "interoperability", "standards" ], - "time": "2019-11-09T09:18:34+00:00" + "time": "2019-11-18T17:27:11+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "eade2890f8b0eeb279b6cf41b50a10007294490f" + "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eade2890f8b0eeb279b6cf41b50a10007294490f", - "reference": "eade2890f8b0eeb279b6cf41b50a10007294490f", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0a89a1dbbedd9fb2cfb2336556dec8305273c19a", + "reference": "0a89a1dbbedd9fb2cfb2336556dec8305273c19a", "shasum": "" }, "require": { @@ -5125,20 +5189,20 @@ "debug", "dump" ], - "time": "2019-11-12T14:51:11+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "tightenco/collect", - "version": "v6.5.2", + "version": "v6.6.2", "source": { "type": "git", "url": "https://github.com/tightenco/collect.git", - "reference": "402a89f11c55b86c5a081c267957a0c071375278" + "reference": "67525fa5ebaab40acb69f0507fa91e6bce212d5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tightenco/collect/zipball/402a89f11c55b86c5a081c267957a0c071375278", - "reference": "402a89f11c55b86c5a081c267957a0c071375278", + "url": "https://api.github.com/repos/tightenco/collect/zipball/67525fa5ebaab40acb69f0507fa91e6bce212d5c", + "reference": "67525fa5ebaab40acb69f0507fa91e6bce212d5c", "shasum": "" }, "require": { @@ -5175,7 +5239,7 @@ "collection", "laravel" ], - "time": "2019-11-22T20:59:40+00:00" + "time": "2019-12-06T22:56:34+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5420,16 +5484,16 @@ "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v2.6.5", + "version": "v2.6.6", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3" + "reference": "b91b959364d97af658f268c733c75dccdbff197e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3", - "reference": "8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/b91b959364d97af658f268c733c75dccdbff197e", + "reference": "b91b959364d97af658f268c733c75dccdbff197e", "shasum": "" }, "require": { @@ -5487,7 +5551,7 @@ "phpstorm", "sublime" ], - "time": "2019-09-08T09:56:38+00:00" + "time": "2019-10-30T20:53:27+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -6850,16 +6914,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.4.3", + "version": "8.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e" + "reference": "3ee1c1fd6fc264480c25b6fb8285edefe1702dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/67f9e35bffc0dd52d55d565ddbe4230454fd6a4e", - "reference": "67f9e35bffc0dd52d55d565ddbe4230454fd6a4e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3ee1c1fd6fc264480c25b6fb8285edefe1702dab", + "reference": "3ee1c1fd6fc264480c25b6fb8285edefe1702dab", "shasum": "" }, "require": { @@ -6903,7 +6967,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.4-dev" + "dev-master": "8.5-dev" } }, "autoload": { @@ -6929,7 +6993,7 @@ "testing", "xunit" ], - "time": "2019-11-06T09:42:23+00:00" + "time": "2019-12-06T05:41:38+00:00" }, { "name": "roave/security-advisories", @@ -6937,12 +7001,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "7b05f1705362f8a8a4b535ec5c0f174eaf4d09ec" + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/7b05f1705362f8a8a4b535ec5c0f174eaf4d09ec", - "reference": "7b05f1705362f8a8a4b535ec5c0f174eaf4d09ec", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e4ee2c8e4ccd908debc64069faf023c684a76760", + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760", "shasum": "" }, "conflict": { @@ -7045,7 +7109,7 @@ "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.18", + "simplesamlphp/simplesamlphp": "<1.17.8", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "slim/slim": "<2.6", "smarty/smarty": "<3.1.33", @@ -7147,7 +7211,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-11-27T20:26:33+00:00" + "time": "2019-12-02T13:03:15+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -7859,16 +7923,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "d12b01cba60be77b583c9af660007211e3909854" + "reference": "40c2606131d56eff6f193b6e2ceb92414653b591" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/d12b01cba60be77b583c9af660007211e3909854", - "reference": "d12b01cba60be77b583c9af660007211e3909854", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/40c2606131d56eff6f193b6e2ceb92414653b591", + "reference": "40c2606131d56eff6f193b6e2ceb92414653b591", "shasum": "" }, "require": { @@ -7905,7 +7969,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-11-12T14:51:11+00:00" + "time": "2019-11-26T23:16:41+00:00" }, { "name": "theseer/tokenizer", @@ -8011,13 +8075,13 @@ "ext-fileinfo": "*", "ext-gd": "*", "ext-intl": "*", - "ext-session": "*", "ext-json": "*", "ext-openssl": "*", + "ext-pdo": "*", + "ext-session": "*", "ext-simplexml": "*", "ext-tokenizer": "*", - "ext-xml": "*", - "ext-pdo": "*" + "ext-xml": "*" }, "platform-dev": [] } diff --git a/config/database.php b/config/database.php index 41f4802a17..b4e99a95ff 100644 --- a/config/database.php +++ b/config/database.php @@ -96,7 +96,7 @@ return [ 'host' => env('REDIS_HOST', '127.0.0.1'), 'password' => env('REDIS_PASSWORD', null), 'port' => env('REDIS_PORT', 6379), - 'database' => 0, + 'database' => env('REDIS_DB', '0'), ], ], diff --git a/config/google2fa.php b/config/google2fa.php index 77ad41f01b..6c7a4a3dc6 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -91,4 +91,7 @@ return [ */ 'throw_exceptions' => true, + + 'store_in_cookie' => true, + ];