From 8e137b525c18a8ad3b37e6bc483950ff7d2d921e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 10 Feb 2016 16:55:42 -0600 Subject: [PATCH 01/22] adding public directory to app storage --- storage/app/.gitignore | 3 ++- storage/app/public/.gitignore | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 storage/app/public/.gitignore diff --git a/storage/app/.gitignore b/storage/app/.gitignore index c96a04f0..8f4803c0 100644 --- a/storage/app/.gitignore +++ b/storage/app/.gitignore @@ -1,2 +1,3 @@ * -!.gitignore \ No newline at end of file +!public/ +!.gitignore diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/app/public/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From 85e6774d2ec7badaa0924f9d45635cd204cc9093 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Thu, 11 Feb 2016 10:19:57 -0600 Subject: [PATCH 02/22] simplify filesystem default config --- config/filesystems.php | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/config/filesystems.php b/config/filesystems.php index 3fffcf0a..75b50022 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -45,41 +45,23 @@ 'local' => [ 'driver' => 'local', - 'root' => storage_path('app'), + 'root' => storage_path('app'), ], - 'ftp' => [ - 'driver' => 'ftp', - 'host' => 'ftp.example.com', - 'username' => 'your-username', - 'password' => 'your-password', - - // Optional FTP Settings... - // 'port' => 21, - // 'root' => '', - // 'passive' => true, - // 'ssl' => true, - // 'timeout' => 30, + 'public' => [ + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'visibility' => 'public', ], 's3' => [ 'driver' => 's3', - 'key' => 'your-key', + 'key' => 'your-key', 'secret' => 'your-secret', 'region' => 'your-region', 'bucket' => 'your-bucket', ], - 'rackspace' => [ - 'driver' => 'rackspace', - 'username' => 'your-username', - 'key' => 'your-key', - 'container' => 'your-container', - 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', - 'region' => 'IAD', - 'url_type' => 'publicURL', - ], - ], ]; From c751b33d01c02aa332745c24f685282520fb16c7 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 12 Feb 2016 09:05:19 -0600 Subject: [PATCH 03/22] add to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2ff24d0f..6b3af3fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /vendor /node_modules +/public/storage Homestead.yaml Homestead.json .env From 00e5c4465cd42c4ed8be3c8ee8aa9c6f09df5f87 Mon Sep 17 00:00:00 2001 From: Martin Bean Date: Tue, 16 Feb 2016 12:02:26 +0000 Subject: [PATCH 04/22] Use safeEmail instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Faker’s `email` method can accidentally generate email addresses. This ensures “safe” addresses are only ever generated by the factory, to avoid spamming actual mailboxes if mail was sent in a loop etc. --- database/factories/ModelFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 0876c70c..f596d0b5 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -14,7 +14,7 @@ $factory->define(App\User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, - 'email' => $faker->email, + 'email' => $faker->safeEmail, 'password' => bcrypt(str_random(10)), 'remember_token' => str_random(10), ]; From 0ab4b1d5aa4c860a8aeae59f337662d5a4e2c222 Mon Sep 17 00:00:00 2001 From: Camilo Rojas Date: Tue, 16 Feb 2016 14:45:04 -0300 Subject: [PATCH 05/22] MIssing point --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 8f1a9496..536b2962 100644 --- a/readme.md +++ b/readme.md @@ -24,4 +24,4 @@ ## Security Vulnerabilities ## License -The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT) +The Laravel framework is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). From 94b568b59d61444bab06e34ada887214d843220f Mon Sep 17 00:00:00 2001 From: Anthony Holmes Date: Tue, 16 Feb 2016 13:42:33 -0600 Subject: [PATCH 06/22] Rename commented default seeder call Rename commented default seeder call to be consistent with official docs --- database/seeds/DatabaseSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 2a28edd7..e119db62 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder */ public function run() { - // $this->call(UserTableSeeder::class); + // $this->call(UsersTableSeeder::class); } } From 278c41887ce73914dc0ee645eb13ae4e5b60f1b0 Mon Sep 17 00:00:00 2001 From: Aden Fraser Date: Wed, 17 Feb 2016 23:28:21 +0000 Subject: [PATCH 07/22] APP_URL added to Environment Configuration --- .env.example | 1 + config/app.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index afbeae44..a50eace2 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ APP_ENV=local APP_DEBUG=true APP_KEY=SomeRandomString +APP_URL=http://localhost DB_HOST=127.0.0.1 DB_DATABASE=homestead diff --git a/config/app.php b/config/app.php index 04ae95e1..087bf765 100644 --- a/config/app.php +++ b/config/app.php @@ -39,7 +39,7 @@ | */ - 'url' => 'http://localhost', + 'url' => env('APP_URL', 'http://localhost'), /* |-------------------------------------------------------------------------- From e8e73c886666ee93f30e53ce1d57093ff8884f46 Mon Sep 17 00:00:00 2001 From: krienow Date: Sat, 20 Feb 2016 20:37:02 +0100 Subject: [PATCH 08/22] Add newline character. --- storage/framework/cache/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore index c96a04f0..d6b7ef32 100644 --- a/storage/framework/cache/.gitignore +++ b/storage/framework/cache/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore \ No newline at end of file +!.gitignore From 73c6898e1de53e6ad6e0b32557a3f01c8af2288c Mon Sep 17 00:00:00 2001 From: Lucas Michot Date: Mon, 22 Feb 2016 10:23:06 +0100 Subject: [PATCH 09/22] Ensure files finish with a LB --- app/Listeners/.gitkeep | 1 + app/Policies/.gitkeep | 1 + database/migrations/.gitkeep | 1 + database/seeds/.gitkeep | 1 + resources/views/vendor/.gitkeep | 1 + 5 files changed, 5 insertions(+) diff --git a/app/Listeners/.gitkeep b/app/Listeners/.gitkeep index e69de29b..8b137891 100644 --- a/app/Listeners/.gitkeep +++ b/app/Listeners/.gitkeep @@ -0,0 +1 @@ + diff --git a/app/Policies/.gitkeep b/app/Policies/.gitkeep index e69de29b..8b137891 100644 --- a/app/Policies/.gitkeep +++ b/app/Policies/.gitkeep @@ -0,0 +1 @@ + diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep index e69de29b..8b137891 100644 --- a/database/migrations/.gitkeep +++ b/database/migrations/.gitkeep @@ -0,0 +1 @@ + diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep index e69de29b..8b137891 100644 --- a/database/seeds/.gitkeep +++ b/database/seeds/.gitkeep @@ -0,0 +1 @@ + diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep index e69de29b..8b137891 100644 --- a/resources/views/vendor/.gitkeep +++ b/resources/views/vendor/.gitkeep @@ -0,0 +1 @@ + From 62d62a0524f501f1aa9b54db8110ae7d3b892fe4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Mon, 22 Feb 2016 22:19:31 -0600 Subject: [PATCH 10/22] update method call --- app/Http/Controllers/Auth/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 2d7b1a92..d2056486 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -37,7 +37,7 @@ class AuthController extends Controller */ public function __construct() { - $this->middleware('guest', ['except' => 'logout']); + $this->middleware($this->guestMiddleware(), ['except' => 'logout']); } /** From 531629e442b147fcbb172ebbf0d57deb4f5a60ee Mon Sep 17 00:00:00 2001 From: SammyK Date: Tue, 23 Feb 2016 20:07:18 -0600 Subject: [PATCH 11/22] Fix password column for future hashing --- database/migrations/2014_10_12_000000_create_users_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 65d3d083..59aa01a5 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -16,7 +16,7 @@ public function up() $table->increments('id'); $table->string('name'); $table->string('email')->unique(); - $table->string('password', 60); + $table->string('password'); $table->rememberToken(); $table->timestamps(); }); From ef6b5a6343f6e1b0ab48e7feb5fac5a07584752d Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Fri, 26 Feb 2016 08:49:55 +0000 Subject: [PATCH 12/22] Add language line for the "present" validation rule. --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index b0a1f143..d64e3e10 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -58,6 +58,7 @@ 'not_in' => 'The selected :attribute is invalid.', 'numeric' => 'The :attribute must be a number.', 'regex' => 'The :attribute format is invalid.', + 'present' => 'The :attribute field must be present.', 'required' => 'The :attribute field is required.', 'required_if' => 'The :attribute field is required when :other is :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', From fa6c48d27c54d7495e64a9ace39392d29014e46a Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Fri, 26 Feb 2016 14:59:54 +0000 Subject: [PATCH 13/22] keep the lines sorted --- resources/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d64e3e10..387d1dbb 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -57,8 +57,8 @@ ], 'not_in' => 'The selected :attribute is invalid.', 'numeric' => 'The :attribute must be a number.', - 'regex' => 'The :attribute format is invalid.', 'present' => 'The :attribute field must be present.', + 'regex' => 'The :attribute format is invalid.', 'required' => 'The :attribute field is required.', 'required_if' => 'The :attribute field is required when :other is :value.', 'required_unless' => 'The :attribute field is required unless :other is in :values.', From c36799dddeaff2a0129b2dc2a18d34651463b9a8 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Sun, 28 Feb 2016 17:08:13 +0000 Subject: [PATCH 14/22] Add language line to the validation "distinct" rule --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 387d1dbb..31792b6e 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -34,6 +34,7 @@ 'different' => 'The :attribute and :other must be different.', 'digits' => 'The :attribute must be :digits digits.', 'digits_between' => 'The :attribute must be between :min and :max digits.', + 'distinct' => 'The :attribute field has a duplicate value.', 'email' => 'The :attribute must be a valid email address.', 'exists' => 'The selected :attribute is invalid.', 'filled' => 'The :attribute field is required.', From b51630005bc326665c6549e7770df08bdaf6b503 Mon Sep 17 00:00:00 2001 From: yava9221 Date: Mon, 29 Feb 2016 08:42:43 -0700 Subject: [PATCH 15/22] clearing redundancy --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 536b2962..7f8816d6 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ # Laravel PHP Framework Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, queueing, and caching. -Laravel is accessible, yet powerful, providing powerful tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked. +Laravel is accessible, yet powerful, providing tools needed for large, robust applications. A superb inversion of control container, expressive migration system, and tightly integrated unit testing support give you the tools you need to build any application with which you are tasked. ## Official Documentation From 9fc55e84644e4199d763a7acdea42bc4734a1eae Mon Sep 17 00:00:00 2001 From: TGM Date: Tue, 1 Mar 2016 14:29:05 +0200 Subject: [PATCH 16/22] Added DB_PORT as a default enviroment variable --- .env.example | 1 + config/database.php | 1 + 2 files changed, 2 insertions(+) diff --git a/.env.example b/.env.example index a50eace2..86aab15f 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,7 @@ APP_KEY=SomeRandomString APP_URL=http://localhost DB_HOST=127.0.0.1 +DB_PORT=3306 DB_DATABASE=homestead DB_USERNAME=homestead DB_PASSWORD=secret diff --git a/config/database.php b/config/database.php index edd64256..b8a9b372 100644 --- a/config/database.php +++ b/config/database.php @@ -55,6 +55,7 @@ 'mysql' => [ 'driver' => 'mysql', 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '3306'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), From 8dbd26020ae09d0563c092a484471ae9efa890d6 Mon Sep 17 00:00:00 2001 From: TGM Date: Tue, 1 Mar 2016 14:31:07 +0200 Subject: [PATCH 17/22] Replaced TAB with space --- config/database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/database.php b/config/database.php index b8a9b372..72fc3dca 100644 --- a/config/database.php +++ b/config/database.php @@ -55,7 +55,7 @@ 'mysql' => [ 'driver' => 'mysql', 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '3306'), + 'port' => env('DB_PORT', '3306'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), From ec0e06e7830aa0f7b76ecf1f1325be84ceabea06 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 1 Mar 2016 08:23:00 -0600 Subject: [PATCH 18/22] cleaning up configs --- config/app.php | 58 ++++++++++++++++++++++----------------------- config/cache.php | 6 ++--- config/database.php | 49 ++++++++++++++++---------------------- config/queue.php | 22 ++++++++--------- config/services.php | 6 ++--- 5 files changed, 66 insertions(+), 75 deletions(-) diff --git a/config/app.php b/config/app.php index 087bf765..4fc7a63f 100644 --- a/config/app.php +++ b/config/app.php @@ -171,36 +171,36 @@ 'aliases' => [ - 'App' => Illuminate\Support\Facades\App::class, - 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, - 'Blade' => Illuminate\Support\Facades\Blade::class, - 'Cache' => Illuminate\Support\Facades\Cache::class, - 'Config' => Illuminate\Support\Facades\Config::class, - 'Cookie' => Illuminate\Support\Facades\Cookie::class, - 'Crypt' => Illuminate\Support\Facades\Crypt::class, - 'DB' => Illuminate\Support\Facades\DB::class, - 'Eloquent' => Illuminate\Database\Eloquent\Model::class, - 'Event' => Illuminate\Support\Facades\Event::class, - 'File' => Illuminate\Support\Facades\File::class, - 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Hash' => Illuminate\Support\Facades\Hash::class, - 'Lang' => Illuminate\Support\Facades\Lang::class, - 'Log' => Illuminate\Support\Facades\Log::class, - 'Mail' => Illuminate\Support\Facades\Mail::class, - 'Password' => Illuminate\Support\Facades\Password::class, - 'Queue' => Illuminate\Support\Facades\Queue::class, - 'Redirect' => Illuminate\Support\Facades\Redirect::class, - 'Redis' => Illuminate\Support\Facades\Redis::class, - 'Request' => Illuminate\Support\Facades\Request::class, - 'Response' => Illuminate\Support\Facades\Response::class, - 'Route' => Illuminate\Support\Facades\Route::class, - 'Schema' => Illuminate\Support\Facades\Schema::class, - 'Session' => Illuminate\Support\Facades\Session::class, - 'Storage' => Illuminate\Support\Facades\Storage::class, - 'URL' => Illuminate\Support\Facades\URL::class, + 'App' => Illuminate\Support\Facades\App::class, + 'Artisan' => Illuminate\Support\Facades\Artisan::class, + 'Auth' => Illuminate\Support\Facades\Auth::class, + 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Cache' => Illuminate\Support\Facades\Cache::class, + 'Config' => Illuminate\Support\Facades\Config::class, + 'Cookie' => Illuminate\Support\Facades\Cookie::class, + 'Crypt' => Illuminate\Support\Facades\Crypt::class, + 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, + 'Event' => Illuminate\Support\Facades\Event::class, + 'File' => Illuminate\Support\Facades\File::class, + 'Gate' => Illuminate\Support\Facades\Gate::class, + 'Hash' => Illuminate\Support\Facades\Hash::class, + 'Lang' => Illuminate\Support\Facades\Lang::class, + 'Log' => Illuminate\Support\Facades\Log::class, + 'Mail' => Illuminate\Support\Facades\Mail::class, + 'Password' => Illuminate\Support\Facades\Password::class, + 'Queue' => Illuminate\Support\Facades\Queue::class, + 'Redirect' => Illuminate\Support\Facades\Redirect::class, + 'Redis' => Illuminate\Support\Facades\Redis::class, + 'Request' => Illuminate\Support\Facades\Request::class, + 'Response' => Illuminate\Support\Facades\Response::class, + 'Route' => Illuminate\Support\Facades\Route::class, + 'Schema' => Illuminate\Support\Facades\Schema::class, + 'Session' => Illuminate\Support\Facades\Session::class, + 'Storage' => Illuminate\Support\Facades\Storage::class, + 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, - 'View' => Illuminate\Support\Facades\View::class, + 'View' => Illuminate\Support\Facades\View::class, ], diff --git a/config/cache.php b/config/cache.php index b00a9989..3ffa840b 100644 --- a/config/cache.php +++ b/config/cache.php @@ -38,17 +38,17 @@ 'database' => [ 'driver' => 'database', - 'table' => 'cache', + 'table' => 'cache', 'connection' => null, ], 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache'), + 'path' => storage_path('framework/cache'), ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', 'servers' => [ [ 'host' => env('MEMCACHED_HOST', '127.0.0.1'), diff --git a/config/database.php b/config/database.php index 72fc3dca..def1e560 100644 --- a/config/database.php +++ b/config/database.php @@ -47,44 +47,35 @@ 'connections' => [ 'sqlite' => [ - 'driver' => 'sqlite', + 'driver' => 'sqlite', 'database' => database_path('database.sqlite'), - 'prefix' => '', + 'prefix' => '', ], 'mysql' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', + 'driver' => 'mysql', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - 'strict' => false, - 'engine' => null, + 'prefix' => '', + 'strict' => false, + 'engine' => null, ], 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), + 'driver' => 'pgsql', + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '5432'), 'database' => env('DB_DATABASE', 'forge'), 'username' => env('DB_USERNAME', 'forge'), 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', - ], - - 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', 'localhost'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', + 'charset' => 'utf8', + 'prefix' => '', + 'schema' => 'public', ], ], @@ -118,9 +109,9 @@ 'cluster' => false, 'default' => [ - 'host' => env('REDIS_HOST', 'localhost'), + 'host' => env('REDIS_HOST', 'localhost'), 'password' => env('REDIS_PASSWORD', null), - 'port' => env('REDIS_PORT', 6379), + 'port' => env('REDIS_PORT', 6379), 'database' => 0, ], diff --git a/config/queue.php b/config/queue.php index 6c2b7d2e..a2f3888c 100644 --- a/config/queue.php +++ b/config/queue.php @@ -37,32 +37,32 @@ 'database' => [ 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'table' => 'jobs', + 'queue' => 'default', 'expire' => 60, ], 'beanstalkd' => [ 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'ttr' => 60, + 'host' => 'localhost', + 'queue' => 'default', + 'ttr' => 60, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', 'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'region' => 'us-east-1', ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', - 'queue' => 'default', - 'expire' => 60, + 'queue' => 'default', + 'expire' => 60, ], ], @@ -80,7 +80,7 @@ 'failed' => [ 'database' => env('DB_CONNECTION', 'mysql'), - 'table' => 'failed_jobs', + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index 93eec863..95a58832 100644 --- a/config/services.php +++ b/config/services.php @@ -24,14 +24,14 @@ ], 'ses' => [ - 'key' => env('SES_KEY'), + 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], 'stripe' => [ - 'model' => App\User::class, - 'key' => env('STRIPE_KEY'), + 'model' => App\User::class, + 'key' => env('STRIPE_KEY'), 'secret' => env('STRIPE_SECRET'), ], From 789c75c24ace662218d4656d3754fc343e34bac6 Mon Sep 17 00:00:00 2001 From: Mohamed Said Date: Tue, 1 Mar 2016 17:15:58 +0000 Subject: [PATCH 19/22] Add language line for the in_array validation rule --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 31792b6e..b1e61204 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -40,6 +40,7 @@ 'filled' => 'The :attribute field is required.', 'image' => 'The :attribute must be an image.', 'in' => 'The selected :attribute is invalid.', + 'in_array' => 'The :attribute field does not exist in :other.', 'integer' => 'The :attribute must be an integer.', 'ip' => 'The :attribute must be a valid IP address.', 'json' => 'The :attribute must be a valid JSON string.', From da5d3d84fe5953470c1c4062feb9a44fbd010103 Mon Sep 17 00:00:00 2001 From: Davide Bellini Date: Wed, 2 Mar 2016 01:04:24 +0100 Subject: [PATCH 20/22] Added SparkPost config --- config/mail.php | 3 ++- config/services.php | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/mail.php b/config/mail.php index cb783c90..b14b4156 100644 --- a/config/mail.php +++ b/config/mail.php @@ -11,7 +11,8 @@ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", "log" + | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", + | "log", "sparkpost" | */ diff --git a/config/services.php b/config/services.php index 95a58832..035aca14 100644 --- a/config/services.php +++ b/config/services.php @@ -23,6 +23,10 @@ 'secret' => env('MANDRILL_SECRET'), ], + 'sparkpost' => [ + 'secret' => env('SPARKPOST_SECRET'), + ], + 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), From 590593e0af1924627c195e66e1428b3348e0fb36 Mon Sep 17 00:00:00 2001 From: Jad Joubran Date: Wed, 2 Mar 2016 20:48:02 +0100 Subject: [PATCH 21/22] Fixed order of password validation in registration --- app/Http/Controllers/Auth/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index d2056486..a100dd6e 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -51,7 +51,7 @@ protected function validator(array $data) return Validator::make($data, [ 'name' => 'required|max:255', 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|confirmed|min:6', + 'password' => 'required|min:6|confirmed', ]); } From d998b5bd0392f76dcaa461fdec919658947c2e65 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 6 Mar 2016 19:56:30 -0600 Subject: [PATCH 22/22] formatting --- config/mail.php | 4 ++-- config/services.php | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/config/mail.php b/config/mail.php index b14b4156..a0765885 100644 --- a/config/mail.php +++ b/config/mail.php @@ -11,8 +11,8 @@ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "ses", - | "log", "sparkpost" + | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", + | "ses", "sparkpost", "log" | */ diff --git a/config/services.php b/config/services.php index 035aca14..287b1186 100644 --- a/config/services.php +++ b/config/services.php @@ -19,20 +19,16 @@ 'secret' => env('MAILGUN_SECRET'), ], - 'mandrill' => [ - 'secret' => env('MANDRILL_SECRET'), - ], - - 'sparkpost' => [ - 'secret' => env('SPARKPOST_SECRET'), - ], - 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], + 'sparkpost' => [ + 'secret' => env('SPARKPOST_SECRET'), + ], + 'stripe' => [ 'model' => App\User::class, 'key' => env('STRIPE_KEY'),