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()
   {

Indentation +46 added lines, -46 removed lines

@@ -18,16 +18,16 @@ 
    * @var    array
    */
   protected $fillable = [
-    'user_id',
-    'content_type',
-    'content_id',
-    'action',
-    'description',
-    'details',
-    'data',
-    'version',
-    'ip_address',
-    'user_agent',
+	'user_id',
+	'content_type',
+	'content_id',
+	'action',
+	'description',
+	'details',
+	'data',
+	'version',
+	'ip_address',
+	'user_agent',
   ];
 
   /**
@@ -37,7 +37,7 @@ 
    */
   public function user()
   {
-    return $this->belongsTo(config('auth.providers.users.model'), 'user_id');
+	return $this->belongsTo(config('auth.providers.users.model'), 'user_id');
   }
 
   /**
@@ -48,49 +48,49 @@ 
    */
   public static function log($data = [])
   {
-    // set the defaults from config
-    $defaults = config('activity-log.defaults');
-    if (!is_array($defaults)) {
-      $defaults = [];
-    }
+	// set the defaults from config
+	$defaults = config('activity-log.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('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 the user ID
+	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'])) {
-      $data['ipAddress'] = Request::getClientIp();
-    }
+	// set IP address
+	if (!isset($data['ipAddress'])) {
+	  $data['ipAddress'] = Request::getClientIp();
+	}
 
-    // set user agent
-    if (!isset($data['userAgent'])) {
-      $data['userAgent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'No User Agent';
-    }
+	// set user agent
+	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']))) {
-      $data['data'] = json_encode($data['data']);
-    }
+	// 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']))) {
+	  $data['data'] = json_encode($data['data']);
+	}
 
-    // format array keys to snake case for insertion into database
-    $dataFormatted = [];
-    foreach ($data as $key => $value) {
-      $dataFormatted[snake_case($key)] = $value;
-    }
+	// format array keys to snake case for insertion into database
+	$dataFormatted = [];
+	foreach ($data as $key => $value) {
+	  $dataFormatted[snake_case($key)] = $value;
+	}
 
-    // merge defaults array with formatted data array
-    $data = array_merge($defaults, $dataFormatted);
+	// merge defaults array with formatted data array
+	$data = array_merge($defaults, $dataFormatted);
 
-    // create the record
-    $self = static::create($data);
+	// create the record
+	$self = static::create($data);
 
-    return $self;
+	return $self;
   }
 }

src/ActivityLogServiceProvider.php

Indentation +9 added lines, -9 removed lines

@@ -17,15 +17,15 @@ 
    */

   public function boot()

   {

-    $this->publishes([

-      __DIR__ . '/config/activity-log.php' => config_path('activity-log.php'),

-    ]);

+	$this->publishes([

+	  __DIR__ . '/config/activity-log.php' => config_path('activity-log.php'),

+	]);

 

-    $this->publishes([

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

-    ], 'migrations');

+	$this->publishes([

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

+	], 'migrations');

 

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

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

   }

 

   /**

@@ -35,7 +35,7 @@ 
    */

   public function register()

   {

-    //

+	//

   }

 

   /**

@@ -45,6 +45,6 @@ 
    */

   public function provides()

   {

-    return [];

+	return [];

   }

 }