Merge branch 'feature/v3' into develop

* feature/v3:
  Update navbar laravel/framework#23191
  Asset fixes
  Apply fixes from StyleCI (#20)
  Add socialite fuctionality
  Asset updates and tests
  Navbar accessibility update laravel/framework@07950f9
  Blade updates and directory refactor
  Apply fixes from StyleCI (#19)
  Package updates and helper classes
  Models directory refactor
  Updated composer config and webpack
  Updated the readme
  Update npm to yarn
  Adds travis config
  Apply fixes from StyleCI (#18)
  Update the .env variables
  Fresh L5.6 installation

.env.example

@@ -2,10 +2,11 @@ APP_NAME="Laravel Zoom"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_LOG_LEVEL=debug
 APP_URL=http://laravel-zoom.test
 APP_REGISTRATION=true
 
+LOG_CHANNEL=stack
+
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -53,4 +54,7 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -10,4 +10,4 @@ Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
-.env
+.env

app/Http/Controllers/Auth/LoginController.php

@@ -60,12 +60,13 @@ public function handleProviderCallback($social)
     {
         $userSocial = Socialite::driver($social)->user();
         $user = User::where(['email' => $userSocial->getEmail()])->first();
+
         if ($user) {
             Auth::login($user);
 
             return redirect(route('dashboard'));
         } else {
-            return view('auth.register', ['name' => $userSocial->getName(), 'email' => $userSocial->getEmail()]);
+            return view('auth.register', ['name' => $userSocial->name, 'email' => $userSocial->email]);
         }
     }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -58,7 +58,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

app/Http/Kernel.php

@@ -55,6 +55,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,

app/Http/Middleware/TrustProxies.php

@@ -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;
 }

app/Models/User.php

@@ -8,12 +8,14 @@
 class User extends Authenticatable
 {
     use Notifiable;
+
     /**
      * The database table used by the model.
      *
      * @string $table
      */
     protected $table = 'users';
+
     /**
      * The attributes that are mass assignable.
      *
@@ -22,6 +24,7 @@ class User extends Authenticatable
     protected $fillable = [
         'name', 'email', 'password',
     ];
+
     /**
      * The attributes that should be hidden for arrays.
      *

app/Providers/EventServiceProvider.php

@@ -15,11 +15,9 @@ class EventServiceProvider extends ServiceProvider
         'Illuminate\Auth\Events\Registered' => [
             'App\Listeners\LogRegisteredUser',
         ],
-
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\LogSuccessfulLogin',
         ],
-
         'Illuminate\Auth\Events\Failed' => [
             'App\Listeners\LogFailedLogin',
         ],

composer.json

@@ -11,22 +11,23 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1.3",
         "bepsvpt/secure-headers": "^4.1",
-        "fideloper/proxy": "~3.3",
-        "laravel/framework": "5.5.*",
+        "fideloper/proxy": "~4.0",
+        "laravel/framework": "5.6.*",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
-        "spatie/laravel-activitylog": "^2.3"
+        "spatie/laravel-activitylog": "^2.5"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.1",
+        "barryvdh/laravel-ide-helper": "^2.4",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~6.0",
-        "symfony/thanks": "^1.0",
-        "barryvdh/laravel-debugbar": "^3.1",
-        "barryvdh/laravel-ide-helper": "^2.4"
+        "nunomaduro/collision": "~1.1",
+        "phpunit/phpunit": "~7.0",
+        "symfony/thanks": "^1.0"
     },
     "autoload": {
         "classmap": [
@@ -64,5 +65,7 @@
         "preferred-install": "dist",
         "sort-packages": true,
         "optimize-autoloader": true
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }