jackjoe / activity-log

src/migrations/2017_06_03_133219_create_activity_log_table.php

Indentation +30 added lines, -30 removed lines

@@ -4,43 +4,43 @@
 use Illuminate\Database\Migrations\Migration;
 
 class CreateActivityLogTable extends Migration {
-  /**
-   * Run the migrations.
-   *
-   * @return void
-   */
-  public function up()
-  {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
     Schema::create('activity_log', function(Blueprint $table)
     {
-      $table->increments('id');
+        $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', 72)->nullable();
-      $table->string('action', 32)->nullable();
-      $table->string('state', 32)->nullable();
+        $table->string('content', 72)->nullable();
+        $table->string('action', 32)->nullable();
+        $table->string('state', 32)->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', 255);
+        $table->string('version', 10)->nullable();
+        $table->string('ip_address', 64);
+        $table->string('user_agent', 255);
 
-      $table->timestamp('created_at')->useCurrent();
-      $table->timestamp('updated_at')->useCurrent();
+        $table->timestamp('created_at')->useCurrent();
+        $table->timestamp('updated_at')->useCurrent();
     });
-  }
-
-  /**
-   * Reverse the migrations.
-   *
-   * @return void
-   */
-  public function down()
-  {
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
     Schema::drop('activity_log');
-  }
+    }
 }

src/Models/Activity.php

Indentation +43 added lines, -43 removed lines

@@ -5,19 +5,19 @@ 
 use Illuminate\Support\Facades\Request;
 
 class Activity extends Eloquent {
-  /**
-   * The database table used by the model.
-   *
-   * @var string
-   */
-  protected $table = 'activity_log';
-
-  /**
-   * The fillable fields for the model.
-   *
-   * @var    array
-   */
-  protected $fillable = [
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'activity_log';
+
+    /**
+     * The fillable fields for the model.
+     *
+     * @var    array
+     */
+    protected $fillable = [
     'user_id',
     'content',
     'content_id',
@@ -28,71 +28,71 @@ 
     'version',
     'ip_address',
     'user_agent',
-  ];
-
-  /**
-   * Get the user that the activity belongs to.
-   *
-   * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-   */
-  public function user()
-  {
+    ];
+
+    /**
+     * Get the user that the activity belongs to.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function user()
+    {
     return $this->belongsTo(config('auth.providers.users.model'), 'user_id');
-  }
-
-  /**
-   * Create an activity log entry.
-   *
-   * @param  mixed    $data
-   * @return boolean
-   */
-  public static function log($data = [])
-  {
+    }
+
+    /**
+     * Create an activity log entry.
+     *
+     * @param  mixed    $data
+     * @return boolean
+     */
+    public static function log($data = [])
+    {
     // set the defaults from config
     $defaults = config('activity-log.defaults');
     if (!is_array($defaults)) {
-      $defaults = [];
+        $defaults = [];
     }
 
     if (is_object($data)) {
-      $data = (array) $data;
+        $data = (array) $data;
     }
 
     // conversion path to content
     if (isset($data['contentType']) && !isset($data['content'])) {
-      $data['content'] = $data['contentType'];
+        $data['content'] = $data['contentType'];
     }
 
     // conversion path to state
     if (isset($data['description']) && !isset($data['state'])) {
-      $data['state'] = $data['description'];
+        $data['state'] = $data['description'];
     }
 
     // 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;
+        $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();
+        $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';
+        $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']);
+        $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;
+        $dataFormatted[snake_case($key)] = $value;
     }
 
     // merge defaults array with formatted data array
@@ -102,5 +102,5 @@ 
     $self = static::create($data);
 
     return $self;
-  }
+    }
 }