Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NFC] Fix comment block for variable declarations #14314

Merged
merged 1 commit into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CRM/Contact/BAO/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,9 @@ class CRM_Contact_BAO_Query {
protected $_relationshipValuesAdded = FALSE;

/**
* Set to the name of the temp table if one has been created
* @var String
* Set to the name of the temp table if one has been created.
*
* @var string
*/
public static $_relationshipTempTable = NULL;

Expand Down
11 changes: 7 additions & 4 deletions CRM/Contact/Form/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search {
/**
* The profile group id used for display.
*
* @var integer
* @var int
*/
protected $_ufGroupID;

Expand All @@ -132,13 +132,16 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search {
public static $csv = ['contact_type', 'group', 'tag'];

/**
* @var string how to display the results. Should we display as
* contributons, members, cases etc
* How to display the results. Should we display as contributons, members, cases etc.
*
* @var string
*/
protected $_componentMode;

/**
* @var string what operator should we use, AND or OR
* What operator should we use, AND or OR.
*
* @var string
*/
protected $_operator;

Expand Down
24 changes: 19 additions & 5 deletions CRM/Contact/Form/Search/Custom/FullText.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CRM_Contact_Form_Search_Custom_FullText extends CRM_Contact_Form_Search_Cu
const LIMIT = 10;

/**
* @var array CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery
* @var CRM_Contact_Form_Search_Custom_FullText_AbstractPartialQuery[]
*/
protected $_partialQueries = NULL;

Expand All @@ -54,23 +54,37 @@ class CRM_Contact_Form_Search_Custom_FullText extends CRM_Contact_Form_Search_Cu
protected $_tableFields = NULL;

/**
* @var array|null NULL if no limit; or array(0 => $limit, 1 => $offset)
* Limit clause.
*
* NULL if no limit; or array(0 => $limit, 1 => $offset).
*
* @var array|null
*/
protected $_limitClause = NULL;

/**
* @var array|null NULL if no limit; or array(0 => $limit, 1 => $offset)
* Limit row clause.
*
* NULL if no limit; or array(0 => $limit, 1 => $offset)
*
* @var array|null
*/
protected $_limitRowClause = NULL;

/**
* @var array|null NULL if no limit; or array(0 => $limit, 1 => $offset)
* Limit detail clause.
*
* NULL if no limit; or array(0 => $limit, 1 => $offset).
*
* @var array|null
*/
protected $_limitDetailClause = NULL;

protected $_limitNumber = 10;

/**
* this should be one more than self::LIMIT
* This should be one more than self::LIMIT.
*
* @var int
*/
protected $_limitNumberPlus1 = 11;
Expand Down
6 changes: 4 additions & 2 deletions CRM/Contact/Form/Search/Custom/Group.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@ public function buildForm(&$form) {
/**
* @param int $offset
* @param int $rowcount
* @param NULL $sort
* @param string $sort
* @param bool $includeContactIDs
* @param bool $justIDs
*
* @return string
* @throws \Exception
*/
public function all(
$offset = 0, $rowcount = 0, $sort = NULL,
Expand Down Expand Up @@ -587,10 +588,11 @@ public function count() {
/**
* @param int $offset
* @param int $rowcount
* @param NULL $sort
* @param string $sort
* @param bool $returnSQL
*
* @return string
* @throws \Exception
*/
public function contactIDs($offset = 0, $rowcount = 0, $sort = NULL, $returnSQL = FALSE) {
return $this->all($offset, $rowcount, $sort, FALSE, TRUE);
Expand Down
8 changes: 5 additions & 3 deletions CRM/Contact/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,20 @@ abstract class CRM_Contact_Import_Parser extends CRM_Import_Parser {
/**
* Total number of lines in file
*
* @var integer
* @var int
*/
protected $_rowCount;

/**
* Running total number of un-matched Contacts.
*
* @var int
*/
protected $_unMatchCount;

/**
* Array of unmatched lines
* Array of unmatched lines.
*
* @var array
*/
protected $_unMatch;
Expand Down Expand Up @@ -1354,7 +1356,7 @@ protected function fillPrimary(&$params, $values, $entity, $contactID) {
'return' => 'location_type_id',
'contact_id' => $contactID,
'is_primary' => 1,
'sequential' => 1
'sequential' => 1,
]);
}
$defaultLocationType = CRM_Core_BAO_LocationType::getDefault();
Expand Down
4 changes: 3 additions & 1 deletion CRM/Contact/Page/ImageFile.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
*/
class CRM_Contact_Page_ImageFile extends CRM_Core_Page {
/**
* @var int Time to live (seconds).
* Time to live (seconds).
*
* @var int
*
* 12 hours: 12 * 60 * 60 = 43200
*/
Expand Down
7 changes: 4 additions & 3 deletions CRM/Contact/Page/View/ContactSmartGroup.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@
class CRM_Contact_Page_View_ContactSmartGroup extends CRM_Core_Page {

/**
* @var int contact id
* Contact id.
*
* @var int
*/
public $_contactId;

/**
* called when action is browse.
*
* Called when action is browse.
*/
public function browse() {
$in = CRM_Contact_BAO_GroupContact::getContactGroup($this->_contactId, 'Added');
Expand Down
10 changes: 6 additions & 4 deletions CRM/Contribute/Form/Contribution.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,9 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
public $_fromEmails;

/**
* ID of from email
* @var integer
* ID of from email.
*
* @var int
*/
public $fromEmailId;

Expand Down Expand Up @@ -171,8 +172,9 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
public $userEmail;

/**
* Price set ID
* @var integer
* Price set ID.
*
* @var int
*/
public $_priceSetId;

Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/Form/ContributionBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class CRM_Contribute_Form_ContributionBase extends CRM_Core_Form {
/**
* Pcp id
*
* @var integer
* @var int
*/
public $_pcpId;

Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/Action.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class CRM_Core_Action {
* Different possible actions are defined here. Keep in sync with the
* constant from CRM_Core_Form for various modes.
*
* @var integer const
* @var int
*/
const
NONE = 0,
Expand Down
8 changes: 2 additions & 6 deletions CRM/Custom/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ abstract class CRM_Custom_Import_Parser extends CRM_Contact_Import_Parser {
protected $_fileName;

/**
* #@+
* @var integer
*/

/**
* Imported file size
* Imported file size.
*
* @var int
*/
protected $_fileSize;
Expand Down
5 changes: 3 additions & 2 deletions CRM/Event/Form/ManageEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ class CRM_Event_Form_ManageEvent extends CRM_Core_Form {
protected $_isTemplate = FALSE;

/**
* Pre-populate fields based on this template event_id
* @var integer
* Pre-populate fields based on this template event_id.
*
* @var int
*/
protected $_templateId;

Expand Down
6 changes: 4 additions & 2 deletions CRM/Event/Form/Registration/Register.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration {
/**
* Show fee block or not.
*
* @var bool determines if fee block should be shown or hidden
* @var bool
*/
public $_noFees;

/**
* @var array Fee Block
* Fee Block.
*
* @var array
*/
public $_feeBlock;

Expand Down
14 changes: 6 additions & 8 deletions CRM/Event/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,22 @@ abstract class CRM_Event_Import_Parser extends CRM_Import_Parser {
protected $_fileName;

/**
* #@+
* @var integer
*/

/**
* Imported file size
* Imported file size.
*
* @var int
*/
protected $_fileSize;

/**
* Seperator being used
* Separator being used.
*
* @var string
*/
protected $_seperator;

/**
* Total number of lines in file
* Total number of lines in file.
*
* @var int
*/
protected $_lineCount;
Expand Down
2 changes: 1 addition & 1 deletion CRM/Financial/Form/Payment.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class CRM_Financial_Form_Payment extends CRM_Core_Form {
public $isBackOffice = FALSE;

/**
* @var String
* @var string
*/
public $_formName = '';

Expand Down
4 changes: 3 additions & 1 deletion CRM/Mailing/Page/View.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
class CRM_Mailing_Page_View extends CRM_Core_Page {

/**
* @var Signal to Flexmailer that this version of the class is usable.
* Signal to Flexmailer that this version of the class is usable.
*
* @var bool
*/
const USES_MAILING_PREVIEW_API = 1;

Expand Down
5 changes: 0 additions & 5 deletions CRM/Member/Import/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ abstract class CRM_Member_Import_Parser extends CRM_Import_Parser {

protected $_fileName;

/**
* #@+
* @var integer
*/

/**
* Imported file size
* @var int
Expand Down
Loading