a few comment fixes

diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 22e1fc58fb40363890c96cf2eb9bd4aabc335e4d..a237e1310d7cc33b19979e4fa454d2d790f307f6 100644 (file)
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -1131,7 +1131,7 @@ INNER JOIN  civicrm_membership_type type ON ( type.id = membership.membership_ty
    * @param bool|int $isTest if true, membership is for a test site
    * @param bool|int $isOwner if true, only retrieve membership records for owners //LCD
    *
-   * @return returns the number of members of type $membershipTypeId whose
+   * @return integer the number of members of type $membershipTypeId whose
    *         start_date is between $startDate and $endDate
    */
   //LCD
@@ -1266,7 +1266,7 @@ AND civicrm_membership.is_test = %2";
     $isProcessSeparateMembershipTransaction, $defaultContributionTypeID) {
     $result      = NULL;
     $isTest      = CRM_Utils_Array::value('is_test', $membershipParams, FALSE);
-    $errors = array();
+    $errors = $createdMemberships = array();
 
     if ($isPaidMembership) {
       $result = CRM_Contribute_BAO_Contribution_Utils::processConfirm($form, $membershipParams,
@@ -1296,7 +1296,6 @@ AND civicrm_membership.is_test = %2";
       }
     }
 
-    $createdMemberships = array();
     $membership = NULL;
     if (!empty($membershipContribution) && !is_a($membershipContribution, 'CRM_Core_Error')) { {
       $membershipContributionID = $membershipContribution->id;

diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index 6d892109df2ca564fa564326403e0a43904dcb5a..5c1c8f35b70b5940d2308a6e616f43bbf850a34b 100644 (file)
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -208,9 +208,9 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
   /**
    * Function to find the membership status based on start date, end date, join date & status date.
    *
-   * @param  date $startDate start date of the member whose membership status is to be calculated.
-   * @param  date $endDate end date of the member whose membership status is to be calculated.
-   * @param  date $joinDate join date of the member whose membership status is to be calculated.
+   * @param  string $startDate start date of the member whose membership status is to be calculated.
+   * @param  string $endDate end date of the member whose membership status is to be calculated.
+   * @param  string $joinDate join date of the member whose membership status is to be calculated.
    * @param \date|string $statusDate status date of the member whose membership status is to be calculated.
    * @param  boolean $excludeIsAdmin exclude the statuses those having is_admin = 1
    * @param $membershipTypeID

diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
index bec7a808d62207d5f5d6227dce5414a6de69215d..6f0a311c0a70b3f8c19e7c732c85c27f1c77e383 100644 (file)
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -288,7 +288,7 @@ class CRM_Utils_Date {
    * %P - uppercase ante/post meridiem ('AM', 'PM')
    * %Y - year as a decimal number including the century ('2005')
    *
-   * @param $dateString
+   * @param string $dateString
    * @param string $format the output format
    * @param array $dateParts an array with the desired date parts
    *