From d8db1c4dd02e26e676543a23f6701faf0a5952fe Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 13 Dec 2019 19:27:14 +0300
Subject: [PATCH] more update changes

---
 app/Listeners/Update/V20/Version200.php | 6 +++---
 app/Providers/App.php                   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Listeners/Update/V20/Version200.php b/app/Listeners/Update/V20/Version200.php
index b730f6753..4b13383c1 100644
--- a/app/Listeners/Update/V20/Version200.php
+++ b/app/Listeners/Update/V20/Version200.php
@@ -14,9 +14,9 @@ use App\Models\Common\EmailTemplate;
 use App\Models\Common\Report;
 use App\Utilities\Overrider;
 use Artisan;
+use File;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Facades\Storage;
 
 class Version200 extends Listener
 {
@@ -887,11 +887,11 @@ class Version200 extends Listener
         ];
 
         foreach ($files as $file) {
-            Storage::delete(base_path($file));
+            File::delete(base_path($file));
         }
 
         foreach ($directories as $directory) {
-            Storage::deleteDirectory(base_path($directory));
+            File::deleteDirectory(base_path($directory));
         }
     }
 
diff --git a/app/Providers/App.php b/app/Providers/App.php
index 1997052d0..990b6d9ae 100644
--- a/app/Providers/App.php
+++ b/app/Providers/App.php
@@ -2,7 +2,9 @@
 
 namespace App\Providers;
 
+use Blade;
 use Illuminate\Support\ServiceProvider as Provider;
+use Schema;
 
 class App extends Provider
 {
@@ -14,9 +16,12 @@ class App extends Provider
     public function boot()
     {
         // Laravel db fix
-        \Schema::defaultStringLength(191);
+        Schema::defaultStringLength(191);
 
-        \Blade::withoutDoubleEncoding();
+        // @todo Remove the if control after 1.3 update
+        if (method_exists('Blade', 'withoutDoubleEncoding')) {
+            Blade::withoutDoubleEncoding();
+        }
     }
 
     /**