From f9c659036dc79416ef745d9d9e05605a93b002bc Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 21 Mar 2019 22:51:30 +0800 Subject: [PATCH] Prevent conflict with PhpRedis extension --- app/Http/Controllers/AdminController.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index d06280b0..11432f50 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use Cache; -use Redis; use Option; use Carbon\Carbon; use App\Models\User; @@ -14,6 +13,7 @@ use App\Services\OptionForm; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Redis; use App\Services\Repositories\UserRepository; class AdminController extends Controller diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 652eb6c4..4ab496b1 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,11 +4,11 @@ namespace App\Providers; use Blade; use Event; -use Redis; use App\Events; use App\Models\User; use ReflectionException; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\Redis; use App\Exceptions\PrettyPageException; use Illuminate\Support\ServiceProvider; use App\Services\Repositories\OptionRepository;