From 4a2db77c9811440f650ca28f1e5132147adaf4f2 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 5 Jan 2015 16:28:17 +1300
Subject: [PATCH] comment fixes

---
 CRM/Core/Payment/BaseIPN.php                   | 2 +-
 CRM/Member/Form/Task/PDFLetter.php             | 2 +-
 CRM/Utils/Hook/DrupalBase.php                  | 2 +-
 tests/phpunit/api/v3/SyntaxConformanceTest.php | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 7d663e25fb..2345281d14 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -128,7 +128,7 @@ class CRM_Core_Payment_BaseIPN {
    * @param integer $paymentProcessorID
    * @param array $error_handling
    *
-   * @return multitype:number NULL |boolean
+   * @return boolean
    */
   public function loadObjects(&$input, &$ids, &$objects, $required, $paymentProcessorID, $error_handling = NULL) {
     if (empty($error_handling)) {
diff --git a/CRM/Member/Form/Task/PDFLetter.php b/CRM/Member/Form/Task/PDFLetter.php
index 06d4af5303..6668c33918 100644
--- a/CRM/Member/Form/Task/PDFLetter.php
+++ b/CRM/Member/Form/Task/PDFLetter.php
@@ -108,7 +108,7 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
    * {membership.join_date} => Membership Join Date
    * {membership.end_date} => Membership End Date
    * {membership.fee} => Membership Fee
-   * @return Ambigous <NULL, multitype:string Ambigous <string, string> >
+   * @return array
    */
   public function listTokens() {
     return CRM_Core_SelectValues::membershipTokens();
diff --git a/CRM/Utils/Hook/DrupalBase.php b/CRM/Utils/Hook/DrupalBase.php
index 9be37b1602..f99601c62d 100644
--- a/CRM/Utils/Hook/DrupalBase.php
+++ b/CRM/Utils/Hook/DrupalBase.php
@@ -66,7 +66,7 @@ class CRM_Utils_Hook_DrupalBase extends CRM_Utils_Hook {
    * @param mixed $arg6
    * @param string $fnSuffix function suffix, this is effectively the hook name
    *
-   * @return Ambigous <boolean, multitype:>
+   * @return array|bool
    */
   function invoke($numParams,
     &$arg1, &$arg2, &$arg3, &$arg4, &$arg5, &$arg6,
diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index de12d1e0d4..845831710d 100644
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -218,12 +218,12 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
 
   /**
    * Mailing Contact Just doesn't support id. We have always insisted on finding a way to
-   * support id in API but in this case the underlying tables are crying out for a restructue
+   * support id in API but in this case the underlying tables are crying out for a restructure
    * & it just doesn't make sense
    *
-   * @param bool|\unknown_type $sequential
+   * @param bool $sequential
    *
-   * @return multitype:string |multitype:multitype:string
+   * @return array Entities that cannot be retrieved by ID
    */
   public static function toBeSkipped_getByID($sequential = FALSE) {
     return array('MailingContact');
@@ -283,7 +283,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
 /**
  * Generate list of entities to test for get by id functions
  * @param boolean $sequential
- * @return multitype:string |multitype:multitype:string
+ * @return array Entities to be skipped
  */
   public static function toBeSkipped_automock($sequential = FALSE) {
     $entitiesWithoutGet = array('MailingContact', 'EntityTag', 'Participant', 'ParticipantPayment', 'Setting', 'SurveyRespondant', 'MailingRecipients',  'CustomSearch', 'Extension', 'ReportTemplate', 'System');
-- 
2.25.1