Skip to content

Commit

Permalink
a few mor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
eileenmcnaughton committed Jan 15, 2015
1 parent db7de9c commit d868941
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 36 deletions.
10 changes: 5 additions & 5 deletions CRM/Activity/BAO/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static function dataExists(&$params) {
}

/**
* Fetch object based on array of properties
* Fetch object based on array of properties.
*
* @param array $params
* (reference ) an assoc array of name/value pairs.
Expand Down Expand Up @@ -137,12 +137,12 @@ public static function retrieve(&$params, &$defaults) {
}

/**
* Delete the activity
* Delete the activity.
*
* @param array $params
* @param bool $moveToTrash
*
* @return void
* @return mixed
*/
public static function deleteActivity(&$params, $moveToTrash = FALSE) {
// CRM-9137
Expand Down Expand Up @@ -243,7 +243,7 @@ public static function deleteActivity(&$params, $moveToTrash = FALSE) {
}

/**
* Delete activity assignment record
* Delete activity assignment record.
*
* @param int $activityId
* @param int $recordTypeID
Expand All @@ -258,7 +258,7 @@ public static function deleteActivityContact($activityId, $recordTypeID = NULL)
}

/**
* Process the activities
* Process the activities.
*
* @param array $params
* Associated array of the submitted values.
Expand Down
4 changes: 2 additions & 2 deletions CRM/Admin/Form/Setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ public function setDefaultValues() {

//Set defaults for autocomplete and contact reference options
$this->_defaults['autocompleteContactSearch'] = array(
'1' => 1
'1' => 1,
) + $autoSearchFields;
$this->_defaults['autocompleteContactReference'] = array(
'1' => 1
'1' => 1,
) + $cRSearchFields;

// we can handle all the ones defined in the metadata here. Others to be converted
Expand Down
4 changes: 2 additions & 2 deletions CRM/Contact/Form/Edit/Phone.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $blockE
$form->addSelect("phone[$blockId][phone_type_id]", array(
'entity' => 'phone',
'class' => 'eight',
'placeholder' => NULL
'placeholder' => NULL,
));

//main phone number with crm_phone class
Expand All @@ -75,7 +75,7 @@ public static function buildQuickForm(&$form, $addressBlockCount = NULL, $blockE
$form->addSelect("phone[$blockId][location_type_id]", array(
'entity' => 'phone',
'class' => 'eight',
'placeholder' => NULL
'placeholder' => NULL,
));

//is_Primary radio
Expand Down
3 changes: 0 additions & 3 deletions CRM/Contact/Form/RelatedContact.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,6 @@ public function buildQuickForm() {

/**
* Form submission of new/edit contact is processed.
*
*
* @return void
*/
public function postProcess() {
// store the submitted values in an array
Expand Down
11 changes: 6 additions & 5 deletions CRM/Contact/Form/Task.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ class CRM_Contact_Form_Task extends CRM_Core_Form {
static protected $_searchFormValues;

/**
* Build all the data structures needed to build the form
*
* @param object $this
* Build all the data structures needed to build the form.
*/
public function preProcess() {
self::preProcessCommon($this);
}

/**
* Common pre-processing function.
*
* @param CRM_Core_Form $form
* @param bool $useTable
*/
Expand Down Expand Up @@ -272,8 +272,9 @@ public static function preProcessCommon(&$form, $useTable = FALSE) {
}

/**
* Get the contact id for custom search
* we are not using prev/next table incase of custom search
* Get the contact id for custom search.
*
* we are not using prev/next table in case of custom search
*/
public function getContactIds() {
// need to perform action on all contacts
Expand Down
8 changes: 3 additions & 5 deletions CRM/Contact/Selector/Custom.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public function getTotalCount($action) {
}

/**
* Returns all the rows in the given offset and rowCount
* Returns all the rows in the given offset and rowCount.
*
* @param string $action
* The action being performed.
Expand Down Expand Up @@ -370,11 +370,9 @@ public function &getRows($action, $offset, $rowCount, $sort, $output = NULL) {
}

/**
* Given the current formValues, gets the query in local
* language
* Given the current formValues, gets the query in local language.
*
* @param array (
* reference) $formValues submitted formValues
* @param array $formValues submitted formValues
*
* @return array
* which contains an array of strings
Expand Down
8 changes: 5 additions & 3 deletions CRM/Core/Controller/Simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class CRM_Core_Controller_Simple extends CRM_Core_Controller {
*
* @return \CRM_Core_Controller_Simple
*/
function __construct(
public function __construct(
$path,
$title,
$mode = NULL,
Expand Down Expand Up @@ -127,8 +127,10 @@ public function getTemplateFileName() {
}

/**
* A wrapper for getTemplateFileName that includes calling the hook to
* prevent us from having to copy & paste the logic of calling the hook
* A wrapper for getTemplateFileName.
*
* This includes calling the hook to prevent us from having to copy & paste
* the logic of calling the hook
*/
public function getHookedTemplateFileName() {
$pageTemplateFile = $this->getTemplateFileName();
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/QuickForm/Action/Upload.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function perform(&$page, $actionName) {
}

/**
* @todo what do I do?
* @todo document what I do.
*
* @param CRM_Core_Form $page
* @param string $actionName
Expand Down
19 changes: 15 additions & 4 deletions CRM/Dedupe/BAO/QueryBuilder/IndividualSupervised.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,18 @@ public static function record($rg) {
$civicrm_email = CRM_Utils_Array::value('civicrm_email', $rg->params, array());

$params = array(
1 => array(CRM_Utils_Array::value('first_name', $civicrm_contact, ''), 'String'),
2 => array(CRM_Utils_Array::value('last_name', $civicrm_contact, ''), 'String'),
3 => array(CRM_Utils_Array::value('email', $civicrm_email, ''), 'String'),
1 => array(
CRM_Utils_Array::value('first_name', $civicrm_contact, ''),
'String',
),
2 => array(
CRM_Utils_Array::value('last_name', $civicrm_contact, ''),
'String',
),
3 => array(
CRM_Utils_Array::value('email', $civicrm_email, ''),
'String',
),
);

return array(
Expand Down Expand Up @@ -56,7 +65,9 @@ public static function internal($rg) {
email1.email=email2.email
WHERE contact1.contact_type = 'Individual'
AND " . self::internalFilters($rg);
return array("civicrm_contact.{$rg->name}.{$rg->threshold}" => $query);
return array(
"civicrm_contact.{$rg->name}.{$rg->threshold}" => $query
);
}
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Event/Form/Task/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class CRM_Event_Form_Task_Email extends CRM_Event_Form_Task {
/**
* Build all the data structures needed to build the form
*/
function preProcess() {
public function preProcess() {
CRM_Contact_Form_Task_EmailCommon::preProcessFromAddress($this);
parent::preProcess();

Expand Down
2 changes: 1 addition & 1 deletion CRM/Pledge/Selector/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class CRM_Pledge_Selector_Search extends CRM_Core_Selector_Base {
*
* @return \CRM_Pledge_Selector_Search
*/
function __construct(
public function __construct(
&$queryParams,
$action = CRM_Core_Action::NONE,
$additionalClause = NULL,
Expand Down
6 changes: 2 additions & 4 deletions CRM/SMS/Form/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ public function preProcess() {
}

/**
* Build the form object
*
* @return void
* Build the form object.
*/
public function buildQuickForm() {
parent::buildQuickForm();
Expand Down Expand Up @@ -123,7 +121,7 @@ public function buildQuickForm() {
}

/**
* Set the default values of various form elements
* Set the default values of various form elements.
*
* @return array
*/
Expand Down

0 comments on commit d868941

Please sign in to comment.