Update to Laravel 5.4

Author: bpocallaghan

.env.example

@@ -1,8 +1,9 @@
+APP_NAME=Laravel
 APP_ENV=local
+APP_KEY=
 APP_DEBUG=true
-APP_KEY=SomeRandomString
-APP_URL=http://laravel-starter.dev/
-PUBLIC_FOLDER=public
+APP_LOG_LEVEL=debug
+APP_URL=http://localhost
 
 APP_TITLE="Laravel Starter"
 APP_DESCRIPTION="Laravel Starter with AdminLTE theme"
@@ -12,31 +13,34 @@ APP_KEYWORDS="laravel titan starter project admin adminlte"
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=laravel_starter
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
 
+BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file
-QUEUE_DRIVER=database
+QUEUE_DRIVER=sync
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailgun.org
-MAIL_PORT=587
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 
 MAIL_ADMIN="Admin Name"
 MAIL_ADMIN_EMAIL="[email protected]"
-MAIL_NAME="Mail Name"
-MAIL_ADDRESS="[email protected]"
-MAILGUN_SECRET=null
-MAILGUN_DOMAIN=null
+MAIL_FROM_NAME="ADmin"
+MAIL_FROM_ADDRESS=[email protected]
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
 
 FACEBOOK_APP_ID=null
 RECAPTCHA_PUBLIC_KEY=null

.gitattributes

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

.gitignore

@@ -1,14 +1,13 @@
-/vendor
 /node_modules
+/public/hot
 /public/storage
-Homestead.yaml
+/storage/*.key
+/vendor
+/.idea
+/.vagrant
 Homestead.json
+Homestead.yaml
+npm-debug.log
 .env
-.env.live
-.idea
 _ide_helper.php
-Thumbs.db
-_notes/
-resources/stubs/
-public/uploads/
-TODO.txt
+.phpstorm.meta.php

LICENSE

@@ -1,6 +1,8 @@
 # Laravel CMS Starter Project
 
 A Laravel CMS Starter project with AdminLTE theme and core features.
+- Laravel 5.4
+- Laravel 5.2 (Branch Laravel 5.2)
 
 [Preview project here](http://bpocallaghan.co.za/admin)
 - User: [email protected]
@@ -33,10 +35,10 @@ A Laravel CMS Starter project with AdminLTE theme and core features.
 - ```php artisan migrate```
 - ```php artisan db:seed```
 	- open database\seeds\UserTableSeeder.php to create a different admin
-- open your browser (http://laravel-starter.dev/)
+- open your browser (http://laravel-admin.dev/)
 	- the home, about, contact us gets generated + the breadcrumb
-- log into the admin (http://laravel-starter.dev/admin)
-	- admin@laravel-starter.com
+- log into the admin (http://laravel-admin.dev/admin)
+	- admin@laravel-admin.com
 	- admin
 
 ## Setup (Advanced)

README.md

@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        // Commands\Inspire::class,
+        //
     ];
 
     /**
@@ -27,4 +27,14 @@ protected function schedule(Schedule $schedule)
         // $schedule->command('inspire')
         //          ->hourly();
     }
+
+    /**
+     * Register the Closure based commands for the application.
+     *
+     * @return void
+     */
+    protected function commands()
+    {
+        require base_path('routes/console.php');
+    }
 }

app/Console/Commands/Inspire.php

@@ -3,10 +3,7 @@
 namespace App\Exceptions;
 
 use Exception;
-use Illuminate\Validation\ValidationException;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Symfony\Component\HttpKernel\Exception\HttpException;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
@@ -17,34 +14,52 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontReport = [
-        AuthorizationException::class,
-        HttpException::class,
-        ModelNotFoundException::class,
-        ValidationException::class,
+        \Illuminate\Auth\AuthenticationException::class,
+        \Illuminate\Auth\Access\AuthorizationException::class,
+        \Symfony\Component\HttpKernel\Exception\HttpException::class,
+        \Illuminate\Database\Eloquent\ModelNotFoundException::class,
+        \Illuminate\Session\TokenMismatchException::class,
+        \Illuminate\Validation\ValidationException::class,
     ];
 
     /**
      * Report or log an exception.
      *
      * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
      *
-     * @param  \Exception  $e
+     * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $e)
+    public function report(Exception $exception)
     {
-        parent::report($e);
+        parent::report($exception);
     }
 
     /**
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $e
+     * @param  \Exception  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Exception $exception)
     {
-        return parent::render($request, $e);
+        return parent::render($request, $exception);
+    }
+
+    /**
+     * Convert an authentication exception into an unauthenticated response.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @return \Illuminate\Http\Response
+     */
+    protected function unauthenticated($request, AuthenticationException $exception)
+    {
+        if ($request->expectsJson()) {
+            return response()->json(['error' => 'Unauthenticated.'], 401);
+        }
+
+        return redirect()->guest(route('login'));
     }
 }

app/Console/Kernel.php

@@ -21,8 +21,9 @@ class CitiesController extends TitanAdminController
      */
     public function index()
     {
-        return $this->view('geography.cities.index')
-            ->with('items', City::with('country')->get());
+        session()->put('url', request()->url());
+
+        return $this->view('geography.cities.index')->with('items', City::with('country')->get());
     }
 
     /**
@@ -32,8 +33,7 @@ public function index()
      */
     public function create()
     {
-        return $this->view('geography.cities.add_edit')
-            ->with('countries', Country::getAllLists());
+        return $this->view('geography.cities.add_edit')->with('countries', Country::getAllLists());
     }
 
     /**
@@ -48,60 +48,60 @@ public function store(Request $request)
 
         $this->createEntry(City::class, $request->except('files'));
 
-        return route_admin('geography.cities.index');
+        return redirect(session('url'));
     }
 
     /**
      * Display the specified city.
      *
-     * @param City $cities
+     * @param City $city
      * @return Response
      */
-    public function show(City $cities)
+    public function show(City $city)
     {
-        return $this->view('geography.cities.show')->with('item', $cities);
+        return $this->view('geography.cities.show')->with('item', $city);
     }
 
     /**
      * Show the form for editing the specified city.
      *
-     * @param City $cities
+     * @param City $city
      * @return Response
      */
-    public function edit(City $cities)
+    public function edit(City $city)
     {
         return $this->view('geography.cities.add_edit')
-            ->with('item', $cities)
+            ->with('item', $city)
             ->with('countries', Country::getAllLists());
     }
 
     /**
      * Update the specified city in storage.
      *
-     * @param City    $cities
+     * @param City    $city
      * @param Request $request
      * @return Response
      */
-    public function update(City $cities, Request $request)
+    public function update(City $city, Request $request)
     {
         $this->validate($request, City::$rules, City::$messages);
 
-        $this->updateEntry($cities, $request->except('files'));
+        $this->updateEntry($city, $request->except('files'));
 
-        return route_admin('geography.cities.index');
+        return redirect(session('url'));
     }
 
     /**
      * Remove the specified city from storage.
      *
-     * @param City    $cities
+     * @param City    $city
      * @param Request $request
      * @return Response
      */
-    public function destroy(City $cities, Request $request)
+    public function destroy(City $city, Request $request)
     {
-        $this->deleteEntry($cities, $request);
+        $this->deleteEntry($city, $request);
 
-        return route_admin('geography.cities.index');
+        return redirect(session('url'));
     }
 }