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 +13 added lines, -13 removed lines

@@ -50,34 +50,34 @@
 	{
 		// set the defaults from config
 		$defaults = config('activity-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
+	// set the user ID
 		if(config('activity-log.auto_set_user_id') && !isset($data['userId'])) {
-      $user = call_user_func(config('activity-log.auth_method'));
+	  $user = call_user_func(config('activity-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();
-    }
+	}
 
 		// 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('activity-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('activity-log.auto_set_user_id') && !isset($data['userId'])) {
+		if (config('activity-log.auto_set_user_id') && !isset($data['userId'])) {
       $user = call_user_func(config('activity-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/migrations/2017_03_20_200019_create_activity_log_table.php

Indentation +17 added lines, -17 removed lines

@@ -11,27 +11,27 @@ 
    */
   public function up()
   {
-    Schema::create('activity_log', function(Blueprint $table)
-    {
-      $table->increments('id');
+	Schema::create('activity_log', function(Blueprint $table)
+	{
+	  $table->increments('id');
 
-      $table->integer('user_id')->nullable();
-      $table->integer('content_id')->nullable();
+	  $table->integer('user_id')->nullable();
+	  $table->integer('content_id')->nullable();
 
-      $table->string('content_type', 72)->nullable();
-      $table->string('action', 32)->nullable();
-      $table->string('description')->nullable();
+	  $table->string('content_type', 72)->nullable();
+	  $table->string('action', 32)->nullable();
+	  $table->string('description')->nullable();
 
-      $table->longText('details')->nullable();
-      $table->longText('data')->nullable();
+	  $table->longText('details')->nullable();
+	  $table->longText('data')->nullable();
 
-      $table->string('version', 10)->nullable();
-      $table->string('ip_address', 64);
-      $table->string('user_agent');
+	  $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();
+	});
   }
 
   /**
@@ -41,6 +41,6 @@ 
    */
   public function down()
   {
-    Schema::drop('activity_log');
+	Schema::drop('activity_log');
   }
 }

src/ActivityLogServiceProvider.php

Indentation +2 added lines, -2 removed lines

@@ -23,9 +23,9 @@
 

 		$this->publishes([

 			__DIR__ . '/migrations' => database_path('migrations'),

-    ], 'migrations');

+	], 'migrations');

 

-    $this->mergeConfigFrom(__DIR__ . '/config/activity-log.php', 'activity-log');

+	$this->mergeConfigFrom(__DIR__ . '/config/activity-log.php', 'activity-log');

 	}

 

 	/**