Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old stuff #16835

Merged
merged 3 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CRM/ACL/BAO/ACL.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {

/**
* Get ACL entity table.
*
* @deprecated
* @return array|null
*/
public static function entityTable() {
Expand All @@ -46,6 +46,7 @@ public static function entityTable() {

/**
* @return array|null
* @deprecated
*/
public static function objectTable() {
CRM_Core_Error::deprecatedFunctionWarning('unused function to be removed');
Expand Down Expand Up @@ -88,6 +89,7 @@ public static function operation() {
* The ID of the object.
* @param array $tables
* Tables that will be needed in the FROM.
* @deprecated
*
* @return string|null
* WHERE-style clause to filter results,
Expand Down
2 changes: 1 addition & 1 deletion CRM/Activity/BAO/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,7 @@ public static function getParentActivity($activityId) {
*
* @param $activityID
* Current activity id.
*
* @deprecated
* @return int
* $params count of prior activities otherwise false.
* @throws \CRM_Core_Exception
Expand Down
40 changes: 0 additions & 40 deletions CRM/Report/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4653,46 +4653,6 @@ public function fiscalYearOffset($fieldName) {
($fy['d'] > 1 ? (" - INTERVAL " . ($fy['d'] - 1) . " DAY") : '') . " )";
}

/**
* Add Address into From Table if required.
*
* @deprecated use joinAddressFromContact
* (left here in case extensions use it).
*/
public function addAddressFromClause() {
CRM_Core_Error::deprecatedFunctionWarning('CRM_Report_Form::joinAddressFromContact');
// include address field if address column is to be included
if ((isset($this->_addressField) &&
$this->_addressField
) ||
$this->isTableSelected('civicrm_address')
) {
$this->_from .= "
LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_address']}.contact_id) AND
{$this->_aliases['civicrm_address']}.is_primary = 1\n";
}
}

/**
* Add Phone into From Table if required.
*
* @deprecated use joinPhoneFromContact
* (left here in case extensions use it).
*/
public function addPhoneFromClause() {
CRM_Core_Error::deprecatedFunctionWarning('CRM_Report_Form::joinPhoneFromContact');
// include address field if address column is to be included
if ($this->isTableSelected('civicrm_phone')) {
$this->_from .= "
LEFT JOIN civicrm_phone {$this->_aliases['civicrm_phone']}
ON ({$this->_aliases['civicrm_contact']}.id =
{$this->_aliases['civicrm_phone']}.contact_id) AND
{$this->_aliases['civicrm_phone']}.is_primary = 1\n";
}
}

/**
* Add Address into From Table if required.
*
Expand Down
26 changes: 0 additions & 26 deletions CRM/Utils/Hook.php
Original file line number Diff line number Diff line change
Expand Up @@ -2144,32 +2144,6 @@ public static function alterMailer(&$mailer, $driver, $params) {
->invoke(['mailer', 'driver', 'params'], $mailer, $driver, $params, self::$_nullObject, self::$_nullObject, self::$_nullObject, 'civicrm_alterMailer');
}

/**
* Deprecated: Misnamed version of alterMailer(). Remove post-4.7.x.
* Modify or replace the Mailer object used for outgoing mail.
*
* @param object $mailer
* The default mailer produced by normal configuration; a PEAR "Mail" class (like those returned by Mail::factory)
* @param string $driver
* The type of the default mailer (eg "smtp", "sendmail", "mock", "CRM_Mailing_BAO_Spool")
* @param array $params
* The default mailer config options
*
* @return mixed
* @see Mail::factory
* @deprecated
*/
public static function alterMail(&$mailer, $driver, $params) {
// This has been deprecated on the premise it MIGHT be called externally for a long time.
// We don't have a clear policy on how much we support external extensions calling internal
// hooks (ie. in general we say 'don't call internal functions', but some hooks like pre hooks
// are expected to be called externally.
// It's really really unlikely anyone uses this - but let's add deprecations for a couple
// of releases first.
CRM_Core_Error::deprecatedFunctionWarning('CRM_Utils_Hook::alterMailer');
return CRM_Utils_Hook::alterMailer($mailer, $driver, $params);
}

/**
* This hook is called while building the core search query,
* so hook implementers can provide their own query objects which alters/extends core search.
Expand Down
1 change: 1 addition & 0 deletions CRM/Utils/PDF/Utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public static function html2pdf($text, $fileName = 'civicrm.pdf', $output = FALS
/**
* Convert html to tcpdf.
*
* @deprecated
* @param $paper_size
* @param $orientation
* @param $margins
Expand Down