diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1492202b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.yml] +indent_style = space +indent_size = 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f989f14..d656e03c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Release Notes +## v5.6.12 (2018-03-14) + +### Added +- Added message for `not_regex` validation rule ([#4602](https://github.com/laravel/laravel/pull/4602)) +- Added `signed` middleware alias for `ValidateSignature` ([4369e91](https://github.com/laravel/laravel/commit/4369e9144ce1062941eda2b19772dbdcb10e9027)) +- Added `stderr` example to `config/logging.php` ([66f5757](https://github.com/laravel/laravel/commit/66f5757d58cb3f6d1152ec2d5f12e247eb2242e2)) + +### Changed +- Set `MAIL_DRIVER` in `phpunit.xml` ([#4607](https://github.com/laravel/laravel/pull/4607)) + +### Removed +- Removed "thanks" package ([#4593](https://github.com/laravel/laravel/pull/4593)) + + +## v5.6.7 (2018-02-27) + +### Changed +- Use `Hash::make()` in `RegisterController` ([#4570](https://github.com/laravel/laravel/pull/4570)) +- Update Collision to `2.0` ([#4581](https://github.com/laravel/laravel/pull/4581)) + +### Removed +- Removed Bootstrap 3 variables ([#4572](https://github.com/laravel/laravel/pull/4572)) + + ## v5.6.0 (2018-02-07) ### Added diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 7e2563a8..043cad6b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -29,8 +29,6 @@ class Handler extends ExceptionHandler /** * Report or log an exception. * - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. - * * @param \Exception $exception * @return void */ diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index cbfc45fc..0e5dff86 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -14,7 +14,7 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ - \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + \App\Http\Middleware\CheckForMaintenanceMode::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php new file mode 100644 index 00000000..35b9824b --- /dev/null +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -0,0 +1,17 @@ + '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/config/logging.php b/config/logging.php index 902efafb..400bc7f4 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,5 +1,7 @@ 'critical', ], + 'stderr' => [ + 'driver' => 'monolog', + 'handler' => StreamHandler::class, + 'with' => [ + 'stream' => 'php://stderr', + ], + ], + 'syslog' => [ 'driver' => 'syslog', 'level' => 'debug', diff --git a/config/services.php b/config/services.php index 4460f0ec..aa1f7f82 100644 --- a/config/services.php +++ b/config/services.php @@ -22,7 +22,7 @@ return [ 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), - 'region' => 'us-east-1', + 'region' => env('SES_REGION', 'us-east-1'), ], 'sparkpost' => [ diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index e119db62..91cb6d1c 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -5,7 +5,7 @@ use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder { /** - * Run the database seeds. + * Seed the application's database. * * @return void */ diff --git a/package.json b/package.json index 3de8d8d1..e81ab87f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "npm run development", "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "npm run development -- --watch", "watch-poll": "npm run watch -- --watch-poll", "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", "prod": "npm run production", diff --git a/phpunit.xml b/phpunit.xml index 9ee3e734..4942aa2a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -9,13 +9,13 @@ processIsolation="false" stopOnFailure="false"> - - ./tests/Feature - - ./tests/Unit + + + ./tests/Feature + @@ -24,6 +24,7 @@ + diff --git a/readme.md b/readme.md index 5e90f480..9c8c703a 100644 --- a/readme.md +++ b/readme.md @@ -34,7 +34,9 @@ We would like to extend our thanks to the following sponsors for helping fund on - **[Vehikl](https://vehikl.com/)** - **[Tighten Co.](https://tighten.co)** - **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** +- **[Cubet Techno Labs](https://cubettech.com)** - **[British Software Development](https://www.britishsoftware.co)** +- [UserInsights](https://userinsights.com) - [Fragrantica](https://www.fragrantica.com) - [SOFTonSOFA](https://softonsofa.com/) - [User10](https://user10.com) @@ -42,9 +44,10 @@ We would like to extend our thanks to the following sponsors for helping fund on - [CodeBrisk](https://codebrisk.com) - [1Forge](https://1forge.com) - [TECPRESSO](https://tecpresso.co.jp/) -- [Pulse Storm](http://www.pulsestorm.net/) - [Runtime Converter](http://runtimeconverter.com/) - [WebL'Agence](https://weblagence.com/) +- [Invoice Ninja](https://www.invoiceninja.com) +- [iMi digital](https://www.imi-digital.de/) ## Contributing diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss index 70ecfdb3..6799fc45 100644 --- a/resources/assets/sass/_variables.scss +++ b/resources/assets/sass/_variables.scss @@ -1,8 +1,20 @@ // Body -$body-bg: #f5f8fa; +$body-bg: #f8fafc; // Typography -$font-family-sans-serif: "Raleway", sans-serif; +$font-family-sans-serif: "Nunito", sans-serif; $font-size-base: 0.9rem; $line-height-base: 1.6; + +// Colors +$blue: #3490dc; +$indigo: #6574cd; +$purple: #9561e2; +$pink: #f66D9b; +$red: #e3342f; +$orange: #f6993f; +$yellow: #ffed4a; +$green: #38c172; +$teal: #4dc0b5; +$cyan: #6cb2eb; diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 0077cb14..f42e7986 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,9 +1,9 @@ // Fonts -@import url("https://fonts.googleapis.com/css?family=Raleway:300,400,600"); +@import url('https://fonts.googleapis.com/css?family=Nunito'); // Variables -@import "variables"; +@import 'variables'; // Bootstrap @import '~bootstrap/scss/bootstrap'; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 77d23022..b163c424 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -18,7 +18,7 @@ return [ 'after' => 'The :attribute must be a date after :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'alpha' => 'The :attribute may only contain letters.', - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', + 'alpha_dash' => 'The :attribute may only contain letters, numbers, dashes and underscores.', 'alpha_num' => 'The :attribute may only contain letters and numbers.', 'array' => 'The :attribute must be an array.', 'before' => 'The :attribute must be a date before :date.', @@ -42,6 +42,18 @@ return [ 'exists' => 'The selected :attribute is invalid.', 'file' => 'The :attribute must be a file.', 'filled' => 'The :attribute field must have a value.', + 'gt' => [ + 'numeric' => 'The :attribute must be greater than :value.', + 'file' => 'The :attribute must be greater than :value kilobytes.', + 'string' => 'The :attribute must be greater than :value characters.', + 'array' => 'The :attribute must have more than :value items.', + ], + 'gte' => [ + 'numeric' => 'The :attribute must be greater than or equal :value.', + 'file' => 'The :attribute must be greater than or equal :value kilobytes.', + 'string' => 'The :attribute must be greater than or equal :value characters.', + 'array' => 'The :attribute must have :value items or more.', + ], 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', 'in_array' => 'The :attribute field does not exist in :other.', @@ -50,6 +62,18 @@ return [ 'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv6' => 'The :attribute must be a valid IPv6 address.', 'json' => 'The :attribute must be a valid JSON string.', + 'lt' => [ + 'numeric' => 'The :attribute must be less than :value.', + 'file' => 'The :attribute must be less than :value kilobytes.', + 'string' => 'The :attribute must be less than :value characters.', + 'array' => 'The :attribute must have less than :value items.', + ], + 'lte' => [ + 'numeric' => 'The :attribute must be less than or equal :value.', + 'file' => 'The :attribute must be less than or equal :value kilobytes.', + 'string' => 'The :attribute must be less than or equal :value characters.', + 'array' => 'The :attribute must not have more than :value items.', + ], 'max' => [ 'numeric' => 'The :attribute may not be greater than :max.', 'file' => 'The :attribute may not be greater than :max kilobytes.', diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index ff133fb4..547152f6 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -2,7 +2,6 @@ namespace Tests; -use Illuminate\Support\Facades\Hash; use Illuminate\Contracts\Console\Kernel; trait CreatesApplication @@ -18,8 +17,6 @@ trait CreatesApplication $app->make(Kernel::class)->bootstrap(); - Hash::driver('bcrypt')->setRounds(4); - return $app; } }