diff --git a/.env.example b/.env.example index e6eba87e0..bb44134d1 100644 --- a/.env.example +++ b/.env.example @@ -6,6 +6,7 @@ APP_TIMEZONE=America/New_York APP_CLEAR_TASKLOG=720 APP_DELETE_MINUTES=10 APP_ENVIRONMENT_ONLY=true +LOG_CHANNEL=daily DB_HOST=127.0.0.1 DB_PORT=3306 diff --git a/config/app.php b/config/app.php index c1c94fa61..a7c196b3c 100644 --- a/config/app.php +++ b/config/app.php @@ -116,23 +116,6 @@ return [ 'cipher' => 'AES-256-CBC', - /* - |-------------------------------------------------------------------------- - | Logging Configuration - |-------------------------------------------------------------------------- - | - | Here you may configure the log settings for your application. Out of - | the box, Laravel uses the Monolog PHP logging library. This gives - | you a variety of powerful log handlers / formatters to utilize. - | - | Available Settings: "single", "daily", "syslog", "errorlog" - | - */ - - 'log' => env('APP_LOG', 'daily'), - - 'log_level' => env('APP_LOG_LEVEL', 'info'), - /* |-------------------------------------------------------------------------- | Exception Reporter Configuration diff --git a/config/hashing.php b/config/hashing.php new file mode 100644 index 000000000..f45a6090b --- /dev/null +++ b/config/hashing.php @@ -0,0 +1,50 @@ + 'bcrypt', + + /* + |-------------------------------------------------------------------------- + | Bcrypt Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Bcrypt algorithm. This will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'bcrypt' => [ + 'rounds' => env('BCRYPT_ROUNDS', 10), + ], + + /* + |-------------------------------------------------------------------------- + | Argon Options + |-------------------------------------------------------------------------- + | + | Here you may specify the configuration options that should be used when + | passwords are hashed using the Argon algorithm. These will allow you + | to control the amount of time it takes to hash the given password. + | + */ + + 'argon' => [ + 'memory' => 1024, + 'threads' => 2, + 'time' => 2, + ], +]; diff --git a/phpunit.xml b/phpunit.xml index 0ceb3db26..0b67ad6ea 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -24,6 +24,7 @@ + diff --git a/tests/TestCase.php b/tests/TestCase.php index 4d4ce896e..427744f71 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -3,7 +3,6 @@ namespace Tests; use Cake\Chronos\Chronos; -use Illuminate\Support\Facades\Hash; use Illuminate\Foundation\Testing\TestCase as BaseTestCase; abstract class TestCase extends BaseTestCase @@ -17,7 +16,6 @@ abstract class TestCase extends BaseTestCase { parent::setUp(); - Hash::setRounds(4); $this->setKnownUuidFactory(); }