Skip to content

Commit

Permalink
Update Laravel 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
logue committed Feb 21, 2018
1 parent b827093 commit d41ff4d
Show file tree
Hide file tree
Showing 36 changed files with 28,601 additions and 38,957 deletions.
6 changes: 5 additions & 1 deletion .env.example
Expand Up @@ -2,9 +2,10 @@ APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost

LOG_CHANNEL=stack

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
Expand Down Expand Up @@ -33,3 +34,6 @@ PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
3 changes: 2 additions & 1 deletion app/Http/Controllers/Auth/RegisterController.php
Expand Up @@ -4,6 +4,7 @@

use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;

Expand Down Expand Up @@ -65,7 +66,7 @@ protected function create(array $data)
return User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => bcrypt($data['password']),
'password' => Hash::make($data['password']),
]);
}
}
1 change: 1 addition & 0 deletions app/Http/Kernel.php
Expand Up @@ -54,6 +54,7 @@ class Kernel extends HttpKernel
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
Expand Down
12 changes: 3 additions & 9 deletions app/Http/Middleware/TrustProxies.php
Expand Up @@ -15,15 +15,9 @@ class TrustProxies extends Middleware
protected $proxies;

/**
* The current proxy header mappings.
* The headers that should be used to detect proxies.
*
* @var array
* @var string
*/
protected $headers = [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}
21 changes: 12 additions & 9 deletions composer.json
@@ -1,22 +1,23 @@
{
"name": "logue/laravel",
"name": "logue/laravel5-bootstrap4-fontawasome5",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.0.0",
"barryvdh/laravel-debugbar": "~2.4",
"fideloper/proxy": "~3.3",
"laravel/framework": "5.5.*",
"laravel/tinker": "~1.0",
"nunun/laravel-phpcs": "^0.8.0"
"php": ">=7.1.3",
"fideloper/proxy": "~4.0",
"laravel/framework": "5.6.*",
"laravel/tinker": "~1.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"laravel/dusk": "~3.0",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "~6.0",
"nunomaduro/collision": "~1.1",
"phpunit/phpunit": "~7.0",
"symfony/thanks": "^1.0"
},
"autoload": {
Expand Down Expand Up @@ -55,5 +56,7 @@
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
}
},
"minimum-stability": "dev",
"prefer-stable": true
}
1 change: 0 additions & 1 deletion config/app.php
Expand Up @@ -168,7 +168,6 @@
* Package Service Providers...
*/
Barryvdh\Debugbar\ServiceProvider::class,
LaravelPHPCS\PHPCSProvider::class,

/*
* Application Service Providers...
Expand Down
1 change: 1 addition & 0 deletions config/filesystems.php
Expand Up @@ -61,6 +61,7 @@
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION'),
'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'),
],

],
Expand Down
20 changes: 20 additions & 0 deletions config/hashing.php
@@ -0,0 +1,20 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Hash Driver
|--------------------------------------------------------------------------
|
| This option controls the default hash driver that will be used to hash
| passwords for your application. By default, the bcrypt algorithm is
| used; however, you remain free to modify this option if you wish.
|
| Supported: "bcrypt", "argon"
|
*/

'driver' => 'bcrypt',

];
70 changes: 70 additions & 0 deletions config/logging.php
@@ -0,0 +1,70 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| Default Log Channel
|--------------------------------------------------------------------------
|
| This option defines the default log channel that gets used when writing
| messages to the logs. The name specified in this option should match
| one of the channels defined in the "channels" configuration array.
|
*/

'default' => env('LOG_CHANNEL', 'stack'),

/*
|--------------------------------------------------------------------------
| Log Channels
|--------------------------------------------------------------------------
|
| Here you may configure the log channels 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 Drivers: "single", "daily", "slack", "syslog",
| "errorlog", "custom", "stack"
|
*/

'channels' => [
'stack' => [
'driver' => 'stack',
'channels' => ['single'],
],

'single' => [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
'level' => 'debug',
],

'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
'level' => 'debug',
'days' => 7,
],

'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Laravel Log',
'emoji' => ':boom:',
'level' => 'critical',
],

'syslog' => [
'driver' => 'syslog',
'level' => 'debug',
],

'errorlog' => [
'driver' => 'errorlog',
'level' => 'debug',
],
],

];
1 change: 1 addition & 0 deletions config/queue.php
Expand Up @@ -62,6 +62,7 @@
'connection' => 'default',
'queue' => 'default',
'retry_after' => 90,
'block_for' => null,
],

],
Expand Down
12 changes: 6 additions & 6 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "laravel",
"version": "5.5.0",
"version": "5.6.0",
"description": "",
"private": true,
"scripts": {
Expand All @@ -18,7 +18,7 @@
"@fortawesome/fontawesome-free-regular": "^5.0.4",
"@fortawesome/fontawesome-free-solid": "^5.0.4",
"@fortawesome/vue-fontawesome": "0.0.22",
"axios": "^0.17",
"axios": "^0.18",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.1",
"babel-loader": "^7.1.2",
Expand All @@ -28,14 +28,15 @@
"babel-preset-stage-2": "^6.24.1",
"bootstrap": "^4.0.0",
"bootstrap-vue": "^1.4.1",
"cross-env": "^5.1.3",
"cross-env": "^5.1",
"css-loader": "^0.28.9",
"eslint": "^4.15.0",
"eslint-plugin-async-await": "0.0.0",
"eslint-plugin-vue": "^4.2.0",
"eslint-plugin-vue-libs": "^2.1.0",
"eslint-config-vue": "^2.0.2",
"jquery": "^3.2",
"laravel-mix": "^1.0",
"laravel-mix": "^2.0",
"lodash": "^4.17.4",
"popper.js": "^1.13.0",
"style-loader": "^0.19.1",
Expand All @@ -47,7 +48,6 @@
"webpack": "^3.10.0"
},
"dependencies": {
"@fortawesome/fontawesome-free-webfonts": "^1.0.2",
"eslint-config-vue": "^2.0.2"
"@fortawesome/fontawesome-free-webfonts": "^1.0.2"
}
}

0 comments on commit d41ff4d

Please sign in to comment.