From ccc1457e572f7ec5b2b596436622f69e94bbf635 Mon Sep 17 00:00:00 2001 From: Lenophie Date: Sun, 24 Mar 2019 12:01:21 +0100 Subject: [PATCH 01/12] 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 02/12] 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 @@ We would like to extend our thanks to the following sponsors for funding Laravel - [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 03/12] 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 @@ return [ '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 04/12] 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 05/12] 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 @@ return [ '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 06/12] 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 @@ return [ | */ - '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 07/12] 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 @@ return [ | */ - '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 08/12] 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 @@ Laravel is accessible, powerful, and provides tools required for large, robust a 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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