Merge pull request #451 from owen-it/feat/move-audit-relation-from-tr…

…ait-to-model [FEAT] Make Auditable/User relation more flexible
owen-it · Oct 14, 2018 · 0534b09 · 0534b09
2 parents 3a5738e + 24f0eb3
commit 0534b09
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/Audit.php b/src/Audit.php
@@ -16,7 +16,6 @@
 
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Support\Facades\Config;
 use OwenIt\Auditing\Contracts\AttributeEncoder;
 
@@ -59,22 +58,6 @@ public function getTable(): string
         return Config::get('audit.drivers.database.table', parent::getTable());
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function auditable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function user(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/Models/Audit.php b/src/Models/Audit.php
@@ -15,6 +15,7 @@
 namespace OwenIt\Auditing\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Audit extends Model implements \OwenIt\Auditing\Contracts\Audit
 {
@@ -33,4 +34,20 @@ class Audit extends Model implements \OwenIt\Auditing\Contracts\Audit
         'new_values'    => 'json',
         'auditable_id'  => 'integer',
     ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function auditable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function user(): MorphTo
+    {
+        return $this->morphTo();
+    }
 }