From 23c09918c6da5ce304d3db08e3bc341b6cccefe8 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 5 Sep 2023 14:59:52 +1200
Subject: [PATCH] Remove unused/ unnecessary table name variables

---
 CRM/Mailing/BAO/Mailing.php    |  2 +-
 CRM/Mailing/BAO/MailingJob.php | 24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 816beb02f9..82e4010d09 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -2752,7 +2752,7 @@ WHERE  civicrm_mailing_job.id = %1
     }
 
     // Split up the parent jobs into multiple child jobs
-    $mailerJobSize = Civi::settings()->get('mailerJobSize');
+    $mailerJobSize = (int) Civi::settings()->get('mailerJobSize');
     CRM_Mailing_BAO_MailingJob::runJobs_pre($mailerJobSize, $mode);
     CRM_Mailing_BAO_MailingJob::runJobs(NULL, $mode);
     CRM_Mailing_BAO_MailingJob::runJobs_post($mode);
diff --git a/CRM/Mailing/BAO/MailingJob.php b/CRM/Mailing/BAO/MailingJob.php
index 86252a9cf9..ce90b95a67 100644
--- a/CRM/Mailing/BAO/MailingJob.php
+++ b/CRM/Mailing/BAO/MailingJob.php
@@ -283,25 +283,21 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
 
   /**
    * before we run jobs, we need to split the jobs
+   *
    * @param int $offset
    * @param string|null $mode
    *   Either 'sms' or null
+   *
+   * @throws \CRM_Core_Exception
    */
-  public static function runJobs_pre($offset = 200, $mode = NULL) {
-    $job = new CRM_Mailing_BAO_MailingJob();
-
-    $jobTable = CRM_Mailing_DAO_MailingJob::getTableName();
-    $mailingTable = CRM_Mailing_DAO_Mailing::getTableName();
-
+  public static function runJobs_pre(int $offset = 200, $mode = NULL): void {
     $currentTime = date('YmdHis');
-    $mailingACL = CRM_Mailing_BAO_Mailing::mailingACL('m');
-
     $workflowClause = CRM_Mailing_BAO_MailingJob::workflowClause();
 
     $domainID = CRM_Core_Config::domainID();
 
     $modeClause = 'AND m.sms_provider_id IS NULL';
-    if ($mode == 'sms') {
+    if ($mode === 'sms') {
       $modeClause = 'AND m.sms_provider_id IS NOT NULL';
     }
 
@@ -309,8 +305,8 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
     // when the mailing is submitted or scheduled.
     $query = "
     SELECT   j.*
-      FROM   $jobTable     j,
-         $mailingTable m
+      FROM civicrm_mailing_job j,
+         civicrm_mailing m
      WHERE   m.id = j.mailing_id AND m.domain_id = {$domainID}
                  $workflowClause
                  $modeClause
@@ -323,7 +319,7 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
     ORDER BY j.scheduled_date,
          j.start_date";
 
-    $job->query($query);
+    $job = CRM_Core_DAO::executeQuery($query);
 
     // For each of the "Parent Jobs" we find, we split them into
     // X Number of child jobs
@@ -344,14 +340,14 @@ class CRM_Mailing_BAO_MailingJob extends CRM_Mailing_DAO_MailingJob {
         'id',
         TRUE
       );
-      if ($job->status != 'Scheduled') {
+      if ($job->status !== 'Scheduled') {
         $lock->release();
         continue;
       }
 
       $transaction = new CRM_Core_Transaction();
 
-      $job->split_job((int) $offset, (int) $job->id, (int) $job->mailing_id, $job->scheduled_date);
+      self::split_job((int) $offset, (int) $job->id, (int) $job->mailing_id, $job->scheduled_date);
 
       // Update the status of the parent job
       self::create(['id' => $job->id, 'start_date' => date('YmdHis'), 'status' => 'Running']);
-- 
2.25.1