Merge pull request #22210 from MegaphoneJon/optional-before-required

PHP 8 compat - no optional param before required
civicrm · Dec 3, 2021 · 291669e · 291669e
2 parents 1d041a1 + 5c2d1ad
commit 291669e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php
@@ -172,12 +172,10 @@ public static function &resub_to_mailing($job_id, $queue_id, $hash) {
    *   The queue event ID.
    * @param array $groups
    *   List of group IDs.
-   * @param bool $is_domain
-   *   Is this domain-level?.
    * @param int $job
    *   The job ID.
    */
-  public static function send_resub_response($queue_id, $groups, $is_domain = FALSE, $job) {
+  public static function send_resub_response($queue_id, $groups, $job) {
     // param is_domain is not supported as of now.
 
     $config = CRM_Core_Config::singleton();

diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php
@@ -79,7 +79,7 @@ public function run() {
       elseif ($this->_type == 'resubscribe') {
         $groups = CRM_Mailing_Event_BAO_Resubscribe::resub_to_mailing($job_id, $queue_id, $hash);
         if (count($groups)) {
-          CRM_Mailing_Event_BAO_Resubscribe::send_resub_response($queue_id, $groups, FALSE, $job_id);
+          CRM_Mailing_Event_BAO_Resubscribe::send_resub_response($queue_id, $groups, $job_id);
         }
         else {
           // should we indicate an error, or just ignore?

diff --git a/api/v3/MailingEventResubscribe.php b/api/v3/MailingEventResubscribe.php
@@ -35,7 +35,7 @@ function civicrm_api3_mailing_event_resubscribe_create($params) {
   if (count($groups)) {
     CRM_Mailing_Event_BAO_Resubscribe::send_resub_response(
       $params['event_queue_id'],
-      $groups, FALSE,
+      $groups,
       $params['job_id']
     );
     return civicrm_api3_create_success($params);