constructor called in a deprecated way

diff --git a/Civi/Api4/Generic/BasicBatchAction.php b/Civi/Api4/Generic/BasicBatchAction.php
index e9c02e69402e138df2da5b1781f3ebe8606c31f0..a033602d52db00aa366eee5bec10a7018d6f6cc2 100644 (file)
--- a/Civi/Api4/Generic/BasicBatchAction.php
+++ b/Civi/Api4/Generic/BasicBatchAction.php
@@ -54,6 +54,9 @@ class BasicBatchAction extends AbstractBatchAction {
       \CRM_Core_Error::deprecatedWarning(__CLASS__ . ' constructor received $doer as 4th param; it should be the 3rd as the $select param has been removed');
     }
     else {
+      if ($doer && !is_callable($doer)) {
+        \CRM_Core_Error::deprecatedWarning(__CLASS__ . ' constructor received $doer as a non-callable; the 3rd param as the $select param has been removed');
+      }
       $this->doer = $doer;
     }
   }

diff --git a/ext/civi_mail/Civi/Api4/Action/MailSettings/TestConnection.php b/ext/civi_mail/Civi/Api4/Action/MailSettings/TestConnection.php
index 51076236b6d14a9c54e3df180af8bdc29f3d1b73..04822bf373ef224326c723b97694a1fb69cc8cf9 100644 (file)
--- a/ext/civi_mail/Civi/Api4/Action/MailSettings/TestConnection.php
+++ b/ext/civi_mail/Civi/Api4/Action/MailSettings/TestConnection.php
@@ -15,8 +15,11 @@ use Civi\Api4\Generic\BasicBatchAction;
 
 class TestConnection extends BasicBatchAction {
 
-  public function __construct($entityName, $actionName) {
-    parent::__construct($entityName, $actionName, ['id', 'name']);
+  /**
+   * @return string[]
+   */
+  protected function getSelect() {
+    return ['id', 'name'];
   }
 
   /**