Remove old deprecated class aliases

diff --git a/CRM/ACL/BAO/EntityRole.php b/CRM/ACL/BAO/EntityRole.php
deleted file mode 100644 (file)
index 3bacbf7..0000000
--- a/CRM/ACL/BAO/EntityRole.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- *  Access Control EntityRole.
- *
- * @deprecated
- */
-class CRM_ACL_BAO_EntityRole extends CRM_ACL_BAO_ACLEntityRole {}

diff --git a/CRM/Dedupe/BAO/Exception.php b/CRM/Dedupe/BAO/Exception.php
deleted file mode 100644 (file)
index e3777e7..0000000
--- a/CRM/Dedupe/BAO/Exception.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * Manages dedupe exceptions - ie pairs marked as non-duplicates.
- */
-class CRM_Dedupe_BAO_Exception extends CRM_Dedupe_BAO_DedupeException {}

diff --git a/CRM/Dedupe/BAO/Rule.php b/CRM/Dedupe/BAO/Rule.php
deleted file mode 100644 (file)
index 0e4d31f..0000000
--- a/CRM/Dedupe/BAO/Rule.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * The CiviCRM duplicate discovery engine is based on an
- * algorithm designed by David Strauss <david@fourkitchens.com>.
- */
-class CRM_Dedupe_BAO_Rule extends CRM_Dedupe_BAO_DedupeRule {}

diff --git a/CRM/Dedupe/BAO/RuleGroup.php b/CRM/Dedupe/BAO/RuleGroup.php
deleted file mode 100644 (file)
index 1b70dcb..0000000
--- a/CRM/Dedupe/BAO/RuleGroup.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC. All rights reserved.                        |
- |                                                                    |
- | This work is published under the GNU AGPLv3 license with some      |
- | permitted exceptions and without any warranty. For full license    |
- | and copyright information, see https://civicrm.org/licensing       |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-
-/**
- * The CiviCRM duplicate discovery engine is based on an
- * algorithm designed by David Strauss <david@fourkitchens.com>.
- */
-class CRM_Dedupe_BAO_RuleGroup extends CRM_Dedupe_BAO_DedupeRuleGroup {}

diff --git a/CRM/Mailing/BAO/Component.php b/CRM/Mailing/BAO/Component.php
deleted file mode 100644 (file)
index 5eee008..0000000
--- a/CRM/Mailing/BAO/Component.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * @deprecated copy of renamed class.
- * @package CRM
- * @copyright CiviCRM LLC https://civicrm.org/licensing
- */
-class CRM_Mailing_BAO_Component extends CRM_Mailing_BAO_MailingComponent {
-
-}

diff --git a/ext/flexmailer/src/Event/CheckSendableEvent.php b/ext/flexmailer/src/Event/CheckSendableEvent.php
index bc3f530a505ebe320441d534cf5f0b0427e8a3d0..3a36f5adbc0f722ad6b53693094a9c7e2bbeeeb4 100644 (file)
--- a/ext/flexmailer/src/Event/CheckSendableEvent.php
+++ b/ext/flexmailer/src/Event/CheckSendableEvent.php
@@ -76,8 +76,8 @@ class CheckSendableEvent extends \Civi\Core\Event\GenericHookEvent {
       throw new \RuntimeException("getFullBody() only supports body_text and body_html");
     }
     $mailing = $this->getMailing();
-    $header = $mailing->header_id && $mailing->header_id != 'null' ? \CRM_Mailing_BAO_Component::findById($mailing->header_id) : NULL;
-    $footer = $mailing->footer_id && $mailing->footer_id != 'null' ? \CRM_Mailing_BAO_Component::findById($mailing->footer_id) : NULL;
+    $header = $mailing->header_id && $mailing->header_id != 'null' ? \CRM_Mailing_BAO_MailingComponent::findById($mailing->header_id) : NULL;
+    $footer = $mailing->footer_id && $mailing->footer_id != 'null' ? \CRM_Mailing_BAO_MailingComponent::findById($mailing->footer_id) : NULL;
     if (empty($mailing->{$field})) {
       return NULL;
     }