Merge branch 'master' of github.com:remxcode/laravel-base

# Conflicts: #	.env.example #	.gitignore #	app/Http/Kernel.php #	app/Models/User.php #	app/Providers/LocalServiceProvider.php #	app/Providers/RouteServiceProvider.php #	composer.json #	config/app.php #	config/broadcasting.php #	config/cache.php #	config/compile.php #	config/database.php #	config/filesystems.php #	config/mail.php #	gulpfile.js #	routes/web.php #	tests/Feature/ExampleTest.php

Author: remxcode

.env.example

@@ -30,24 +30,25 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
-
-WECHAT_APPID=
-WECHAT_SECRET=
-WECHAT_TOKEN=
-WECHAT_AES_KEY=
-
-WECHAT_LOG_LEVEL=
-WECHAT_LOG_FILE=
-
-WECHAT_OAUTH_SCOPES=
-WECHAT_OAUTH_CALLBACK=
-
-WECHAT_PAYMENT_MERCHANT_ID=
-WECHAT_PAYMENT_KEY=
-WECHAT_PAYMENT_CERT_PATH=
-WECHAT_PAYMENT_KEY_PATH=
-WECHAT_PAYMENT_DEVICE_INFO=
-WECHAT_PAYMENT_SUB_APP_ID=
-WECHAT_PAYMENT_SUB_MERCHANT_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+
+WECHAT_USE_ALIAS=false
+WECHAT_APPID=null
+WECHAT_SECRET=null
+WECHAT_TOKEN=null
+WECHAT_AES_KEY=null
+
+WECHAT_LOG_LEVEL
+WECHAT_LOG_FILE
+
+WECHAT_OAUTH_SCOPES
+WECHAT_OAUTH_CALLBACK
+
+WECHAT_PAYMENT_MERCHANT_ID
+WECHAT_PAYMENT_KEY
+WECHAT_PAYMENT_CERT_PATH
+WECHAT_PAYMENT_KEY_PATH
+WECHAT_PAYMENT_DEVICE_INFO
+WECHAT_PAYMENT_SUB_APP_ID
+WECHAT_PAYMENT_SUB_MERCHANT_ID

.gitattributes

@@ -1,3 +1,3 @@
 * text=auto
 *.css linguist-vendored
-*.scss linguist-vendored
+*.scss linguist-vendored

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /public/storage
+/public/hot
 /storage/*.key
 /vendor
 /.idea

app/Exceptions/Handler.php

@@ -63,6 +63,6 @@ protected function unauthenticated($request, AuthenticationException $exception)
  return response()->json(['error' => 'Unauthenticated.'], 401);
  }
 
- return redirect()->guest('login');
+ return redirect()->guest(route('login'));
  }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -23,7 +23,7 @@ class RegisterController extends Controller
  use RegistersUsers;
 
  /**
- * Where to redirect users after login / registration.
+ * Where to redirect users after registration.
  *
  * @var string
  */

app/Http/Kernel.php

@@ -16,6 +16,9 @@ class Kernel extends HttpKernel
  protected $middleware = [
  \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
  \App\Http\Middleware\BeforeAutoTrimmer::class,
+ \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+ \App\Http\Middleware\TrimStrings::class,
+ \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
  ];
 
  /**
@@ -28,6 +31,7 @@ class Kernel extends HttpKernel
  \App\Http\Middleware\EncryptCookies::class,
  \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
  \Illuminate\Session\Middleware\StartSession::class,
+ // \Illuminate\Session\Middleware\AuthenticateSession::class,
  \Illuminate\View\Middleware\ShareErrorsFromSession::class,
  \App\Http\Middleware\VerifyCsrfToken::class,
  \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Http/Middleware/TrimStrings.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
+
+class TrimStrings extends BaseTrimmer
+{
+ /**
+ * The names of the attributes that should not be trimmed.
+ *
+ * @var array
+ */
+ protected $except = [
+ 'password',
+ 'password_confirmation',
+ ];
+}

app/Models/User.php

@@ -36,16 +36,4 @@ public function wechatAuth()
  {
  return $this->hasOne(UserAuth::class)->where('type', 'wechat');
  }
-
- /**
- * Send the password reset notification.
- *
- * @param string $token
- *
- * @return void
- */
- public function sendPasswordResetNotification($token)
- {
- // TODO: Implement sendPasswordResetNotification() method.
- }
 }

app/Providers/BroadcastServiceProvider.php

@@ -16,11 +16,6 @@ public function boot()
  {
  Broadcast::routes();
 
- /*
- * Authenticate the user's personal channel...
- */
- Broadcast::channel('App.User.*', function ($user, $userId) {
- return (int) $user->id === (int) $userId;
- });
+ require base_path('routes/channels.php');
  }
 }

app/Providers/RouteServiceProvider.php

@@ -51,12 +51,9 @@ public function map()
  */
  protected function mapWebRoutes()
  {
- Route::group([
- 'middleware' => 'web',
- 'namespace' => $this->namespace,
- ], function ($router) {
- require base_path('routes/web.php');
- });
+ Route::middleware('web')
+ ->namespace($this->namespace)
+ ->group(base_path('routes/web.php'));
  }
 
  /**
@@ -68,12 +65,9 @@ protected function mapWebRoutes()
  */
  protected function mapApiRoutes()
  {
- Route::group([
- 'middleware' => 'api',
- 'namespace' => $this->namespace,
- 'prefix' => 'api',
- ], function ($router) {
- require base_path('routes/api.php');
- });
+ Route::prefix('api')
+ ->middleware('api')
+ ->namespace($this->namespace)
+ ->group(base_path('routes/api.php'));
  }
 }