From 06f0e21b41b0cb1d841d5c581730b37ad1451858 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 1 Dec 2023 10:18:25 +1300
Subject: [PATCH] Superficial cleanup

Removes some unused variables & other minor cleanups
---
 CRM/Core/Form.php                   |  3 ++-
 CRM/Member/Form/MembershipBlock.php | 36 ++++++++++++++++-------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
index 99e439b536..0db3efcfda 100644
--- a/CRM/Core/Form.php
+++ b/CRM/Core/Form.php
@@ -2991,7 +2991,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page {
    *
    * @param string $default
    *
-   * @throws \CRM_Core_Exception
+   *
+   * @noinspection PhpUnhandledExceptionInspection
    */
   public function setSelectedChild($default = NULL) {
     $selectedChild = CRM_Utils_Request::retrieve('selectedChild', 'Alphanumeric', $this, FALSE, $default);
diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php
index 72dd3f22c1..e6b0c37dba 100644
--- a/CRM/Member/Form/MembershipBlock.php
+++ b/CRM/Member/Form/MembershipBlock.php
@@ -9,6 +9,8 @@
  +--------------------------------------------------------------------+
  */
 
+use Civi\Api4\PriceSetEntity;
+
 /**
  * form to process actions on Membership
  */
@@ -18,12 +20,12 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
    * Store membership price set id
    * @var int
    */
-  protected $_memPriceSetId = NULL;
+  protected $_memPriceSetId;
 
   /**
    * Set variables up before form is built.
    */
-  public function preProcess() {
+  public function preProcess(): void {
     parent::preProcess();
     $this->setSelectedChild('membership');
   }
@@ -32,10 +34,10 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
    * Set default values for the form. Note that in edit/view mode
    * the default values are retrieved from the database
    */
-  public function setDefaultValues() {
+  public function setDefaultValues(): ?array {
     $defaults = [];
-    if (isset($this->_id)) {
-      $defaults = CRM_Member_BAO_Membership::getMembershipBlock($this->_id);
+    if ($this->getContributionPageID()) {
+      $defaults = CRM_Member_BAO_Membership::getMembershipBlock($this->getContributionPageID());
     }
     $defaults['member_is_active'] = $defaults['is_active'] ?? FALSE;
 
@@ -65,8 +67,8 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
           'name',
           'label',
         ]);
-        foreach ($pFIDs as $pid => $pValue) {
-          if ($pValue['html_type'] == 'Radio' && $pValue['name'] == 'membership_amount') {
+        foreach ($pFIDs as $pValue) {
+          if ($pValue['html_type'] === 'Radio' && $pValue['name'] === 'membership_amount') {
             $defaults['mem_price_field_id'] = $pValue['id'];
             $defaults['membership_type_label'] = $pValue['label'];
           }
@@ -75,10 +77,10 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
         if (!empty($defaults['mem_price_field_id'])) {
           $options = [];
           $priceFieldOptions = CRM_Price_BAO_PriceFieldValue::getValues($defaults['mem_price_field_id'], $options, 'id', 1);
-          foreach ($options as $k => $v) {
+          foreach ($options as $v) {
             $newMembershipType[$v['membership_type_id']] = 1;
             if (!empty($defaults['auto_renew'])) {
-              $defaults["auto_renew_" . $v['membership_type_id']] = $defaults['auto_renew'][$v['membership_type_id']];
+              $defaults['auto_renew_' . $v['membership_type_id']] = $defaults['auto_renew'][$v['membership_type_id']];
             }
           }
           $defaults['membership_type'] = $newMembershipType;
@@ -119,7 +121,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
       );
       $paymentProcessorId = explode(CRM_Core_DAO::VALUE_SEPARATOR, $paymentProcessorIds);
       $isRecur = TRUE;
-      foreach ($paymentProcessorId as $dontCare => $id) {
+      foreach ($paymentProcessorId as $id) {
         if (!array_key_exists($id, $paymentProcessor)) {
           $isRecur = FALSE;
           continue;
@@ -154,7 +156,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
         $params['membership_types'] = serialize($membershipRequired);
         CRM_Member_BAO_MembershipBlock::writeRecord($params);
       }
-      $this->add('hidden', "mem_price_field_id", '', ['id' => "mem_price_field_id"]);
+      $this->add('hidden', 'mem_price_field_id', '', ['id' => 'mem_price_field_id']);
       $this->assign('is_recur', $isRecur);
       $this->assign('auto_renew', $renewOption);
       $this->addGroup($membership, 'membership_type', ts('Membership Types'));
@@ -211,7 +213,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
    *   mixed true or array of errors
    * @throws \CRM_Core_Exception
    */
-  public static function formRule($params, $files, $contributionPageId = NULL) {
+  public static function formRule(array $params, $files, $contributionPageId = NULL) {
     $errors = [];
 
     if (!empty($params['member_price_set_id'])) {
@@ -241,7 +243,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
     }
     if (!empty($params['member_is_active'])) {
       // Don't allow Contribution price set w/ membership signup, CRM-5095.
-      $priceSetNotExtendingMembership = \Civi\Api4\PriceSetEntity::get(FALSE)
+      $priceSetNotExtendingMembership = PriceSetEntity::get(FALSE)
         ->addSelect('id')
         ->addJoin('PriceSet AS price_set', 'LEFT', ['price_set_id', '=', 'price_set.id'])
         ->addWhere('entity_table', '=', 'civicrm_contribution_page')
@@ -316,6 +318,8 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
 
   /**
    * Process the form.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function postProcess() {
     // get the submitted form values.
@@ -359,7 +363,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
             $setParams['name'] = $pageTitle . '_' . $this->_id;
           }
           else {
-            $timeSec = explode(".", microtime(TRUE));
+            $timeSec = explode('.', microtime(TRUE));
             $setParams['name'] = $pageTitle . '_' . date('is', $timeSec[0]) . $timeSec[1];
           }
           $setParams['is_quick_config'] = 1;
@@ -429,7 +433,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
         foreach ($options as $priceFieldID => $memType) {
           CRM_Price_BAO_PriceFieldValue::setIsActive($priceFieldID, '0');
         }
-        $priceField = CRM_Price_BAO_PriceField::create($fieldParams);
+        CRM_Price_BAO_PriceField::create($fieldParams);
       }
       elseif (!$priceSetID) {
         $deletePriceSet = 1;
@@ -486,7 +490,7 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa
    *
    * @return string
    */
-  public function getTitle() {
+  public function getTitle(): string {
     return ts('Memberships');
   }
 
-- 
2.25.1