fix: tests

Author: wilr

_config/forum.yml

@@ -4,6 +4,3 @@ Name: silverstripe-forum
 SilverStripe\Security\Member:
   extensions:
     - FullscreenInteractive\SilverStripe\Forum\Extensions\ForumMemberExtension
-SilverStripe\Forum\Model\Post:
-  extensions:
-    - FullscreenInteractive\SilverStripe\Forum\Extensions\ForumSpamPostExtension

composer.json

@@ -29,7 +29,8 @@
         "lint:fix": "phpcbf src/ tests/",
         "phpstan": "phpstan analyse -c phpstan.neon",
         "syntax-check": "find src/ tests/ -type f -name '*.php' -exec php -l {} \\;",
-        "test": "phpunit tests"
+        "test": "phpunit tests",
+        "coverage": "phpunit tests --coverage-text"
     },
     "extra": {
         "branch-alias": {

src/Email/ForumNotifyModeratorEmail.php

@@ -46,10 +46,15 @@ public function setModerator(Member $moderator): self
     public function send(): void
     {
         if ($this->startingThread) {
-            $this->setSubject('New thread "' . $this->thread->Title . '" in forum [' . $this->thread->Forum->Title . ']');
+            $this->setSubject(sprintf(
+                'New thread "%s" in forum [%s]', $this->thread->Title, $this->thread->Forum->Title
+            ));
         } else {
-            $this->setSubject('New post "' . $this->post->Title . '" in forum [' . $this->thread->Forum->Title . ']');
+            $this->setSubject(sprintf(
+                'New post "%s" in forum [%s]', $this->post->Title, $this->thread->Forum->Title
+            ));
         }
+
         $this->setHTMLTemplate('email/ForumMember_NotifyModerator');
         $this->addData([
             'NewThread' => $this->startingThread,

src/Email/ForumSubscriptionEmail.php

@@ -2,6 +2,7 @@
 
 namespace FullscreenInteractive\SilverStripe\Forum\Email;
 
+use Exception;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\Email\Email;
 use FullscreenInteractive\SilverStripe\Forum\Model\ForumThreadSubscription;
@@ -38,11 +39,16 @@ public function send(): void
             $from = Email::config()->get('admin_email');
         }
 
+        if (!$this->post || !$this->subscription) {
+            throw new Exception('Post and subscription are required');
+        }
+
         $this->setFrom($from);
         $this->setTo($this->subscription->Member()->Email);
         $this->setSubject(_t('Post.NEWREPLY', 'New reply for {title}', [
             'title' => $this->post->Title,
         ]));
+
         $this->setHTMLTemplate('email/ForumMember_TopicNotification');
         $this->setData($this->post);
         $this->addData('Nickname', $this->subscription->Member()->Nickname);

src/Extensions/ForumMemberExtension.php

@@ -295,7 +295,7 @@ public function IsSuspended(): bool
     {
         $suspendedUntil = $this->owner->dbObject('SuspendedUntil');
         if ($suspendedUntil && $suspendedUntil->exists()) {
-            return $suspendedUntil->isInThePast();
+            return !$suspendedUntil->InPast();
         }
 
         return false;

src/Extensions/ForumSpamPostExtension.php

@@ -60,7 +60,6 @@ public function __construct($controller, $name)
         if (ForumHolder::config()->get('use_spamprotection_on_register')) {
             $this->enableSpamProtection();
         }
-
     }
 
 
@@ -93,8 +92,7 @@ public function doRegister($data, $form)
                 $this->request->getSession()->set("FormInfo.Form_RegistrationForm.data", $data);
                 return $this->redirectBack();
             }
-        } elseif (
-            $this->getForumHolder()->OpenIDAvailable()
+        } elseif ($this->getForumHolder()->OpenIDAvailable()
             && isset($data['IdentityURL'])
             && ($member = Member::get()->filter('IdentityURL', $data['IdentityURL'])->first())
         ) {

src/Form/ForumRegistrationForm.php

@@ -218,11 +218,14 @@ public function doPostMessageForm($data, $form)
                 $obj->write();
             }
         } elseif ($isSubscribed) {
-            // See if the member wanted to remove themselves
-            ForumThreadSubscription::get()->filter([
+            $subscriptions = ForumThreadSubscription::get()->filter([
                 'ThreadID' => $thread->ID,
                 'MemberID' => $member->ID
-            ])->delete();
+            ]);
+
+            foreach ($subscriptions as $subscription) {
+                $subscription->delete();
+            }
         }
 
         // Send any notifications that need to be sent

src/Form/PostMessageForm.php

@@ -70,7 +70,7 @@ public static function notify(Post $post)
                 try {
                     $email->send();
                 } catch (Exception $e) {
-                    Injector::inst()->get(LoggerInterface::class)->error($e->getMessage(), $e);
+                    Injector::inst()->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
                 }
             }
         }

src/Model/ForumThreadSubscription.php

@@ -310,7 +310,12 @@ public function getLatestPost()
      */
     public function getNumTopics()
     {
-        return ForumThread::get()->filter(["ForumID" => $this->ID])->count();
+        $threadIDs = Post::get()->filter([
+            'ForumID' => $this->ID,
+            'Author.ForumStatus' => 'Normal',
+        ])->columnUnique('ThreadID');
+
+        return count($threadIDs);
     }
 
     /**
@@ -319,8 +324,8 @@ public function getNumTopics()
     public function getNumPosts()
     {
         return Post::get()->filter([
-            "ForumID" => $this->ID,
-            "Author.ForumStatus" => "Normal"
+            'ForumID' => $this->ID,
+            'Author.ForumStatus' => 'Normal',
         ])->count();
     }
 
@@ -330,10 +335,12 @@ public function getNumPosts()
      */
     public function getNumAuthors(): int
     {
-        return Post::get()->filter([
-            "ForumID" => $this->ID,
-            "Author.ForumStatus" => "Normal"
-        ])->distinct("AuthorID")->count();
+        $authorIDs = Post::get()->filter([
+            'ForumID' => $this->ID,
+            'Author.ForumStatus' => 'Normal',
+        ])->columnUnique('AuthorID');
+
+        return count($authorIDs);
     }
 
     /**
@@ -373,23 +380,26 @@ public function getTopics(): ?PaginatedList
             ->addOrderBy(['"PostMax"."PostCreatedMax" DESC', '"PostMax"."PostIDMax" DESC'])
             ->setDistinct(false);
 
-        // And return the results
+        if (!$threads->exists()) {
+            return null;
+        }
+
         return PaginatedList::create($threads);
     }
 
 
 
     /*
      * Returns the Sticky Threads
-     * @param boolean $include_global Include Global Sticky Threads in the results (default: true)
+     * @param bool $include_global Include Global Sticky Threads in the results (default: true)
      * @return DataList
      */
-    public function getStickyTopics($include_global = true)
+    public function getStickyTopics(bool $includeGlobalSticky = true)
     {
         // Get Threads that are sticky & in this forum
         $where = '("ForumThread"."ForumID" = ' . $this->ID . ' AND "ForumThread"."IsSticky" = 1)';
         // Get Threads that are globally sticky
-        if ($include_global) {
+        if ($includeGlobalSticky) {
             $where .= ' OR ("ForumThread"."IsGlobalSticky" = 1)';
         }