adapt latest Laravel changes

Author: lbausch

.env.example

@@ -27,5 +27,6 @@ MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
 
-ASSETS_PIPELINE=true
+ASSETS_PIPELINE=auto

.gitignore

@@ -1,12 +1,11 @@
 /vendor
 /node_modules
+Homestead.yaml
+Homestead.json
 .env
 
-## Composer
-composer.lock
+## PhpStorm
+.idea/
 
 ## Assets
 /public/assets/min
-
-## PhpStorm
-.idea/

app/Console/Commands/Inspire.php

@@ -1,32 +1,33 @@
-<?php namespace SQLgreyGUI\Console\Commands;
+<?php
+
+namespace SQLgreyGUI\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
 
-class Inspire extends Command {
-
-	/**
-	 * The console command name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'inspire';
-
-	/**
-	 * The console command description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Display an inspiring quote';
+class Inspire extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'inspire';
 
-	/**
-	 * Execute the console command.
-	 *
-	 * @return mixed
-	 */
-	public function handle()
-	{
-		$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
-	}
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Display an inspiring quote';
 
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
+    }
 }

app/Console/Kernel.php

@@ -7,25 +7,22 @@
 
 class Kernel extends ConsoleKernel
 {
-
     /**
      * The Artisan commands provided by your application.
      *
      * @var array
      */
     protected $commands = [
-        'SQLgreyGUI\Console\Commands\Inspire',
+        //\SQLgreyGUI\Console\Commands\Inspire::class,
     ];
 
     /**
      * Define the application's command schedule.
      *
-     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
-     * @return void
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      */
     protected function schedule(Schedule $schedule)
     {
         //$schedule->command('inspire')->hourly();
     }
-
 }

app/Events/Event.php

@@ -1,7 +1,8 @@
-<?php namespace SQLgreyGUI\Events;
+<?php
 
-abstract class Event {
-
-	//
+namespace SQLgreyGUI\Events;
 
+abstract class Event
+{
+    //
 }

app/Exceptions/Handler.php

@@ -1,42 +1,51 @@
-<?php namespace SQLgreyGUI\Exceptions;
+<?php
+
+namespace SQLgreyGUI\Exceptions;
 
 use Exception;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
-class Handler extends ExceptionHandler {
-
-	/**
-	 * A list of the exception types that should not be reported.
-	 *
-	 * @var array
-	 */
-	protected $dontReport = [
-		'Symfony\Component\HttpKernel\Exception\HttpException'
-	];
+class Handler extends ExceptionHandler
+{
+    /**
+     * A list of the exception types that should not be reported.
+     *
+     * @var array
+     */
+    protected $dontReport = [
+        HttpException::class,
+        ModelNotFoundException::class,
+    ];
 
-	/**
-	 * Report or log an exception.
-	 *
-	 * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-	 *
-	 * @param  \Exception  $e
-	 * @return void
-	 */
-	public function report(Exception $e)
-	{
-		return parent::report($e);
-	}
+    /**
+     * Report or log an exception.
+     *
+     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
+     *
+     * @param \Exception $e
+     */
+    public function report(Exception $e)
+    {
+        return parent::report($e);
+    }
 
-	/**
-	 * Render an exception into an HTTP response.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Exception  $e
-	 * @return \Illuminate\Http\Response
-	 */
-	public function render($request, Exception $e)
-	{
-		return parent::render($request, $e);
-	}
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Exception               $e
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function render($request, Exception $e)
+    {
+        if ($e instanceof ModelNotFoundException) {
+            $e = new NotFoundHttpException($e->getMessage(), $e);
+        }
 
+        return parent::render($request, $e);
+    }
 }

app/Http/Controllers/Controller.php

@@ -2,43 +2,37 @@
 
 namespace SQLgreyGUI\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesCommands;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Auth;
 
 abstract class Controller extends BaseController
 {
-
-    use DispatchesCommands,
-        ValidatesRequests;
+    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
 
     /**
-     * the user id
-     * 
+     * the user id.
+     *
      * @var int
      */
     protected $userid;
 
     /**
-     * User
-     * 
+     * User.
+     *
      * @var \SQLgreyGUI\Models\User
      */
     protected $user;
 
     /**
-     * Constructor
-     * 
-     * @return void
+     * Constructor.
      */
     public function __construct()
     {
-        if (\Auth::viaRemember()) {
-            \Auth::login(\Auth::User());
-        }
-
-        if (\Auth::check()) {
-            $this->user = \Auth::User();
+        if (Auth::check()) {
+            $this->user = Auth::User();
 
             $this->userid = $this->user->getId();
 
@@ -48,8 +42,8 @@ public function __construct()
     }
 
     /**
-     * parse provided entries
-     * 
+     * parse provided entries.
+     *
      * @return array
      */
     protected function parseEntries($input_identifier, $repository)
@@ -70,8 +64,8 @@ protected function parseEntries($input_identifier, $repository)
     }
 
     /**
-     * get name of the current controller
-     * 
+     * get name of the current controller.
+     *
      * @return string
      */
     protected function getController()
@@ -82,25 +76,24 @@ protected function getController()
     }
 
     /**
-     * get action
-     * 
+     * get action.
+     *
      * @param string $action
-     * 
+     *
      * @return string
      */
     public function getAction($action)
     {
-        return $this->getController() . '@' . $action;
+        return $this->getController().'@'.$action;
     }
 
     /**
-     * is ajax request
-     * 
-     * @return boolean
+     * is ajax request.
+     *
+     * @return bool
      */
     protected function isAjax()
     {
         return \Request::ajax();
     }
-
 }

app/Http/Kernel.php

@@ -6,19 +6,18 @@
 
 class Kernel extends HttpKernel
 {
-
     /**
      * The application's global HTTP middleware stack.
      *
      * @var array
      */
     protected $middleware = [
-        'Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode',
-        'Illuminate\Cookie\Middleware\EncryptCookies',
-        'Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse',
-        'Illuminate\Session\Middleware\StartSession',
-        'Illuminate\View\Middleware\ShareErrorsFromSession',
-        'SQLgreyGUI\Http\Middleware\VerifyCsrfToken',
+        \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+        \SQLgreyGUI\Http\Middleware\EncryptCookies::class,
+        \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+        \Illuminate\Session\Middleware\StartSession::class,
+        \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+        \SQLgreyGUI\Http\Middleware\VerifyCsrfToken::class,
     ];
 
     /**
@@ -27,9 +26,8 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
-        'auth' => 'SQLgreyGUI\Http\Middleware\Authenticate',
-        'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth',
-        'guest' => 'SQLgreyGUI\Http\Middleware\RedirectIfAuthenticated',
+        'auth' => \SQLgreyGUI\Http\Middleware\Authenticate::class,
+        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'guest' => \SQLgreyGUI\Http\Middleware\RedirectIfAuthenticated::class,
     ];
-
 }

app/Http/Middleware/Authenticate.php

@@ -7,7 +7,6 @@
 
 class Authenticate
 {
-
     /**
      * The Guard implementation.
      *
@@ -18,8 +17,7 @@ class Authenticate
     /**
      * Create a new filter instance.
      *
-     * @param  Guard  $auth
-     * @return void
+     * @param Guard $auth
      */
     public function __construct(Guard $auth)
     {
@@ -29,8 +27,9 @@ public function __construct(Guard $auth)
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
      * @return mixed
      */
     public function handle($request, Closure $next)
@@ -45,5 +44,4 @@ public function handle($request, Closure $next)
 
         return $next($request);
     }
-
 }