From be2e0c6ae7a14a6c96c9fe766049718dcaf14a58 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 19 Jan 2015 19:27:12 -0800 Subject: [PATCH] INFRA-132 - Misc --- CRM/Core/Payment/PayPalImpl.php | 3 ++- CRM/Member/BAO/MembershipType.php | 3 ++- CRM/Profile/Selector/Listings.php | 1 - CRM/Report/Form/Activity.php | 3 ++- CRM/Report/Form/Event.php | 1 - api/v3/Generic/Setvalue.php | 2 +- api/v3/LineItem.php | 2 +- .../WebTest/Event/MultiprofileEventTest.php | 2 +- .../WebTest/Report/RolePermissionReportTest.php | 2 +- tests/phpunit/api/v3/SyntaxConformanceTest.php | 16 ++++++++++------ 10 files changed, 20 insertions(+), 15 deletions(-) diff --git a/CRM/Core/Payment/PayPalImpl.php b/CRM/Core/Payment/PayPalImpl.php index daa74f5c1b..2ab4853b2a 100644 --- a/CRM/Core/Payment/PayPalImpl.php +++ b/CRM/Core/Payment/PayPalImpl.php @@ -774,7 +774,8 @@ class CRM_Core_Payment_PayPalImpl extends CRM_Core_Payment { return $result; } - /** This function will take NVPString and convert it to an Associative Array and it will decode the response. + /** + * This function will take NVPString and convert it to an Associative Array and it will decode the response. * It is usefull to search for a particular key and displaying arrays. * @nvpstr is NVPString. * @nvpArray is Associative Array. diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php index 8e2867eb40..b5f4dd3eec 100644 --- a/CRM/Member/BAO/MembershipType.php +++ b/CRM/Member/BAO/MembershipType.php @@ -752,7 +752,8 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { } } - /** * This function updates all price field value for quick config + /** + * This function updates all price field value for quick config * price set which has membership type * * @param int $membershipTypeId membership type id diff --git a/CRM/Profile/Selector/Listings.php b/CRM/Profile/Selector/Listings.php index 43db102dd5..092b6a6da5 100644 --- a/CRM/Profile/Selector/Listings.php +++ b/CRM/Profile/Selector/Listings.php @@ -795,5 +795,4 @@ class CRM_Profile_Selector_Listings extends CRM_Core_Selector_Base implements CR } } //func close - } diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index b7e165702d..1583964c24 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -344,7 +344,8 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { parent::__construct(); } - /** adding address fields with dbAlias for order clause + /** + * Adding address fields with dbAlias for order clause. * @return array * address fields */ diff --git a/CRM/Report/Form/Event.php b/CRM/Report/Form/Event.php index b5cc5d576f..7952b71aea 100644 --- a/CRM/Report/Form/Event.php +++ b/CRM/Report/Form/Event.php @@ -36,5 +36,4 @@ class CRM_Report_Form_Event extends CRM_Report_Form { // Nothing here. // FIXME: Do these reports really have nothing in common? Really? - } diff --git a/api/v3/Generic/Setvalue.php b/api/v3/Generic/Setvalue.php index ea92e2cdb7..e05a6cdca4 100644 --- a/api/v3/Generic/Setvalue.php +++ b/api/v3/Generic/Setvalue.php @@ -67,7 +67,7 @@ function civicrm_api3_generic_setValue($apiRequest) { break; case CRM_Utils_Type::T_DATE: - $value = CRM_Utils_Type::escape($value, "Date", false); + $value = CRM_Utils_Type::escape($value, "Date", FALSE); if (!$value) return civicrm_api3_create_error("Param '$field' is not a date. format YYYYMMDD or YYYYMMDDHHMMSS"); break; diff --git a/api/v3/LineItem.php b/api/v3/LineItem.php index 2314d7edc9..e26cc62d43 100644 --- a/api/v3/LineItem.php +++ b/api/v3/LineItem.php @@ -47,7 +47,7 @@ * {@getfields line_item_create} */ function civicrm_api3_line_item_create($params) { - $params = CRM_Contribute_BAO_Contribution::checkTaxAmount($params, True); + $params = CRM_Contribute_BAO_Contribution::checkTaxAmount($params, TRUE); return _civicrm_api3_basic_create(_civicrm_api3_get_BAO(__FUNCTION__), $params); } diff --git a/tests/phpunit/WebTest/Event/MultiprofileEventTest.php b/tests/phpunit/WebTest/Event/MultiprofileEventTest.php index 191747681b..a3016cd949 100644 --- a/tests/phpunit/WebTest/Event/MultiprofileEventTest.php +++ b/tests/phpunit/WebTest/Event/MultiprofileEventTest.php @@ -414,7 +414,7 @@ class WebTest_Event_MultiprofileEventTest extends CiviSeleniumTestCase { /** * Test profile creation. * -*@param $profileField + * @param array $profileField * @param int $location * @param $type * diff --git a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php index 5f3cc5120e..6fd0311bd7 100644 --- a/tests/phpunit/WebTest/Report/RolePermissionReportTest.php +++ b/tests/phpunit/WebTest/Report/RolePermissionReportTest.php @@ -96,7 +96,7 @@ class WebTest_Report_RolePermissionReportTest extends CiviSeleniumTestCase { } /** - *check for CRM-10148 + * Check for CRM-10148. */ public function testReservedReportPermission() { $this->webtestLogin('admin'); diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index 283fa859ca..fa549353d1 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -47,12 +47,16 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { */ protected $deletableTestObjects; - /** This test case doesn't require DB reset */ + /** + * This test case doesn't require DB reset. + */ public $DBResetRequired = FALSE; protected $_entity; - /** Map custom group entities to civicrm components */ + /** + * Map custom group entities to civicrm components. + */ static $componentMap = array( 'Contribution' => 'CiviContribute', 'Membership' => 'CiviMember', @@ -597,11 +601,11 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { return $knownFailures[$entity][$key]; } - /** testing the _get **/ + /* ----- testing the _get ----- */ /** * @dataProvider toBeSkipped_get - entities that don't need a get action + * Entities that don't need a get action * @param $Entity */ public function testNotImplemented_get($Entity) { @@ -1230,9 +1234,9 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { $baoObj->free(); } - /** testing the _getFields **/ + /* ---- testing the _getFields ---- */ - /** testing the _delete **/ + /* ---- testing the _delete ---- */ /** * @dataProvider toBeSkipped_delete -- 2.25.1