Commit ad314df7 authored by colemanw's avatar colemanw

INFRA-132 - Remove @static annotation

parent 1325c1f6
......@@ -56,7 +56,6 @@ class CRM_ACL_API {
*
* @return boolean
* true if yes, else false
* @static
*/
public static function check($str, $contactID = NULL) {
if ($contactID == NULL) {
......
......@@ -106,7 +106,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
*
* @return string
* The WHERE clause, or 0 on failure
* @static
*/
public static function permissionClause(
&$tables, $operation,
......@@ -330,7 +329,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
* @return string|null
* WHERE-style clause to filter results,
* or null if $table or $id is null
* @static
*/
public static function getClause($table, $id, &$tables) {
$table = CRM_Utils_Type::escape($table, 'String');
......@@ -392,7 +390,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
*
* @return array
* Array of assoc. arrays of ACL rules
* @static
*/
public static function &getACLs($contact_id = NULL, $group_id = NULL, $aclRoles = FALSE) {
$results = array();
......@@ -458,7 +455,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
*
* @return array
* Array of assoc. arrays of ACL rules
* @static
*/
public static function &getACLRoles($contact_id = NULL, $group_id = NULL) {
$contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
......@@ -525,7 +521,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
*
* @return array
* Assoc array of ACL rules
* @static
*/
public static function &getGroupACLs($contact_id, $aclRoles = FALSE) {
$contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
......@@ -570,7 +565,6 @@ SELECT $acl.*
*
* @return array
* Array of assoc. arrays of ACL rules
* @static
*/
public static function &getGroupACLRoles($contact_id) {
$contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
......@@ -643,7 +637,6 @@ SELECT $acl.*
*
* @return array
* Assoc array of ACL rules
* @static
*/
public static function &getAllByContact($contact_id) {
$result = array();
......@@ -687,7 +680,6 @@ SELECT $acl.*
*
* @return Object
* DAO object on sucess, null otherwise
* @static
*/
public static function setIsActive($id, $is_active) {
// note this also resets any ACL cache
......@@ -976,7 +968,6 @@ ORDER BY a.object_id
* @param int $aclId
* ID of the ACL record to be deleted.
*
* @static
*/
public static function del($aclId) {
// delete all entries from the acl cache
......
......@@ -82,7 +82,6 @@ class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole {
*
* @return Object
* DAO object on sucess, null otherwise
* @static
*/
public static function setIsActive($id, $is_active) {
return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_EntityRole', $id, 'is_active', $is_active);
......@@ -94,7 +93,6 @@ class CRM_ACL_BAO_EntityRole extends CRM_ACL_DAO_EntityRole {
* @param int $entityRoleId
* ID of the EntityRole record to be deleted.
*
* @static
*/
public static function del($entityRoleId) {
$entityDAO = new CRM_ACL_DAO_EntityRole();
......
......@@ -48,7 +48,6 @@ class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic {
* The action links that we need to display for the browse screen
*
* @var array
* @static
*/
static $_links = NULL;
......@@ -157,7 +156,6 @@ class CRM_ACL_Page_ACL extends CRM_Core_Page_Basic {
* Browse all acls
*
* @return void
* @static
*/
public function browse() {
// get all acl's sorted by weight
......
......@@ -46,7 +46,6 @@ class CRM_ACL_Page_ACLBasic extends CRM_Core_Page_Basic {
* The action links that we need to display for the browse screen
*
* @var array
* @static
*/
static $_links = NULL;
......@@ -133,7 +132,6 @@ class CRM_ACL_Page_ACLBasic extends CRM_Core_Page_Basic {
* Browse all acls
*
* @return void
* @static
*/
public function browse() {
......
......@@ -48,7 +48,6 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic {
* The action links that we need to display for the browse screen
*
* @var array
* @static
*/
static $_links = NULL;
......@@ -154,7 +153,6 @@ class CRM_ACL_Page_EntityRole extends CRM_Core_Page_Basic {
* Browse all acls
*
* @return void
* @static
*/
public function browse() {
......
......@@ -43,7 +43,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
* Static field for all the activity information that we can potentially export
*
* @var array
* @static
*/
static $_exportableFields = NULL;
......@@ -51,7 +50,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
* Static field for all the activity information that we can potentially import
*
* @var array
* @static
*/
static $_importableFields = NULL;
......@@ -659,7 +657,6 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity {
* @return array
* (reference) $values the relevant data object values of open activities
*
* @static
*/
public static function &getActivities($input) {
//step 1: Get the basic activity data
......@@ -908,7 +905,6 @@ ORDER BY fixed_sort_order
*
* @return array
* Array of component id and name.
* @static
**/
public static function activityComponents() {
$components = array();
......@@ -950,7 +946,6 @@ ORDER BY fixed_sort_order
* @return int
* count of activities
*
* @static
*/
public static function &getActivitiesCount($input) {
$input['count'] = TRUE;
......@@ -988,7 +983,6 @@ LEFT JOIN civicrm_case_activity ON ( civicrm_case_activity.activity_id = tbl.a
* @return int
* count of activities
*
* @static
*/
public static function getActivitySQLClause($input) {
$params = array();
......@@ -1181,7 +1175,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
*
* @return array
* ( sent, activityId) if any email is sent and activityId
* @static
*/
static function sendEmail(
&$contactDetails,
......@@ -1514,7 +1507,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
*
* @return bool|PEAR_Error
* true on success or PEAR_Error object
* @static
*/
static function sendSMSMessage(
$toID,
......@@ -1598,7 +1590,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
*
* @return boolean
* true if successfull else false.
* @static
*/
static function sendMessage(
$from,
......@@ -1671,7 +1662,6 @@ LEFT JOIN civicrm_activity_contact src ON (src.activity_id = ac.activity_id AND
*
* @return array
* array of importable Fields
* @static
*/
public static function &importableFields($status = FALSE) {
if (!self::$_importableFields) {
......@@ -1802,7 +1792,6 @@ WHERE activity.id IN ($activityIds)";
* @param int $targetContactID
*
* @return bool
* @static
*/
static function addActivity(
&$activity,
......@@ -2111,7 +2100,6 @@ AND cl.modified_id = c.id
* @return string|bool
* if file exists returns $activityTypeFile activity filename otherwise false.
*
* @static
*/
public static function getFileForActivityTypeId($activityTypeId, $crmDir = 'Activity') {
$activityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE);
......@@ -2162,7 +2150,6 @@ AND cl.modified_id = c.id
*
* @return array
* array of exportable Fields
* @static
*/
public static function &exportableFields($name = 'Activity') {
if (!isset(self::$_exportableFields[$name])) {
......
......@@ -423,7 +423,6 @@ class CRM_Activity_BAO_Query {
*
* @param CRM_Core_Form $form
* @return void
* @static
*/
public static function buildSearchForm(&$form) {
$activityOptions = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE);
......
......@@ -830,7 +830,6 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields, $files, $self) {
// skip form rule if deleting
......
......@@ -123,7 +123,6 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($fields) {
if (!isset($fields['with_contact']) &&
......
......@@ -153,7 +153,6 @@ class CRM_Activity_Form_Task_PickProfile extends CRM_Activity_Form_Task {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($fields) {
return TRUE;
......
......@@ -275,7 +275,6 @@ class CRM_Activity_Import_Form_MapField extends CRM_Import_Form_MapField {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($fields) {
$errors = array();
......
......@@ -43,7 +43,6 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C
* We use desc to remind us what that column is, name is used in the tpl
*
* @var array
* @static
*/
static $_columnHeaders;
......
......@@ -44,7 +44,6 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
* This defines two actions- View and Edit.
*
* @var array
* @static
*/
static $_links = NULL;
......@@ -52,14 +51,12 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
* We use desc to remind us what that column is, name is used in the tpl
*
* @var array
* @static
*/
static $_columnHeaders;
/**
* Properties of contact we're interested in displaying
* @var array
* @static
*/
static $_properties = array(
......
......@@ -50,7 +50,6 @@ class CRM_Activity_Task {
* The task array
*
* @var array
* @static
*/
static $_tasks = NULL;
......@@ -58,7 +57,6 @@ class CRM_Activity_Task {
* The optional task array
*
* @var array
* @static
*/
static $_optionalTasks = NULL;
......@@ -68,7 +66,6 @@ class CRM_Activity_Task {
*
* @return array
* the set of tasks for a group of contacts
* @static
*/
public static function &tasks() {
if (!(self::$_tasks)) {
......@@ -153,7 +150,6 @@ class CRM_Activity_Task {
*
* @return array
* the set of task titles
* @static
*/
public static function &taskTitles() {
self::tasks();
......@@ -199,7 +195,6 @@ class CRM_Activity_Task {
*
* @return array
* the set of tasks for a group of activity
* @static
*/
public static function getTask($value) {
self::tasks();
......
......@@ -92,7 +92,6 @@ class CRM_Admin_Form_ContactType extends CRM_Admin_Form {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields, $files, $self) {
......
......@@ -159,7 +159,6 @@ class CRM_Admin_Form_Extensions extends CRM_Admin_Form {
*
* @return bool|array
* true if no errors, else an array of errors
* @static
*/
public static function formRule($fields, $files, $self) {
$errors = array();
......
......@@ -109,7 +109,6 @@ class CRM_Admin_Form_MailSettings extends CRM_Admin_Form {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($fields) {
$errors = array();
......
......@@ -43,7 +43,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
* The option group name
*
* @var array
* @static
*/
protected $_gName;
......@@ -51,7 +50,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
* The option group name in display format (capitalized, without underscores...etc)
*
* @var array
* @static
*/
protected $_gLabel;
......@@ -344,7 +342,6 @@ class CRM_Admin_Form_Options extends CRM_Admin_Form {
*
* @return array
* array of errors / empty array.
* @static
*/
public static function formRule($fields, $files, $self) {
$errors = array();
......
......@@ -96,7 +96,6 @@ class CRM_Admin_Form_PreferencesDate extends CRM_Admin_Form {
* @return array
* if errors then list of errors to be posted back to the form,
* true otherwise
* @static
*/
public static function formRule($fields) {
$errors = array();
......
......@@ -270,7 +270,6 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields, $files, $self) {
$errors = array();
......
......@@ -76,7 +76,6 @@ class CRM_Admin_Form_Setting_Component extends CRM_Admin_Form_Setting {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields, $files, $options) {
$errors = array();
......
......@@ -65,7 +65,6 @@ class CRM_Admin_Form_Setting_Mapping extends CRM_Admin_Form_Setting {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields) {
$errors = array();
......
......@@ -128,7 +128,6 @@ class CRM_Admin_Form_Setting_Miscellaneous extends CRM_Admin_Form_Setting {
*
* @return bool|array
* true if no errors, else array of errors
* @static
*/
public static function formRule($fields, $files, $options) {
$errors = array();
......
......@@ -210,7 +210,6 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($fields) {
if ($fields['outBound_option'] == CRM_Mailing_Config::OUTBOUND_OPTION_SMTP) {
......
......@@ -184,7 +184,6 @@ class CRM_Admin_Form_WordReplacements extends CRM_Core_Form {
*
* @return array
* list of errors to be posted back to the form
* @static
*/
public static function formRule($values) {
$errors = array();
......
......@@ -44,7 +44,6 @@ class CRM_Admin_Page_ContactType extends CRM_Core_Page_Basic {
* The action links that we need to display for the browse screen
*
* @var array
* @static
*/
static $_links = NULL;
......
......@@ -42,7 +42,6 @@ class CRM_Admin_Page_EventTemplate extends CRM_Core_Page_Basic {