From a271822c4b67bf0919b4207a61b18f6d6478e6ed Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 5 Jul 2015 23:21:10 +1200 Subject: [PATCH] CRM-16788 formatting fixes --- CRM/Member/Form/Membership.php | 4 ++-- tests/phpunit/CRM/Member/Form/MembershipTest.php | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 17833e6f06..fe5af58040 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -1463,8 +1463,8 @@ class CRM_Member_Form_Membership extends CRM_Member_Form { } // add all the additional payment params we need - $this->_params["state_province-{$this->_bltID}"] = $this->_params["billing_state_province-{$this->_bltID}"] = - CRM_Core_PseudoConstant::stateProvinceAbbreviation($formValues["billing_state_province_id-{$this->_bltID}"]); + $this->_params["state_province-{$this->_bltID}"] = $this->_params["billing_state_province-{$this->_bltID}"] + = CRM_Core_PseudoConstant::stateProvinceAbbreviation($formValues["billing_state_province_id-{$this->_bltID}"]); $this->_params["country-{$this->_bltID}"] = $this->_params["billing_country-{$this->_bltID}"] = CRM_Core_PseudoConstant::countryIsoCode($formValues["billing_country_id-{$this->_bltID}"]); $this->_params['year'] = CRM_Core_Payment_Form::getCreditCardExpirationYear($formValues); diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php index 3d89a74e47..1228521c02 100644 --- a/tests/phpunit/CRM/Member/Form/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php @@ -519,13 +519,13 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase { 'contact_id' => $this->_individualId, 'is_test' => TRUE, )); -/* Not currently passing. - $this->callAPISuccessGetCount('LineItem', array( + /* Not currently passing. + $this->callAPISuccessGetCount('LineItem', array( 'entity_id' => $membership['id'], 'entity_table' => 'civicrm_membership', 'contribution_id' => $contribution['id'], ), 1); -*/ + */ } /** @@ -542,4 +542,5 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase { $form->_bltID = 5; return $form; } + } -- 2.25.1