From 515b32fd872392ed8fa05e7aa66f9af74abf64dd Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 26 Sep 2019 20:49:52 +1000
Subject: [PATCH] Bump to Laravel 6

---
 app/Http/Kernel.php                                 |  2 +-
 app/Http/Middleware/StartupCheck.php                |  2 +-
 app/Http/Requests/Client/UpdateClientRequest.php    |  2 +-
 composer.json                                       |  8 ++++----
 config/cache.php                                    |  4 +++-
 resources/views/portal/default/auth/login.blade.php |  8 ++++----
 resources/views/portal/default/header.blade.php     | 10 +++++-----
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d7bc3ec70073..3c987fa792c3 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -27,7 +27,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
-      //  \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
     ];
 
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index e4072784ead9..08fbb281e0c9 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -13,7 +13,7 @@ namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Request as Input;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Session;
diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php
index 162865acf44a..dcfe13ff8cfe 100644
--- a/app/Http/Requests/Client/UpdateClientRequest.php
+++ b/app/Http/Requests/Client/UpdateClientRequest.php
@@ -44,7 +44,7 @@ class UpdateClientRequest extends Request
             if(is_array($contacts))
             {
                 for ($i = 0; $i < count($contacts); $i++) {
-                    $rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . $contacts[$i]['id'];
+                    $rules['contacts.' . $i . '.email'] = 'nullable|email|unique:client_contacts,email,' . $contacts[$i]['id'];
                 }
             }
             return $rules;
diff --git a/composer.json b/composer.json
index 966a0c8f64b1..5e2f54ab8e61 100644
--- a/composer.json
+++ b/composer.json
@@ -26,13 +26,13 @@
         "hashids/hashids": "^3.0",
         "intervention/image": "^2.4",
         "laracasts/presenter": "^0.2.1",
-        "laravel/framework": "5.8.*",
-        "laravel/socialite": "^3.1",
+        "laravel/framework": "6.0.*",
+        "laravel/socialite": "^4.0",
         "laravel/tinker": "^1.0",
-        "laravelcollective/html": "5.8.*",
+        "laravelcollective/html": "6.0.*",
         "league/fractal": "^0.17.0",
         "league/omnipay": "^3.0",
-        "nwidart/laravel-modules": "^4.0",
+        "nwidart/laravel-modules": "^6.0",
         "omnipay/paypal": "^3.0",
         "omnipay/stripe": "^3.0",
         "predis/predis": "^1.1",
diff --git a/config/cache.php b/config/cache.php
index 6c4629d2c5aa..69b6a4165cff 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -88,7 +90,7 @@ return [
 
     'prefix' => env(
         'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'
     ),
 
 ];
diff --git a/resources/views/portal/default/auth/login.blade.php b/resources/views/portal/default/auth/login.blade.php
index 325521428592..0842c9e367c4 100644
--- a/resources/views/portal/default/auth/login.blade.php
+++ b/resources/views/portal/default/auth/login.blade.php
@@ -29,7 +29,7 @@
                             @endif
                             <form method="POST" action="{{ route('client.login') }}">
                                 @csrf
-                                <h1>@lang('texts.account_login')</h1>
+                                <h1>{{ ('texts.account_login') }}</h1>
                                     @if (Session::has('error'))
                                         <div class="alert alert-danger">
                                             <li>{!! Session::get('error') !!}</li>
@@ -42,7 +42,7 @@
                                           <i class="icon-user"></i>
                                         </span>
                                     </div>
-                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="@lang('texts.email')" required autofocus>
+                                    <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ ('texts.email') }}" required autofocus>
 
                                     @if ($errors->has('email'))
                                         <span class="invalid-feedback" role="alert">
@@ -57,7 +57,7 @@
                                           <i class="icon-lock"></i>
                                         </span>
                                     </div>
-                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="@lang('texts.password')" required>
+                                    <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ ('texts.password') }}" required>
 
                                     @if ($errors->has('password'))
                                         <span class="invalid-feedback" role="alert">
@@ -68,7 +68,7 @@
 
                                 <div class="row">
                                     <div class="col-6">
-                                        <button class="btn btn-primary px-4" type="submit">@lang('texts.login')</button>
+                                        <button class="btn btn-primary px-4" type="submit">{{ trans('texts.login') }}</button>
                                     </div>
                                     <div class="col-6 text-right">
                                         <a class="btn btn-link" href="{{ route('client.password.request') }}">
diff --git a/resources/views/portal/default/header.blade.php b/resources/views/portal/default/header.blade.php
index 3d5c9af552ff..84885083ff73 100644
--- a/resources/views/portal/default/header.blade.php
+++ b/resources/views/portal/default/header.blade.php
@@ -19,7 +19,7 @@
             </a>
             <div class="dropdown-menu dropdown-menu-right dropdown-menu-lg">
                 <div class="dropdown-header text-center">
-                    <strong>@lang('texts.notifications')</strong>
+                    <strong>{{ ('texts.notifications')}}</strong>
                 </div>
                 <a class="dropdown-item" href="#">
                     <div class="small mb-1">Mr Miyagi todos
@@ -32,7 +32,7 @@
                         </span>
                 </a>
                 <a class="dropdown-item text-center" href="#">
-                    <strong>@lang('texts.more')</strong>
+                    <strong>{{ ('texts.more')}}</strong>
                 </a>
             </div>
         </li>
@@ -47,14 +47,14 @@
             </a>
             <div class="dropdown-menu dropdown-menu-sm">
                 <div class="dropdown-header text-center">
-                    <strong>@lang('texts.settings')</strong>
+                    <strong>{{ ('texts.settings')}} </strong>
                 </div>
                 <a class="dropdown-item" href="{{ route('client.profile.edit', ['id' => auth()->user()->hashed_id])}}">
-                    <i class="fa fa-user"></i> @lang('texts.profile')</a>
+                    <i class="fa fa-user"></i> @lang::get('texts.profile')</a>
 
                 <div class="dropdown-divider"></div>
                 <a class="dropdown-item" href="{{ route('client.logout') }}">
-                    <i class="fa fa-lock"></i> @lang('texts.logout')</a>
+                    <i class="fa fa-lock"></i> @lang::get('texts.logout')</a>
             </div>
         </li>
     </ul>