jackjoe / activity-log

src/Models/Activity.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	/**
 	 * Get the user that the activity belongs to.
 	 *
-	 * @return object
+	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
 	 */
 	public function user()
 	{

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace JackJoe\ActivityLog\Models;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Request;
 
 class Activity extends Eloquent {

Indentation +11 added lines, -11 removed lines

@@ -50,13 +50,13 @@ 
 	{
 		// set the defaults from config
 		$defaults = config('log.defaults');
-    if(!is_array($defaults)) {
+	if(!is_array($defaults)) {
 			$defaults = [];
-    }
+	}
 
-    if(is_object($data)) {
-      $data = (array) $data;
-    }
+	if(is_object($data)) {
+	  $data = (array) $data;
+	}
 
 		// set the user ID
 		if(config('log.auto_set_user_id') && !isset($data['userId'])) {
@@ -65,19 +65,19 @@ 
 		}
 
 		// set IP address
-    if(!isset($data['ipAddress'])) {
+	if(!isset($data['ipAddress'])) {
 			$data['ipAddress'] = Request::getClientIp();
-    }
+	}
 
 		// set user agent
-    if (!isset($data['userAgent'])) {
+	if (!isset($data['userAgent'])) {
 			$data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent';
-    }
+	}
 
 		// set additional data and encode it as JSON if it is an array or an object
-    if(isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) {
+	if(isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) {
 			$data['data'] = json_encode($data['data']);
-    }
+	}
 
 		// format array keys to snake case for insertion into database
 		$dataFormatted = [];

Spacing +5 added lines, -5 removed lines

@@ -50,22 +50,22 @@ 
 	{
 		// set the defaults from config
 		$defaults = config('log.defaults');
-    if(!is_array($defaults)) {
+    if (!is_array($defaults)) {
 			$defaults = [];
     }
 
-    if(is_object($data)) {
+    if (is_object($data)) {
       $data = (array) $data;
     }
 
 		// set the user ID
-		if(config('log.auto_set_user_id') && !isset($data['userId'])) {
+		if (config('log.auto_set_user_id') && !isset($data['userId'])) {
 			$user = call_user_func(config('log.auth_method'));
 			$data['userId'] = isset($user->id) ? $user->id : null;
 		}
 
 		// set IP address
-    if(!isset($data['ipAddress'])) {
+    if (!isset($data['ipAddress'])) {
 			$data['ipAddress'] = Request::getClientIp();
     }
 
@@ -75,7 +75,7 @@ 
     }
 
 		// set additional data and encode it as JSON if it is an array or an object
-    if(isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) {
+    if (isset($data['data']) && (is_array($data['data']) || is_object($data['data']))) {
 			$data['data'] = json_encode($data['data']);
     }
 

src/config/log.php

Indentation +3 added lines, -3 removed lines

@@ -2,9 +2,9 @@
 
 return [
   /**
-	 * Auto Set User ID
-	 *
-	 * If false, user ID will not be automatically set.
+   * Auto Set User ID
+   *
+   * If false, user ID will not be automatically set.
    */
 	'auto_set_user_id' => true,
 

src/migrations/2017_03_20_200019_create_activity_log_table.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 			$table->string('version', 10)->nullable();
 			$table->string('ip_address', 64);
 			$table->string('user_agent');
-      $table->timestamp('created_at')->useCurrent();
-      $table->timestamp('updated_at')->useCurrent();
+	  $table->timestamp('created_at')->useCurrent();
+	  $table->timestamp('updated_at')->useCurrent();
 		});
 	}