fix: phpstan complaints

FriendsOfFlarum · Nov 12, 2023 · daa5b66 · daa5b66
1 parent f191508
commit daa5b66
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/extend.php b/extend.php
@@ -14,6 +14,7 @@
 use Flarum\Extend;
 use Flarum\Post\Event\Posted;
 use Flarum\Post\Event\Saving as PostSaving;
+use Flarum\Post\Post;
 use Flarum\Settings\Event\Saving as SettingSaving;
 use FoF\Filter\Listener\AddCensorChecks;
 use FoF\Filter\Listener\AutoMerge;
@@ -32,6 +33,10 @@
     (new Extend\View())
         ->namespace('fof-filter', __DIR__.'/views'),
 
+    (new Extend\Model(Post::class))
+        ->cast('auto_mod', 'bool')
+        ->cast('emailed', 'bool'),
+
     (new Extend\Event())
         ->listen(SettingSaving::class, AddCensorChecks::class)
         ->listen(PostSaving::class, CheckPost::class)

diff --git a/src/Listener/AddCensorChecks.php b/src/Listener/AddCensorChecks.php
@@ -17,7 +17,9 @@ class AddCensorChecks
 {
     public function handle(Saving $event)
     {
-        if (isset($event->settings['fof-filter.words']) && $badwords = explode("\n", trim($event->settings['fof-filter.words']))) {
+        if (isset($event->settings['fof-filter.words'])) {
+            $badwords = explode("\n", trim($event->settings['fof-filter.words']));
+
             $leet_replace = [];
             $leet_replace['a'] = '(a|a\.|a\-|4|@|Á|á|À|Â|à|Â|â|Ä|ä|Ã|ã|Å|å|α|Δ|Λ|λ)';
             $leet_replace['b'] = '(b|b\.|b\-|8|\|3|ß|Β|β)';

diff --git a/src/Listener/CheckPost.php b/src/Listener/CheckPost.php
@@ -11,6 +11,7 @@
 
 namespace FoF\Filter\Listener;
 
+use Carbon\Carbon;
 use Flarum\Flags\Event\Created;
 use Flarum\Flags\Flag;
 use Flarum\Post\Event\Saving;
@@ -85,6 +86,7 @@ function ($matches) use (&$isExplicit) {
                 if ($matches) {
                     $isExplicit = true;
                 }
+                return $matches[0];
             },
             str_replace(' ', '', $postContent)
         );
@@ -94,17 +96,19 @@ function ($matches) use (&$isExplicit) {
 
     public function deletePost(Post $post): void
     {
+        /** @phpstan-ignore-next-line */
         $post->is_approved = false;
         $post->auto_mod = true;
         $post->afterSave(function ($post) {
-            if ($post->number == 1) {
+            if ($post->number === 1) {
                 $post->discussion->delete();
             }
         });
     }
 
     public function flagPost(Post $post): void
     {
+        /** @phpstan-ignore-next-line */
         $post->is_approved = false;
         $post->auto_mod = true;
         $post->afterSave(function ($post) {
@@ -117,7 +121,7 @@ public function flagPost(Post $post): void
             $flag->post_id = $post->id;
             $flag->type = 'autoMod';
             $flag->reason_detail = $this->translator->trans('fof-filter.forum.flag_message');
-            $flag->created_at = time();
+            $flag->created_at = Carbon::now();
             $flag->save();
 
             $this->bus->dispatch(new Created($flag, new Guest()));