Merge pull request #17091 from colemanw/noArrayValue

[REF] Switch CRM_Utils_Array::value to empty in conditionals
civicrm · May 4, 2020 · 4038698 · 4038698
2 parents 0fdffe8 + b99f3e9
commit 4038698
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 45 deletions.
diff --git a/CRM/Activity/Task.php b/CRM/Activity/Task.php
@@ -152,7 +152,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Admin/Form/Preferences/Address.php b/CRM/Admin/Form/Preferences/Address.php
@@ -92,7 +92,7 @@ public function postProcess() {
 
     // check that locale supports address parsing
     if (
-      CRM_Utils_Array::value($addressOptions['Street Address Parsing'], $this->_params['address_options']) &&
+      !empty($this->_params['address_options'][$addressOptions['Street Address Parsing']]) &&
       !CRM_Core_BAO_Address::isSupportedParsingLocale()
     ) {
       $config = CRM_Core_Config::singleton();

diff --git a/CRM/Campaign/Task.php b/CRM/Campaign/Task.php
@@ -108,7 +108,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // Set the interview task as default
       $value = self::INTERVIEW;
     }

diff --git a/CRM/Case/Task.php b/CRM/Case/Task.php
@@ -132,7 +132,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -2554,7 +2554,7 @@ public static function fromClause(&$tables, $inner = NULL, $right = NULL, $prima
     }
 
     if ((!empty($tables['civicrm_state_province']) || !empty($tables['civicrm_country']) ||
-        CRM_Utils_Array::value('civicrm_county', $tables)) && empty($tables['civicrm_address'])) {
+        !empty($tables['civicrm_county'])) && empty($tables['civicrm_address'])) {
       $tables = array_merge(['civicrm_address' => 1],
         $tables
       );

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
@@ -116,7 +116,7 @@ public function buildQuickForm() {
 
       // see if we need to include this paneName in the current form
       if ($this->_searchPane == $type || !empty($_POST["hidden_{$type}"]) ||
-        CRM_Utils_Array::value("hidden_{$type}", $this->_formValues)
+        !empty($this->_formValues["hidden_{$type}"])
       ) {
         $allPanes[$name]['open'] = 'true';
 

diff --git a/CRM/Contact/Selector.php b/CRM/Contact/Selector.php
@@ -805,9 +805,7 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
           );
         }
         elseif ((is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) ||
-          (!empty($row['city']) &&
-            CRM_Utils_Array::value('state_province', $row)
-          )
+          (!empty($row['city']) && !empty($row['state_province']))
         ) {
           $row['action'] = CRM_Core_Action::formLink(
             $links,
@@ -935,9 +933,7 @@ public function addActions(&$rows) {
       }
 
       if ((!is_numeric(CRM_Utils_Array::value('geo_code_1', $row))) &&
-        (empty($row['city']) ||
-          !CRM_Utils_Array::value('state_province', $row)
-        )
+        (empty($row['city']) || empty($row['state_province']))
       ) {
         $mask = $mask & 4095;
       }

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -127,7 +127,7 @@ public static function add(&$params, $ids = []) {
     $contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', (int) $params['contribution_status_id']);
 
     if (!$contributionID
-      && CRM_Utils_Array::value('membership_id', $params)
+      && !empty($params['membership_id'])
       && Civi::settings()->get('deferred_revenue_enabled')
     ) {
       $memberStartDate = CRM_Core_DAO::getFieldValue('CRM_Member_DAO_Membership', $params['membership_id'], 'start_date');

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
@@ -369,7 +369,7 @@ public function setDefaultValues() {
       $defaults['total_amount'] = CRM_Utils_Money::format($total_value, NULL, '%a');
       if (!empty($defaults['tax_amount'])) {
         $componentDetails = CRM_Contribute_BAO_Contribution::getComponentDetails($this->_id);
-        if (!(CRM_Utils_Array::value('membership', $componentDetails) || CRM_Utils_Array::value('participant', $componentDetails))) {
+        if (empty($componentDetails['membership']) && empty($componentDetails['participant'])) {
           $defaults['total_amount'] = CRM_Utils_Money::format($total_value - $defaults['tax_amount'], NULL, '%a');
         }
       }
@@ -483,7 +483,7 @@ public function buildQuickForm() {
     // FIXME: This probably needs to be done in preprocess
     if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
       && $this->_action & CRM_Core_Action::UPDATE
-      && CRM_Utils_Array::value('financial_type_id', $this->_values)
+      && !empty($this->_values['financial_type_id'])
     ) {
       $financialTypeID = CRM_Contribute_PseudoConstant::financialType($this->_values['financial_type_id']);
       CRM_Financial_BAO_FinancialType::checkPermissionedLineItems($this->_id, 'edit');
@@ -1253,7 +1253,7 @@ protected function generatePane($type, $defaults) {
 
     // See if we need to include this paneName in the current form.
     if ($this->_formType == $type || !empty($_POST["hidden_{$type}"]) ||
-      CRM_Utils_Array::value("hidden_{$type}", $defaults)
+      !empty($defaults["hidden_{$type}"])
     ) {
       $this->assign('showAdditionalInfo', TRUE);
       $pane['open'] = 'true';
@@ -1462,7 +1462,7 @@ protected function submit($submittedValues, $action, $pledgePaymentID) {
       if ($this->_priceSetId && CRM_Core_DAO::getFieldValue('CRM_Price_DAO_PriceSet', $this->_priceSetId, 'is_quick_config')) {
         //CRM-16833: Ensure tax is applied only once for membership conribution, when status changed.(e.g Pending to Completed).
         $componentDetails = CRM_Contribute_BAO_Contribution::getComponentDetails($this->_id);
-        if (!(CRM_Utils_Array::value('membership', $componentDetails) || CRM_Utils_Array::value('participant', $componentDetails))) {
+        if (empty($componentDetails['membership']) && empty($componentDetails['participant'])) {
           if (!($this->_action & CRM_Core_Action::UPDATE && (($this->_defaults['contribution_status_id'] != $submittedValues['contribution_status_id'])))) {
             $lineItems[$itemId]['unit_price'] = $lineItems[$itemId]['line_total'] = CRM_Utils_Rule::cleanMoney(CRM_Utils_Array::value('total_amount', $submittedValues));
           }
@@ -1499,7 +1499,7 @@ protected function submit($submittedValues, $action, $pledgePaymentID) {
     // NOTE that this IS still a legitimate use of 'quick-config' for contributions under the current DB but
     // we should look at having a price field per contribution type & then there would be little reason
     // for the back-office contribution form postProcess to know if it is a quick-config form.
-    if ($isQuickConfig && !empty($submittedValues['financial_type_id']) && CRM_Utils_Array::value($this->_priceSetId, $lineItem)
+    if ($isQuickConfig && !empty($submittedValues['financial_type_id']) && !empty($lineItem[$this->_priceSetId])
     ) {
       foreach ($lineItem[$this->_priceSetId] as &$values) {
         $values['financial_type_id'] = $submittedValues['financial_type_id'];

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1871,7 +1871,7 @@ public function setFormAmountFields($priceSetID) {
       // the quick config seems like a red-herring - if this is about a separate membership payment then there
       // are 2 types of line items - membership ones & non-membership ones - regardless of whether quick config is set
       elseif (
-        CRM_Utils_Array::value('is_separate_payment', $this->_membershipBlock)
+        !empty($this->_membershipBlock['is_separate_payment'])
         && !empty($this->_values['fee'][$priceField->id])
         && ($this->_values['fee'][$priceField->id]['name'] == "other_amount")
         && CRM_Utils_Array::value("price_{$paramWeDoNotUnderstand}", $this->_params) < 1
@@ -2052,8 +2052,8 @@ protected function processFormSubmission($contactID) {
     // CRM-18854
     if (!empty($this->_params['is_pledge']) && empty($this->_values['pledge_id']) && !empty($this->_values['adjust_recur_start_date'])) {
       $pledgeBlock = CRM_Pledge_BAO_PledgeBlock::getPledgeBlock($this->_id);
-      if (CRM_Utils_Array::value('start_date', $this->_params) || !CRM_Utils_Array::value('is_pledge_start_date_visible', $pledgeBlock)
-          || !CRM_Utils_Array::value('is_pledge_start_date_editable', $pledgeBlock)) {
+      if (!empty($this->_params['start_date']) || empty($pledgeBlock['is_pledge_start_date_visible'])
+          || empty($pledgeBlock['is_pledge_start_date_editable'])) {
         $pledgeStartDate = $this->_params['start_date'] ?? NULL;
         $this->_params['receive_date'] = CRM_Pledge_BAO_Pledge::getPledgeStartDate($pledgeStartDate, $pledgeBlock);
         $recurParams = CRM_Pledge_BAO_Pledge::buildRecurParams($this->_params);

diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php
@@ -852,7 +852,7 @@ public static function formRule($fields, $files, $self) {
       (int) $self->_paymentProcessor['billing_mode'] & CRM_Core_Payment::BILLING_MODE_BUTTON
     ) {
       if (!empty($fields[$self->_expressButtonName . '_x']) || !empty($fields[$self->_expressButtonName . '_y']) ||
-        CRM_Utils_Array::value($self->_expressButtonName, $fields)
+        !empty($fields[$self->_expressButtonName])
       ) {
         return $errors;
       }

diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
@@ -1363,7 +1363,7 @@ protected function setRecurringMembershipParams() {
     }
     if ((!empty($this->_params['selectMembership']) || !empty($this->_params['priceSetId']))
       && !empty($this->_paymentProcessor['is_recur']) &&
-      CRM_Utils_Array::value('auto_renew', $this->_params)
+      !empty($this->_params['auto_renew'])
       && empty($this->_params['is_recur']) && empty($this->_params['frequency_interval'])
     ) {
 

diff --git a/CRM/Contribute/Form/SoftCredit.php b/CRM/Contribute/Form/SoftCredit.php
@@ -180,7 +180,7 @@ public static function formRule($fields, $errors, $self) {
     // if honor roll fields are populated but no PCP is selected
     if (empty($fields['pcp_made_through_id'])) {
       if (!empty($fields['pcp_display_in_roll']) || !empty($fields['pcp_roll_nickname']) ||
-        CRM_Utils_Array::value('pcp_personal_note', $fields)
+        !empty($fields['pcp_personal_note'])
       ) {
         $errors['pcp_made_through_id'] = ts('Please select a Personal Campaign Page, OR uncheck Display in Honor Roll and clear both the Honor Roll Name and the Personal Note field.');
       }

diff --git a/CRM/Contribute/Form/Task/PDF.php b/CRM/Contribute/Form/Task/PDF.php
@@ -281,7 +281,7 @@ public static function getElements($contribIds, $params, $contactIds) {
       foreach ($contactDetails as $id => $values) {
         if (empty($values['email']) ||
           (empty($params['override_privacy']) && !empty($values['do_not_email']))
-          || CRM_Utils_Array::value('is_deceased', $values)
+          || !empty($values['is_deceased'])
           || !empty($values['on_hold'])
         ) {
           $suppressedEmails++;

diff --git a/CRM/Contribute/Task.php b/CRM/Contribute/Task.php
@@ -175,7 +175,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
@@ -685,7 +685,7 @@ public static function triggerInsert($event) {
     if (empty($hasaRecurringRecord)) {
       // check if its a linked entity
       if (array_key_exists($obj->__table, self::$_linkedEntitiesInfo) &&
-        !CRM_Utils_Array::value('is_multirecord', self::$_linkedEntitiesInfo[$obj->__table])
+        empty(self::$_linkedEntitiesInfo[$obj->__table]['is_multirecord'])
       ) {
         $linkedDAO = new self::$_tableDAOMapper[$obj->__table]();
         $linkedDAO->id = $obj->id;

diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php
@@ -55,7 +55,7 @@ public static function _invoke($args) {
       return NULL;
     }
     // CRM-15901: Turn off PHP errors display for all ajax calls
-    if (CRM_Utils_Array::value(1, $args) == 'ajax' || CRM_Utils_Array::value('snippet', $_REQUEST)) {
+    if (CRM_Utils_Array::value(1, $args) == 'ajax' || !empty($_REQUEST['snippet'])) {
       ini_set('display_errors', 0);
     }
 
@@ -184,7 +184,8 @@ private static function registerPharHandler() {
           stream_wrapper_unregister('phar');
           stream_wrapper_register('phar', \TYPO3\PharStreamWrapper\PharStreamWrapper::class);
         }
-      } else {
+      }
+      else {
         // this is not an exception we can handle
         throw $e;
       }

diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php
@@ -1761,7 +1761,7 @@ public function buildEventFeeForm($form) {
         );
       }
       if (CRM_Financial_BAO_FinancialType::isACLFinancialTypeStatus()
-        && !CRM_Utils_Array::value('fee', $form->_values)
+        && empty($form->_values['fee'])
         && CRM_Utils_Array::value('snippet', $_REQUEST) == CRM_Core_Smarty::PRINT_NOFORM
       ) {
         CRM_Core_Session::setStatus(ts('You do not have all the permissions needed for this page.'), 'Permission Denied', 'error');

diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -700,7 +700,7 @@ public function postProcess() {
     // CRM-11182 - Optional confirmation screen
       !$this->_values['event']['is_confirm_enabled']
       && !$this->_values['event']['is_monetary']
-      && CRM_Utils_Array::value('additional_participants', $this->_params[0])
+      && !empty($this->_params[0]['additional_participants'])
       && $this->isLastParticipant()
     ) {
       $this->processRegistration($this->_params);

diff --git a/CRM/Event/Form/SelfSvcTransfer.php b/CRM/Event/Form/SelfSvcTransfer.php
@@ -246,7 +246,7 @@ public static function checkProfileComplete($fields, &$errors, $self) {
       }
     }
     if (!$email && !(CRM_Utils_Array::value('first_name', $fields) &&
-      CRM_Utils_Array::value('last_name', $fields))) {
+      !empty($fields['last_name']))) {
       $defaults = $params = ['id' => $eventId];
       CRM_Event_BAO_Event::retrieve($params, $defaults);
       $message = ts("Mandatory fields (first name and last name, OR email address) are missing from this form.");

diff --git a/CRM/Event/Task.php b/CRM/Event/Task.php
@@ -177,7 +177,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Mailing/Task.php b/CRM/Mailing/Task.php
@@ -75,7 +75,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // make the print task by default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
@@ -573,7 +573,7 @@ public static function buildSearchForm(&$form) {
    * @param array $tables
    */
   public static function tableNames(&$tables) {
-    if (!empty($tables['civicrm_membership_log']) || !empty($tables['civicrm_membership_status']) || CRM_Utils_Array::value('civicrm_membership_type', $tables)) {
+    if (!empty($tables['civicrm_membership_log']) || !empty($tables['civicrm_membership_status']) || !empty($tables['civicrm_membership_type'])) {
       $tables = array_merge(['civicrm_membership' => 1], $tables);
     }
   }

diff --git a/CRM/Member/Page/Tab.php b/CRM/Member/Page/Tab.php
@@ -150,8 +150,8 @@ public function browse() {
       }
 
       // if relevant--membership is active and type allows inheritance--count related memberships
-      if (CRM_Utils_Array::value('is_current_member', $statusANDType[$dao->id])
-        && CRM_Utils_Array::value('relationship_type_id', $statusANDType[$dao->id])
+      if (!empty($statusANDType[$dao->id]['is_current_member'])
+        && !empty($statusANDType[$dao->id]['relationship_type_id'])
         && empty($dao->owner_membership_id)
       ) {
         // not an related membership

diff --git a/CRM/Member/Task.php b/CRM/Member/Task.php
@@ -170,7 +170,7 @@ public static function permissionedTaskTitles($permission, $params = []) {
    */
   public static function getTask($value) {
     self::tasks();
-    if (!$value || !CRM_Utils_Array::value($value, self::$_tasks)) {
+    if (!$value || empty(self::$_tasks[$value])) {
       // Make the print task the default
       $value = self::TASK_PRINT;
     }

diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php
@@ -221,7 +221,7 @@ public function buildQuickForm() {
       ];
       // see if we need to include this paneName in the current form
       if ($this->_formType == $type || !empty($_POST["hidden_{$type}"]) ||
-        CRM_Utils_Array::value("hidden_{$type}", $defaults)
+        !empty($defaults["hidden_{$type}"])
       ) {
         $showAdditionalInfo = TRUE;
         $allPanes[$name]['open'] = 'true';

diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php
@@ -1107,7 +1107,7 @@ public function postProcess() {
       $details = $contactDetails[$this->_id];
     }
     if (!(!empty($details['addressee_id']) || !empty($details['email_greeting_id']) ||
-      CRM_Utils_Array::value('postal_greeting_id', $details)
+      !empty($details['postal_greeting_id'])
     )
     ) {
 

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -5835,7 +5835,7 @@ protected function buildColumns($specs, $tableName, $daoName = NULL, $tableAlias
    */
   protected function storeGroupByArray() {
 
-    if (!CRM_Utils_Array::value('group_bys', $this->_params)
+    if (empty($this->_params['group_bys'])
       || !is_array($this->_params['group_bys'])) {
       $this->_params['group_bys'] = [];
     }

diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php
@@ -234,7 +234,7 @@ public function select() {
       foreach ($table['fields'] as $fieldName => $field) {
         if (!empty($field['required']) ||
           !empty($this->_params['fields'][$fieldName]) ||
-          CRM_Utils_Array::value('is_required', $field)
+          !empty($field['is_required'])
         ) {
 
           $fieldsName = CRM_Utils_Array::value(1, explode('_', $tableName));

diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php
@@ -548,14 +548,14 @@ public function checkEnabledFields() {
 
     if (!empty($this->_params['last_completed_date_time_relative']) ||
       !empty($this->_params['last_completed_date_time_from']) ||
-      CRM_Utils_Array::value('last_completed_date_time_to', $this->_params)
+      !empty($this->_params['last_completed_date_time_to'])
     ) {
       $this->_activityLastCompleted = TRUE;
     }
 
     if (!empty($this->_params['last_activity_date_time_relative']) ||
       !empty($this->_params['last_activity_date_time_from']) ||
-      CRM_Utils_Array::value('last_activity_date_time_to', $this->_params)
+      !empty($this->_params['last_activity_date_time_to'])
     ) {
       $this->_activityLast = TRUE;
     }

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
@@ -1672,7 +1672,7 @@ public static function getApiTokenReplacement($entity, $token, $entityArray) {
    */
   public static function replaceContributionTokens($str, &$contribution, $html = FALSE, $knownTokens = NULL, $escapeSmarty = FALSE) {
     $key = 'contribution';
-    if (!$knownTokens || !CRM_Utils_Array::value($key, $knownTokens)) {
+    if (!$knownTokens || empty($knownTokens[$key])) {
       //early return
       return $str;
     }