Merge pull request #848 from erikn69/phpstan-fix

PhpStan fixes
owen-it · Aug 24, 2023 · 6421f6a · 6421f6a
2 parents 8b9c5bd + aa77d40
commit 6421f6a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/src/Audit.php b/src/Audit.php
@@ -289,6 +289,6 @@ public function getModified(bool $json = false, int $options = 0, int $depth = 5
      */
     public function getTags(): array
     {
-        return preg_split('/,/', $this->tags, null, PREG_SPLIT_NO_EMPTY);
+        return preg_split('/,/', $this->tags, -1, PREG_SPLIT_NO_EMPTY);
     }
 }
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -3,7 +3,6 @@
 namespace OwenIt\Auditing\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Container\Container;
 use Illuminate\Support\Str;
 
 class InstallCommand extends Command
@@ -41,7 +40,7 @@ public function handle()
      */
     protected function registerAuditingServiceProvider()
     {
-        $namespace = Str::replaceLast('\\', '', Container::getInstance()->getNamespace());
+        $namespace = Str::replaceLast('\\', '', app()->getNamespace());
 
         $appConfig = file_get_contents(config_path('app.php'));
 

diff --git a/src/Contracts/Audit.php b/src/Contracts/Audit.php
@@ -2,6 +2,9 @@
 
 namespace OwenIt\Auditing\Contracts;
 
+/**
+ * @mixin \OwenIt\Auditing\Models\Audit
+ */
 interface Audit
 {
     /**

diff --git a/src/Contracts/Auditable.php b/src/Contracts/Auditable.php
@@ -9,7 +9,7 @@ interface Auditable
     /**
      * Auditable Model audits.
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany<OwenIt\Auditing\Contracts\Audit>
+     * @return MorphMany<\OwenIt\Auditing\Models\Audit>
      */
     public function audits(): MorphMany;
 

diff --git a/src/Events/AuditCustom.php b/src/Events/AuditCustom.php
@@ -17,8 +17,6 @@ class AuditCustom
      * Create a new Auditing event instance.
      *
      * @param \OwenIt\Auditing\Contracts\Auditable $model
-     * @param array $old
-     * @param array $new
      */
     public function __construct(Auditable $model)
     {

diff --git a/src/Models/Audit.php b/src/Models/Audit.php
@@ -4,6 +4,14 @@
 
 use Illuminate\Database\Eloquent\Model;
 
+/**
+ * @property string $tags
+ * @property string $event
+ * @property array $new_values
+ * @property array $old_values
+ * @property mixed $user
+ * @property mixed $auditable.
+ */
 class Audit extends Model implements \OwenIt\Auditing\Contracts\Audit
 {
     use \OwenIt\Auditing\Audit;