PR feedback adjustments

[MAILPOET-4355]

mailpoet/lib/Newsletter/Sending/ScheduledTasksRepository.php

@@ -174,20 +174,20 @@ class ScheduledTasksRepository extends Repository {
     $tasksQuery = $this->doctrineRepository->createQueryBuilder('st')
       ->select('st')
       ->where('st.deletedAt IS NULL')
-      ->where('st.status IN (:statuses)')
-      ->setParameter('statuses', $statuses)
-      ->setMaxResults($limit);
+      ->where('st.status IN (:statuses)');
+
+    if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
+      $tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
+    }
 
     if ($type) {
       $tasksQuery = $tasksQuery->andWhere('st.type = :type')
         ->setParameter('type', $type);
     }
 
-    if (in_array(ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, $statuses)) {
-      $tasksQuery = $tasksQuery->orWhere('st.status IS NULL');
-    }
-
     return $tasksQuery
+      ->setParameter('statuses', $statuses)
+      ->setMaxResults($limit)
       ->getQuery()
       ->getResult();
   }

mailpoet/tests/integration/AdminPages/HelpTest.php

@@ -78,7 +78,7 @@ class HelpTest extends \MailPoetTest {
     expect($data['newsletter']['preview_url'])->equals(null);
   }
 
-  public function createNewSendingQueue(?ScheduledTaskEntity $task, ?NewsletterEntity $newsletter, $renderedSubject = null) {
+  private function createNewSendingQueue(?ScheduledTaskEntity $task, ?NewsletterEntity $newsletter, $renderedSubject = null) {
     $queue = new SendingQueueEntity();
     if ($newsletter instanceof NewsletterEntity) {
       $queue->setNewsletter($newsletter);
@@ -100,8 +100,7 @@ class HelpTest extends \MailPoetTest {
   }
 
   function _after() {
-    parent::_after(); // TODO: Change the autogenerated stub
+    parent::_after();
     $this->cleanup();
   }
-
-}
+}

mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php

@@ -24,7 +24,6 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
 
   public function _before() {
     parent::_before();
-    $this->cleanup();
     $this->repository = $this->diContainer->get(ScheduledTasksRepository::class);
     $this->scheduledTaskFactory = new ScheduledTaskFactory();
     $this->sendingQueueFactory = new SendingQueue();