From 4febab31347491e8b2dd6e9f9a58eb79a8ecfe91 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sat, 2 Jan 2021 17:10:35 +0100 Subject: [PATCH] Update used components to theri latest versions --- .env.travis | 40 +++++++++++++++++++ composer.lock | 94 ++++++++++++++++++++++---------------------- config/google2fa.php | 4 +- 3 files changed, 89 insertions(+), 49 deletions(-) create mode 100644 .env.travis diff --git a/.env.travis b/.env.travis new file mode 100644 index 000000000..d7227b393 --- /dev/null +++ b/.env.travis @@ -0,0 +1,40 @@ +DB_CONNECTION=mysql +DB_HOST = 127.0.0.1 +DB_PORT = 3306 +DB_SOCKET = +DB_USERNAME = TEST +DB_PASSWORD = TEST +DB_DATABASE = TEST + +NNTP_USERNAME = +NNTP_PASSWORD = +NNTP_SERVER = +NNTP_PORT = +NNTP_SSLENABLED = false +NNTP_SOCKET_TIMEOUT =120 + +NNTP_USERNAME_A = +NNTP_PASSWORD_A = +NNTP_SERVER_A = +NNTP_PORT_A = +NNTP_SSLENABLED_A = false +NNTP_SOCKET_TIMEOUT_A = 120 + + +NN_SSL_CAFILE = +NN_SSL_CAPATH = +NN_SSL_VERIFY_PEER = +NN_SSL_VERIFY_HOST = +NN_SSL_ALLOW_SELF_SIGNED = 1 + +ADMIN_USER = TEST +ADMIN_PASS = TEST +ADMIN_EMAIL = test@example.com + +APP_NAME=NNTmux +APP_ENV=local +APP_DEBUG=true +APP_URL= +APP_KEY= + +TELESCOPE_ENABLED=false diff --git a/composer.lock b/composer.lock index 65d35b1f2..4ccf7fc72 100644 --- a/composer.lock +++ b/composer.lock @@ -787,16 +787,16 @@ }, { "name": "cviebrock/laravel-elasticsearch", - "version": "8.0.2", + "version": "8.0.3", "source": { "type": "git", "url": "https://github.com/cviebrock/laravel-elasticsearch.git", - "reference": "de899cad8293de822d808ebf287cb924aeffaa2e" + "reference": "32ad18b0ad2315b3f0c3438a2c455e6cf383738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/de899cad8293de822d808ebf287cb924aeffaa2e", - "reference": "de899cad8293de822d808ebf287cb924aeffaa2e", + "url": "https://api.github.com/repos/cviebrock/laravel-elasticsearch/zipball/32ad18b0ad2315b3f0c3438a2c455e6cf383738a", + "reference": "32ad18b0ad2315b3f0c3438a2c455e6cf383738a", "shasum": "" }, "require": { @@ -850,7 +850,7 @@ "laravel", "search" ], - "time": "2020-12-02T18:43:28+00:00" + "time": "2020-12-28T18:49:27+00:00" }, { "name": "czproject/git-php", @@ -1945,16 +1945,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.24", + "version": "2.1.25", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448" + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ca90a3291eee1538cd48ff25163240695bd95448", - "reference": "ca90a3291eee1538cd48ff25163240695bd95448", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4", + "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4", "shasum": "" }, "require": { @@ -2005,7 +2005,7 @@ "type": "github" } ], - "time": "2020-11-14T15:56:27+00:00" + "time": "2020-12-29T14:50:06+00:00" }, { "name": "elasticsearch/elasticsearch", @@ -3637,16 +3637,16 @@ }, { "name": "laravel/scout", - "version": "v8.5.1", + "version": "v8.5.2", "source": { "type": "git", "url": "https://github.com/laravel/scout.git", - "reference": "b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b" + "reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/scout/zipball/b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b", - "reference": "b8b8a35cc3ac82cbc07dfa83955492d2ef6e237b", + "url": "https://api.github.com/repos/laravel/scout/zipball/ece6758b82c51ff7f5e011f243a7c6b33711a847", + "reference": "ece6758b82c51ff7f5e011f243a7c6b33711a847", "shasum": "" }, "require": { @@ -3698,7 +3698,7 @@ "laravel", "search" ], - "time": "2020-12-22T17:29:20+00:00" + "time": "2020-12-30T15:52:14+00:00" }, { "name": "laravel/telescope", @@ -6178,16 +6178,16 @@ }, { "name": "propaganistas/laravel-disposable-email", - "version": "2.0.13", + "version": "2.0.14", "source": { "type": "git", "url": "https://github.com/Propaganistas/Laravel-Disposable-Email.git", - "reference": "568887f20f6325f289b3a685a4fc51d536d8ce44" + "reference": "2c6f05e5731421e158c24a950c5d497bc5145e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Propaganistas/Laravel-Disposable-Email/zipball/568887f20f6325f289b3a685a4fc51d536d8ce44", - "reference": "568887f20f6325f289b3a685a4fc51d536d8ce44", + "url": "https://api.github.com/repos/Propaganistas/Laravel-Disposable-Email/zipball/2c6f05e5731421e158c24a950c5d497bc5145e78", + "reference": "2c6f05e5731421e158c24a950c5d497bc5145e78", "shasum": "" }, "require": { @@ -6197,7 +6197,7 @@ "illuminate/contracts": "^6.0|^7.0|^8.0", "illuminate/support": "^6.0|^7.0|^8.0", "illuminate/validation": "^6.0|^7.0|^8.0", - "php": ">=7.1|^8.0" + "php": "^7.1|^8.0" }, "require-dev": { "mockery/mockery": "^1.3.3|^1.4.2", @@ -6238,7 +6238,7 @@ "throwaway", "validator" ], - "time": "2020-12-01T08:38:01+00:00" + "time": "2020-12-29T08:37:28+00:00" }, { "name": "psr/cache", @@ -7064,16 +7064,16 @@ }, { "name": "spatie/async", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/spatie/async.git", - "reference": "e410c38a93b93589dfd8046b4b93cdaa6a9b7de2" + "reference": "d371b76ff876530c4906596490fd977720477e48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/async/zipball/e410c38a93b93589dfd8046b4b93cdaa6a9b7de2", - "reference": "e410c38a93b93589dfd8046b4b93cdaa6a9b7de2", + "url": "https://api.github.com/repos/spatie/async/zipball/d371b76ff876530c4906596490fd977720477e48", + "reference": "d371b76ff876530c4906596490fd977720477e48", "shasum": "" }, "require": { @@ -7123,7 +7123,7 @@ "type": "github" } ], - "time": "2020-11-20T06:05:35+00:00" + "time": "2020-12-29T22:19:12+00:00" }, { "name": "spatie/db-dumper", @@ -10872,44 +10872,44 @@ "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v2.8.2", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca" + "reference": "64a6b902583802c162cdccf7e76dc8619368bf1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/5515cabea39b9cf55f98980d0f269dc9d85cfcca", - "reference": "5515cabea39b9cf55f98980d0f269dc9d85cfcca", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/64a6b902583802c162cdccf7e76dc8619368bf1a", + "reference": "64a6b902583802c162cdccf7e76dc8619368bf1a", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", "composer/composer": "^1.6 || ^2", - "doctrine/dbal": "~2.3", + "doctrine/dbal": "^2.6 || ^3", "ext-json": "*", - "illuminate/console": "^6 || ^7 || ^8", - "illuminate/filesystem": "^6 || ^7 || ^8", - "illuminate/support": "^6 || ^7 || ^8", - "php": ">=7.2", + "illuminate/console": "^8", + "illuminate/filesystem": "^8", + "illuminate/support": "^8", + "php": "^7.3 || ^8.0", "phpdocumentor/type-resolver": "^1.1.0" }, "require-dev": { "ext-pdo_sqlite": "*", "friendsofphp/php-cs-fixer": "^2", - "illuminate/config": "^6 || ^7 || ^8", - "illuminate/view": "^6 || ^7 || ^8", - "mockery/mockery": "^1.3.3", - "orchestra/testbench": "^4 || ^5 || ^6", + "illuminate/config": "^8", + "illuminate/view": "^8", + "mockery/mockery": "^1.4", + "orchestra/testbench": "^6", "phpunit/phpunit": "^8.5 || ^9", - "spatie/phpunit-snapshot-assertions": "^1.4 || ^2.2 || ^3 || ^4", + "spatie/phpunit-snapshot-assertions": "^3 || ^4", "vimeo/psalm": "^3.12" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "2.9-dev" }, "laravel": { "providers": [ @@ -10950,7 +10950,7 @@ "type": "github" } ], - "time": "2020-12-06T08:55:05+00:00" + "time": "2020-12-29T10:11:05+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -11690,16 +11690,16 @@ }, { "name": "facade/ignition", - "version": "2.5.3", + "version": "2.5.8", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "d8dc4f90ed469f9f9313b976fb078c20585d5c99" + "reference": "8e907d81244649c5ea746e2ec30c32c5f59df472" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/d8dc4f90ed469f9f9313b976fb078c20585d5c99", - "reference": "d8dc4f90ed469f9f9313b976fb078c20585d5c99", + "url": "https://api.github.com/repos/facade/ignition/zipball/8e907d81244649c5ea746e2ec30c32c5f59df472", + "reference": "8e907d81244649c5ea746e2ec30c32c5f59df472", "shasum": "" }, "require": { @@ -11757,7 +11757,7 @@ "laravel", "page" ], - "time": "2020-12-09T20:25:45+00:00" + "time": "2020-12-29T09:12:55+00:00" }, { "name": "facade/ignition-contracts", diff --git a/config/google2fa.php b/config/google2fa.php index d6191c1fa..3ca58bfa8 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -5,7 +5,7 @@ return [ /* * Enable / disable Google2FA. */ - 'enabled' => env('OTP_ENABLED', true), + 'enabled' => env('OTP_ENABLED', false), /* * Lifetime in minutes. @@ -48,7 +48,7 @@ return [ /* * Forbid user to reuse One Time Passwords. */ - 'forbid_old_passwords' => true, + 'forbid_old_passwords' => false, /* * User's table column for google2fa secret.