* Blueprint is now macroed instead of extended.

* Removed events registered control from the trait.

composer.json

@@ -6,6 +6,7 @@
         "jlorente",
         "laravel",
         "identity",
+        "auditable",
         "identitystamp",
         "created_by",
         "updated_by",

src/Database/Eloquent/IdentityStamps.php

@@ -13,22 +13,12 @@
 trait IdentityStamps
 {
 
-    /**
-     * Variable to control the event loaded method.
-     * 
-     * @var bool 
-     */
-    protected static $identityStampsEventsLoaded = false;
-
     /**
      * Method to boot the trait behaviors.
      */
     public static function bootIdentityStamps()
     {
-        if (static::$identityStampsEventsLoaded === false) {
-            static::attachIdentityStampsEvents();
-            static::$identityStampsEventsLoaded = true;
-        }
+        static::attachIdentityStampsEvents();
     }
 
     /**
@@ -47,7 +37,7 @@ protected static function attachIdentityStampsEvents()
 
         if (array_search(SoftDeletes::class, class_uses_recursive(static::class)) !== false) {
             static::deleted(function($model) {
-                $model->updateSoftDeletesIdentityStamps();
+                $model->touchSoftDeletesIdentityStamps();
             });
         }
     }
@@ -104,7 +94,7 @@ protected function updateSoftDeletesIdentityStamps()
 
         $identity = $this->getIdentityStampValue();
 
-        $deletedBy = $this->getUpdatedByColumn();
+        $deletedBy = $this->getDeletedByColumn();
         $this->{$deletedBy} = $identity;
     }
 
@@ -121,7 +111,7 @@ protected function touchSoftDeletesIdentityStamps()
 
         $this->updateSoftDeletesIdentityStamps();
 
-        $deletedBy = $this->getCreatedByColumn();
+        $deletedBy = $this->getDeletedByColumn();
 
         $this->update([
             $deletedBy => $this->{$deletedBy}

src/IdentityStampServiceProvider.php

@@ -19,9 +19,8 @@
 
 namespace Jlorente\Laravel\IdentityStamp;
 
+use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Facades\DB;
-use Jlorente\Laravel\IdentityStamp\Database\Schema\Blueprint;
 
 /**
  * Class IdentityStampServiceProvider.
@@ -39,8 +38,13 @@ class IdentityStampServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        DB::getSchemaBuilder()->blueprintResolver(function($table, $callback) {
-            return new Blueprint($table, $callback);
+        Blueprint::macro('identityStamps', function() {
+            $this->unsignedInteger('created_by')->nullable();
+            $this->unsignedInteger('updated_by')->nullable();
+        });
+
+        Blueprint::macro('softDeletesIdentityStamps', function() {
+            $this->unsignedInteger('deleted_by')->nullable();
         });
     }