Merge pull request #92 from alexandre433/master

Fixes issue on Validation check And Updates Facades usage

Author: jeremykenedy

src/App/Http/Traits/ActivityLogger.php

@@ -2,11 +2,12 @@
 
 namespace jeremykenedy\LaravelLogger\App\Http\Traits;
 
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Validator;
 use Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect as Crawler;
 use jeremykenedy\LaravelLogger\App\Models\Activity;
-use Validator;
 
 trait ActivityLogger
 {
@@ -22,7 +23,7 @@ public static function activity($description = null)
         $userType = trans('LaravelLogger::laravel-logger.userTypes.guest');
         $userId = null;
 
-        if (\Auth::check()) {
+        if (Auth::check()) {
             $userType = trans('LaravelLogger::laravel-logger.userTypes.registered');
             $userIdField = config('LaravelLogger.defaultUserIDField');
             $userId = Request::user()->{$userIdField};
@@ -72,7 +73,7 @@ public static function activity($description = null)
         ];
 
         // Validation Instance
-        $validator = Validator::make($data, Activity::Rules([]));
+        $validator = Validator::make($data, Activity::rules());
         if ($validator->fails()) {
             $errors = self::prepareErrorMessage($validator->errors(), $data);
             if (config('LaravelLogger.logDBActivityLogFailuresToFile')) {

src/App/Models/Activity.php

@@ -125,12 +125,18 @@ public function user()
      */
     public static function rules($merge = [])
     {
+        if (\Illuminate\Foundation\Application::VERSION < 5.8) {
+            $route_url_check = 'active_url';
+        } else {
+            $route_url_check = 'url';
+        }
+
         return array_merge(
             [
                 'description'   => 'required|string',
                 'userType'      => 'required|string',
                 'userId'        => 'nullable|integer',
-                'route'         => 'nullable|url',
+                'route'         => 'nullable|'.$route_url_check,
                 'ipAddress'     => 'nullable|ip',
                 'userAgent'     => 'nullable|string',
                 'locale'        => 'nullable|string',

src/LaravelLoggerServiceProvider.php

@@ -3,6 +3,7 @@
 namespace jeremykenedy\LaravelLogger;
 
 use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
 use jeremykenedy\LaravelLogger\App\Http\Middleware\LogActivity;
 
@@ -109,7 +110,7 @@ private function registerEventListeners()
         $listeners = $this->getListeners();
         foreach ($listeners as $listenerKey => $listenerValues) {
             foreach ($listenerValues as $listenerValue) {
-                \Event::listen(
+                Event::listen(
                     $listenerKey,
                     $listenerValue
                 );