small refactor + adhere to psr-2

CHANGELOG.md

@@ -2,5 +2,8 @@
 
 All Notable changes to `activitylog` will be documented in this file
 
+### 2.1.0
+- Added option to specify a default user id
+
 ### 2.0.0
 - Added logging of model events

src/Spatie/Activitylog/ActivitylogFacade.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog;
+<?php
+
+namespace Spatie\Activitylog;
 
 use Illuminate\Support\Facades\Facade;
 

src/Spatie/Activitylog/ActivitylogServiceProvider.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog;
+<?php
+
+namespace Spatie\Activitylog;
 
 use Illuminate\Support\ServiceProvider;
 

src/Spatie/Activitylog/ActivitylogSupervisor.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog;
+<?php
+
+namespace Spatie\Activitylog;
 
 use Illuminate\Config\Repository;
 use Illuminate\Auth\Guard;
@@ -20,8 +22,8 @@ class ActivitylogSupervisor
  * Also register Laravels Log Handler if needed.
  *
  * @param Handlers\ActivitylogHandlerInterface $handler
- * @param Repository $config
- * @param Guard $auth
+ * @param Repository  $config
+ * @param Guard  $auth
  */
  public function __construct(Handlers\ActivitylogHandlerInterface $handler, Repository $config, Guard $auth)
  {
@@ -70,22 +72,24 @@ public function cleanLog()
  /**
  * Normalize the user id.
  *
- * @param object|int $userId
+ * @param object|int $userId
+ *
  * @return int
  */
  public function normalizeUserId($userId)
  {
+ if (is_numeric($userId)) {
+ return $userId;
+ }
+
  if (is_object($userId)) {
- // User model provided.
- $userId = $userId->id;
- } else if ($userId === '') {
- // No user id provided, either get the logged in user or fallback to default.
- if ($this->auth->check()) {
- $userId = $this->auth->user()->id;
- } else {
- $userId = Config::get('activitylog.defaultUserId');
- }
+ return $userId->id;
  }
- return $userId;
+
+ if ($this->auth->check()) {
+ return $this->auth->user()->id;
+ }
+
+ return Config::get('activitylog.defaultUserId');
  }
 }

src/Spatie/Activitylog/Handlers/ActivitylogHandlerInterface.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog\Handlers;
+<?php
+
+namespace Spatie\Activitylog\Handlers;
 
 interface ActivitylogHandlerInterface
 {
@@ -9,7 +11,7 @@ interface ActivitylogHandlerInterface
  * @param string $user
  * @param array $attributes
  *
- * @return boolean
+ * @return bool
  */
  public function log($text, $user = '', $attributes = []);
 
@@ -18,7 +20,7 @@ public function log($text, $user = '', $attributes = []);
  *
  * @param int $maxAgeInMonths
  *
- * @return boolean
+ * @return bool
  */
  public function cleanLog($maxAgeInMonths);
 }

src/Spatie/Activitylog/Handlers/DefaultLaravelHandler.php

@@ -13,7 +13,7 @@ class DefaultLaravelHandler implements ActivitylogHandlerInterface
  * @param $userId
  * @param array $attributes
  *
- * @return boolean
+ * @return bool
  */
  public function log($text, $userId = '', $attributes = [])
  {
@@ -31,7 +31,7 @@ public function log($text, $userId = '', $attributes = [])
  *
  * @param int $maxAgeInMonths
  *
- * @return boolean
+ * @return bool
  */
  public function cleanLog($maxAgeInMonths)
  {

src/Spatie/Activitylog/Handlers/EloquentHandler.php

@@ -14,14 +14,14 @@ class EloquentHandler implements ActivitylogHandlerInterface
  * @param $userId
  * @param array $attributes
  *
- * @return boolean
+ * @return bool
  */
  public function log($text, $userId = '', $attributes = [])
  {
  Activity::create(
  [
- 'text'  => $text,
- 'user_id'  => ($userId == '' ? null : $userId),
+ 'text' => $text,
+ 'user_id' => ($userId == '' ? null : $userId),
  'ip_address' => $attributes['ipAddress'],
  ]
  );
@@ -34,7 +34,7 @@ public function log($text, $userId = '', $attributes = [])
  *
  * @param int $maxAgeInMonths
  *
- * @return boolean
+ * @return bool
  */
  public function cleanLog($maxAgeInMonths)
  {

src/Spatie/Activitylog/LogsActivity.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog;
+<?php
+
+namespace Spatie\Activitylog;
 
 use Activity;
 
@@ -35,4 +37,3 @@ protected static function getRecordActivityEvents()
  ];
  }
 }
-

src/Spatie/Activitylog/LogsActivityInterface.php

@@ -1,6 +1,8 @@
-<?php namespace Spatie\Activitylog;
+<?php
 
-interface logsActivityInterface
+namespace Spatie\Activitylog;
+
+interface LogsActivityInterface
 {
  /**
  * Get the message that needs to be logged for the given event.

src/Spatie/Activitylog/Models/Activity.php

@@ -1,4 +1,6 @@
-<?php namespace Spatie\Activitylog\Models;
+<?php
+
+namespace Spatie\Activitylog\Models;
 
 use Eloquent;
 use Config;

src/config/activitylog.php

@@ -1,4 +1,5 @@
 <?php
+
 return [
 
  /*
@@ -28,8 +29,9 @@
  | Fallback user id if no user is logged in
  |--------------------------------------------------------------------------
  |
- | When no user is logged in we fall back to this value.
+ | If you don't specify a user id when logging some activity and no
+ | user is logged in, this id will be used.
  |
  */
  'defaultUserId' => '',
- ];
+];