Merge pull request #132 from NottingHack/laravel-5.4

Laravel 5.4

Author: roberthunt

.env.behat

@@ -1,6 +1,7 @@
+APP_NAME="Hackspace Managment System"
 APP_ENV=acceptance
-APP_DEBUG=true
 APP_KEY=12345678123456781234567812345678
+APP_DEBUG=true
 
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
@@ -21,10 +22,13 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME=null
 
 PASSWORDSTORE=FileBased
+PASSWORDSTORE_FILE=users.json

.env.example

@@ -1,3 +1,4 @@
+APP_NAME=Laravel
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
@@ -21,12 +22,14 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
+MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME=null
 
 PUSHER_APP_ID=
-PUSHER_KEY=
-PUSHER_SECRET=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto
 *.css linguist-vendored
 *.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.gitignore

@@ -1,15 +1,15 @@
-### Vagrant ###
-.vagrant/
-
-
 ### Laravel ###
 /node_modules
+/public/hot
 /public/storage
+/storage/*.key
 /public/build
 /vendor
 /.idea
+/.vagrant
 Homestead.json
 Homestead.yaml
+npm-debug.log
 .env
 database/database.sqlite
 
@@ -25,4 +25,5 @@ Thumbs.db
 
 /public/css
 /public/js
-gulpwatch.log
+mixwatch.log
+/public/mix-manifest.json

Vagrantfile

@@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/kerberos.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/node.sh"
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/laravel.sh"
-  config.vm.provision :shell, path: "dev/vagrant-config/scripts/gulp.sh", privileged: false
+  config.vm.provision :shell, path: "dev/vagrant-config/scripts/mix.sh", privileged: false
   config.vm.provision :shell, path: "dev/vagrant-config/scripts/finish.sh"
 
   config.vm.network "private_network", ip: "192.168.25.35"

app/Exceptions/Handler.php

@@ -69,7 +69,7 @@ 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/LoginController.php

@@ -35,7 +35,7 @@ class LoginController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest')->except('logout');
     }
 
     /**

app/Http/Kernel.php

@@ -15,6 +15,9 @@ class Kernel extends HttpKernel
      */
     protected $middleware = [
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        \App\Http\Middleware\TrimStrings::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -27,6 +30,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,
             \App\Http\Middleware\SubstituteEntityBindings::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/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');
     }
 }