From 9d451db8a5f6a78033348e52b5dc29c352bee3c4 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 26 May 2019 11:38:21 +1200 Subject: [PATCH] Further phpcs mandated fixes I removed the poorly formatted comment as it seemed out of date anyway --- CRM/Core/BAO/ActionSchedule.php | 3 ++- CRM/Core/DAO/permissions.php | 18 ------------------ CRM/Core/Payment/FirstData.php | 8 ++++---- CRM/Core/Payment/eWAY.php | 2 +- CRM/Core/Reference/OptionValue.php | 4 +++- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 2b54981f9e..a85f4df852 100644 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -120,13 +120,14 @@ class CRM_Core_BAO_ActionSchedule extends CRM_Core_DAO_ActionSchedule { * @param bool $namesOnly * Return simple list of names. * - * @param \Civi\ActionSchedule\Mapping|NULL $filterMapping + * @param \Civi\ActionSchedule\Mapping|null $filterMapping * Filter by the schedule's mapping type. * @param int $filterValue * Filter by the schedule's entity_value. * * @return array * (reference) reminder list + * @throws \CRM_Core_Exception */ public static function &getList($namesOnly = FALSE, $filterMapping = NULL, $filterValue = NULL) { $query = " diff --git a/CRM/Core/DAO/permissions.php b/CRM/Core/DAO/permissions.php index 6ba337cd1b..b2640be203 100644 --- a/CRM/Core/DAO/permissions.php +++ b/CRM/Core/DAO/permissions.php @@ -62,21 +62,3 @@ function _civicrm_api3_permissions($entity, $action, &$params) { return isset($perm[$action]) ? $perm[$action] : $perm['default']; } - -# FIXME: not sure how to permission the following API 3 calls: -# contribution_transact (make online contributions) -# entity_tag_display -# group_contact_pending -# group_contact_update_status -# mailing_event_bounce -# mailing_event_click -# mailing_event_confirm -# mailing_event_forward -# mailing_event_open -# mailing_event_reply -# mailing_group_event_domain_unsubscribe -# mailing_group_event_resubscribe -# mailing_group_event_subscribe -# mailing_group_event_unsubscribe -# membership_status_calc -# survey_respondant_count diff --git a/CRM/Core/Payment/FirstData.php b/CRM/Core/Payment/FirstData.php index a123e8f85d..a8f5b4f7ff 100644 --- a/CRM/Core/Payment/FirstData.php +++ b/CRM/Core/Payment/FirstData.php @@ -52,7 +52,7 @@ * ************************** */ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { - # (not used, implicit in the API, might need to convert?) + // (not used, implicit in the API, might need to convert?) const CHARSET = 'UFT-8'; /** @@ -122,7 +122,7 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { $requestFields['email'] = $params['email']; $requestFields['ip'] = $params['ip_address']; $requestFields['transactionorigin'] = "Eci"; - #32 character string + // 32 character string $requestFields['invoice_number'] = $params['invoiceID']; $requestFields['ordertype'] = 'Sale'; $requestFields['comments'] = $params['description']; @@ -179,9 +179,9 @@ class CRM_Core_Payment_FirstData extends CRM_Core_Payment { * define variables for connecting with the gateway **********************************************************/ - # Name and location of certificate file + // Name and location of certificate file $key = $this->_paymentProcessor['password']; - # Your store number + // Your store number $requestFields["configfile"] = $this->_paymentProcessor['user_name']; $port = "1129"; $host = $this->_paymentProcessor['url_site'] . ":" . $port . "/LSGSXML"; diff --git a/CRM/Core/Payment/eWAY.php b/CRM/Core/Payment/eWAY.php index 68992819af..8f198b46c8 100644 --- a/CRM/Core/Payment/eWAY.php +++ b/CRM/Core/Payment/eWAY.php @@ -99,7 +99,7 @@ require_once 'eWAY/eWAY_GatewayResponse.php'; * Class CRM_Core_Payment_eWAY. */ class CRM_Core_Payment_eWAY extends CRM_Core_Payment { - # (not used, implicit in the API, might need to convert?) + // (not used, implicit in the API, might need to convert?) const CHARSET = 'UTF-8'; /** diff --git a/CRM/Core/Reference/OptionValue.php b/CRM/Core/Reference/OptionValue.php index 9f37cdf9fc..9908be044b 100644 --- a/CRM/Core/Reference/OptionValue.php +++ b/CRM/Core/Reference/OptionValue.php @@ -5,7 +5,9 @@ */ class CRM_Core_Reference_OptionValue extends CRM_Core_Reference_Basic { /** - * @var string option-group-name + * Option group name. + * + * @var string */ protected $targetOptionGroupName; -- 2.25.1