From 3d325b8485591bc77d1073f7aa73596acb76ec23 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 5 Mar 2019 15:12:04 +0100 Subject: [PATCH 01/22] Update changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58c52246..60e224c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Release Notes +## [v5.8.3 (2019-03-05)](https://github.com/laravel/laravel/compare/v5.8.0...v5.8.3) + +### Added +- Add AWS S3 Bucket to `.env.example` ([f84a69e](https://github.com/laravel/laravel/commit/f84a69ee852bd44363042a61995d330574b6b8c3)) + +### Changed +- Set default AWS region ([ff4f40f](https://github.com/laravel/laravel/commit/ff4f40fbabcefcb87facb1346fcfe5b8266eb40d), [#4956](https://github.com/laravel/laravel/pull/4956)) + +### Fixed +- Comment out non-existing model class and policy example ([f4ff4f4](https://github.com/laravel/laravel/commit/f4ff4f4176f7d931e301f36b95a46285ac61b8b8)) +- Only apply MySQL PDO options when extension exists ([3001f3c](https://github.com/laravel/laravel/commit/3001f3c6e232ba7ce2ecdbdfe6e43b4c64ee05ad)) + ## [v5.8.0 (2019-02-26)](https://github.com/laravel/laravel/compare/v5.7.28...v5.8.0) ### Added From 54cd6d90bbe317040a0195e09c4fc40318bb988d Mon Sep 17 00:00:00 2001 From: Rod Elias Date: Thu, 7 Mar 2019 23:20:15 -0300 Subject: [PATCH 02/22] upgrade the collision dependency from v2 to v3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bda43337..8e2b2d7e 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", - "nunomaduro/collision": "^2.0", + "nunomaduro/collision": "^3.0", "phpunit/phpunit": "^7.5" }, "config": { From 4997f08105d6fb941b1ed2c749ebd2f55fba5a74 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 12 Mar 2019 17:22:48 +0100 Subject: [PATCH 03/22] Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60e224c0..aa0c0ce7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Release Notes +## [Unreleased](https://github.com/laravel/laravel/compare/v5.8.3...master) + +### Changed +- Upgrade the collision dependency from v2 to v3 ([#4963](https://github.com/laravel/laravel/pull/4963)) + + ## [v5.8.3 (2019-03-05)](https://github.com/laravel/laravel/compare/v5.8.0...v5.8.3) ### Added @@ -12,6 +18,7 @@ ### Fixed - Comment out non-existing model class and policy example ([f4ff4f4](https://github.com/laravel/laravel/commit/f4ff4f4176f7d931e301f36b95a46285ac61b8b8)) - Only apply MySQL PDO options when extension exists ([3001f3c](https://github.com/laravel/laravel/commit/3001f3c6e232ba7ce2ecdbdfe6e43b4c64ee05ad)) + ## [v5.8.0 (2019-02-26)](https://github.com/laravel/laravel/compare/v5.7.28...v5.8.0) ### Added From ccc1457e572f7ec5b2b596436622f69e94bbf635 Mon Sep 17 00:00:00 2001 From: Lenophie Date: Sun, 24 Mar 2019 12:01:21 +0100 Subject: [PATCH 04/22] Ignore SQLite journals --- database/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/database/.gitignore b/database/.gitignore index 9b1dffd9..97fc9767 100644 --- a/database/.gitignore +++ b/database/.gitignore @@ -1 +1,2 @@ *.sqlite +*.sqlite-journal From 88636c2268aa5dada08a2cd08c098bd9d25880f4 Mon Sep 17 00:00:00 2001 From: Tony James Date: Mon, 1 Apr 2019 16:23:23 +0100 Subject: [PATCH 05/22] Added Hyper Host sponsor Added Hyper Host name and url --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 2cb6913f..24ac590b 100644 --- a/readme.md +++ b/readme.md @@ -57,6 +57,7 @@ ## Laravel Sponsors - [We Are The Robots Inc.](https://watr.mx/) - [Understand.io](https://www.understand.io/) - [Abdel Elrafa](https://abdelelrafa.com) +- [Hyper Host](https://hyper.host) ## Contributing From c8bc79e94ee7f4a992d70faa5ec140a9059e603f Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Thu, 4 Apr 2019 15:11:18 +0100 Subject: [PATCH 06/22] Prefix redis database connection by default to mitigate multiple sites on the same server potentially sharing the same queued jobs --- config/database.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/database.php b/config/database.php index 49ec59af..7560c66b 100644 --- a/config/database.php +++ b/config/database.php @@ -117,6 +117,7 @@ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'predis'), + 'prefix' => str_slug(env('APP_NAME', 'laravel'), '_').'_database', ], 'default' => [ From e68ff0c66aa1b3da2c9a14d86636d582fd73891e Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Thu, 4 Apr 2019 22:18:28 +0100 Subject: [PATCH 07/22] Use Str class instead of helper function --- config/database.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 7560c66b..1f96d0dd 100644 --- a/config/database.php +++ b/config/database.php @@ -1,5 +1,7 @@ [ 'cluster' => env('REDIS_CLUSTER', 'predis'), - 'prefix' => str_slug(env('APP_NAME', 'laravel'), '_').'_database', + 'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database', ], 'default' => [ From 159b0e79cd5b26bc7cd4699113951599a5b5d6d0 Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Mon, 8 Apr 2019 08:50:48 +0100 Subject: [PATCH 08/22] Additional underscore on redis database prefix --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index 1f96d0dd..9b30dc1f 100644 --- a/config/database.php +++ b/config/database.php @@ -119,7 +119,7 @@ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'predis'), - 'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database', + 'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_', ], 'default' => [ From 3cbc5ac640022cb4e3fcad7fc50e2086d32af6ae Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Mon, 8 Apr 2019 08:52:06 +0100 Subject: [PATCH 09/22] Additional underscore on cache prefix --- config/cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cache.php b/config/cache.php index 30f0cae2..414ca996 100644 --- a/config/cache.php +++ b/config/cache.php @@ -97,6 +97,6 @@ | */ - 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'), ]; From 1bed031c1f7cfcfeadf497934d301987c53b1e6e Mon Sep 17 00:00:00 2001 From: Jordan Hall Date: Wed, 10 Apr 2019 12:01:28 +0100 Subject: [PATCH 10/22] Remove underscore as cache prefixes automatically have a colon appended to them --- config/cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cache.php b/config/cache.php index 414ca996..30f0cae2 100644 --- a/config/cache.php +++ b/config/cache.php @@ -97,6 +97,6 @@ | */ - 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), ]; From 14b0a07d79a60ef45ce5b26f8b1c34ab9274dba7 Mon Sep 17 00:00:00 2001 From: DrewRoberts Date: Fri, 12 Apr 2019 01:34:48 -0400 Subject: [PATCH 11/22] Update readme with Laracasts count --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 24ac590b..7065972f 100644 --- a/readme.md +++ b/readme.md @@ -25,7 +25,7 @@ ## Learning Laravel Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1100 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library. +If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1400 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library. ## Laravel Sponsors From ef1ce665eef55e90952cd606ae120cf8c619822d Mon Sep 17 00:00:00 2001 From: Sjors Ottjes Date: Sun, 14 Apr 2019 13:30:53 +0200 Subject: [PATCH 12/22] Update UserFactory.php --- database/factories/UserFactory.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 2985ea24..14aa8086 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,5 +1,7 @@ Date: Mon, 22 Apr 2019 15:55:40 +0200 Subject: [PATCH 13/22] Add StyleCI config --- .styleci.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .styleci.yml diff --git a/.styleci.yml b/.styleci.yml new file mode 100644 index 00000000..89801211 --- /dev/null +++ b/.styleci.yml @@ -0,0 +1,6 @@ +php: + preset: laravel + disabled: + - unused_use +js: true +css: true From 91dc5ed2869b5905a01b0b85d70f33bbd9267b93 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 22 Apr 2019 14:06:03 +0000 Subject: [PATCH 14/22] Apply fixes from StyleCI --- resources/js/app.js | 3 +-- resources/js/bootstrap.js | 1 - resources/sass/_variables.scss | 5 ++--- resources/sass/app.scss | 5 ++--- webpack.mix.js | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/resources/js/app.js b/resources/js/app.js index 4131ca04..a1efb5c3 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,4 +1,3 @@ - /** * First we will load all of this project's JavaScript dependencies which * includes Vue and other libraries. It is a great starting point when @@ -29,5 +28,5 @@ Vue.component('example-component', require('./components/ExampleComponent.vue'). */ const app = new Vue({ - el: '#app' + el: '#app', }); diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index c1f8ac39..f29bb81d 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -1,4 +1,3 @@ - window._ = require('lodash'); /** diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 6799fc45..0407ab57 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -1,9 +1,8 @@ - // Body $body-bg: #f8fafc; // Typography -$font-family-sans-serif: "Nunito", sans-serif; +$font-family-sans-serif: 'Nunito', sans-serif; $font-size-base: 0.9rem; $line-height-base: 1.6; @@ -11,7 +10,7 @@ $line-height-base: 1.6; $blue: #3490dc; $indigo: #6574cd; $purple: #9561e2; -$pink: #f66D9b; +$pink: #f66d9b; $red: #e3342f; $orange: #f6993f; $yellow: #ffed4a; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index f42e7986..3f1850e3 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,4 +1,3 @@ - // Fonts @import url('https://fonts.googleapis.com/css?family=Nunito'); @@ -9,6 +8,6 @@ @import '~bootstrap/scss/bootstrap'; .navbar-laravel { - background-color: #fff; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04); + background-color: #fff; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04); } diff --git a/webpack.mix.js b/webpack.mix.js index 19a48fa1..ce003ec7 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,5 +11,4 @@ const mix = require('laravel-mix'); | */ -mix.js('resources/js/app.js', 'public/js') - .sass('resources/sass/app.scss', 'public/css'); +mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css'); From 43b09ad0f326584d56d20fc0cf2bef99b83af877 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 22 Apr 2019 16:06:06 +0200 Subject: [PATCH 15/22] Add file exclusions for styleci --- .styleci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.styleci.yml b/.styleci.yml index 89801211..41f74bcd 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -2,5 +2,9 @@ php: preset: laravel disabled: - unused_use + finder: + not-name: + - index.php + - server.php js: true css: true From f574aa76e3e1b8b1d77469e37d2857e27da14379 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 22 Apr 2019 21:26:44 +0200 Subject: [PATCH 16/22] Disable JS checks for now --- .styleci.yml | 1 - webpack.mix.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index 41f74bcd..bbcd3bf3 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -6,5 +6,4 @@ php: not-name: - index.php - server.php -js: true css: true diff --git a/webpack.mix.js b/webpack.mix.js index ce003ec7..8a923cbb 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -11,4 +11,5 @@ const mix = require('laravel-mix'); | */ -mix.js('resources/js/app.js', 'public/js').sass('resources/sass/app.scss', 'public/css'); +mix.js('resources/js/app.js', 'public/js') + .sass('resources/sass/app.scss', 'public/css'); From 60db703a27bb09d0a51023131f850d5d424997db Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Tue, 23 Apr 2019 13:44:51 +0100 Subject: [PATCH 17/22] [5.8] Enable JS on StyleCI (#5000) * Enable JS on StyleCI --- .styleci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.styleci.yml b/.styleci.yml index bbcd3bf3..1db61d96 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -6,4 +6,8 @@ php: not-name: - index.php - server.php +js: + finder: + not-name: + - webpack.mix.js css: true From 12a4885a47fbd272a4a942d49d7b1eb1b42f2b19 Mon Sep 17 00:00:00 2001 From: Stefan Bauer Date: Wed, 24 Apr 2019 14:38:18 +0200 Subject: [PATCH 18/22] Fix phpdoc to order by syntax convention (#5005) Reorder the `@var` phpdoc syntax by convention, see http://docs.phpdoc.org/references/phpdoc/tags/var.html --- database/factories/UserFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 14aa8086..545516cf 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,6 +1,6 @@ Date: Wed, 24 Apr 2019 07:38:42 -0500 Subject: [PATCH 19/22] Apply fixes from StyleCI (#5006) --- database/factories/UserFactory.php | 1 - 1 file changed, 1 deletion(-) diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 545516cf..5e516cee 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,7 +1,6 @@ Date: Fri, 26 Apr 2019 09:26:45 -0300 Subject: [PATCH 20/22] [5.9] Minor grammar fix in readme.md (#5010) * Fix grammar ('Boost *your* skills') * Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7065972f..8b5717ed 100644 --- a/readme.md +++ b/readme.md @@ -25,7 +25,7 @@ ## Learning Laravel Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1400 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost you and your team's skills by digging into our comprehensive video library. +If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1400 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. ## Laravel Sponsors From a6bf24134d99be79e77b8969186b9f46ffee075a Mon Sep 17 00:00:00 2001 From: Roberto Aguilar Date: Mon, 29 Apr 2019 16:21:59 -0500 Subject: [PATCH 21/22] Exclude StyleCI config from exported files (#5012) I noticed that this file was being included when i ran the `laravel new` command and even though some developers will run StyleCI, the purpose of this file seems more like it ensures the repository quality rather than providing an starting point for this service. --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 967315dd..0f772996 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,5 @@ *.css linguist-vendored *.scss linguist-vendored *.js linguist-vendored +.styleci.yml export-ignore CHANGELOG.md export-ignore From ccea56b6f910649d8a6ee25f61896d2b96e90496 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 30 Apr 2019 14:02:09 +0200 Subject: [PATCH 22/22] Revert "Exclude StyleCI config from exported files (#5012)" This reverts commit a6bf24134d99be79e77b8969186b9f46ffee075a. --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0f772996..967315dd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,5 +2,4 @@ *.css linguist-vendored *.scss linguist-vendored *.js linguist-vendored -.styleci.yml export-ignore CHANGELOG.md export-ignore