From: Eileen McNaughton Date: Tue, 13 Jan 2015 00:18:35 +0000 (+1300) Subject: cleanup old tools for sanities sake X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b39bd74f8a740a85ea86b3d8ac4d9e42e477079f;p=civicrm-core.git cleanup old tools for sanities sake --- diff --git a/tools/CRM/Auction/BAO/Auction.php b/tools/CRM/Auction/BAO/Auction.php index c4e69c1a8a..d0a0dcf4a7 100644 --- a/tools/CRM/Auction/BAO/Auction.php +++ b/tools/CRM/Auction/BAO/Auction.php @@ -55,11 +55,8 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * @param array $defaults (reference ) an assoc array to hold the flattened values * * @return CRM_Auction_BAO_Auction object - * @access public - * @static */ - static - function retrieve(&$params, &$defaults) { + static function retrieve(&$params, &$defaults) { $auction = new CRM_Auction_DAO_Auction(); $auction->copyValues($params); if ($auction->find(TRUE)) { @@ -76,10 +73,8 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * @param boolean $is_active value we want to set the is_active field * * @return Object DAO object on sucess, null otherwise - * @static */ - static - function setIsActive($id, $is_active) { + static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Auction_DAO_Auction', $id, 'is_active', $is_active); } @@ -87,16 +82,9 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * add the auction * * @param array $params reference array contains the values submitted by the form - * - * @access public - * @static - * * @return object */ - static - function add(&$params) { - require_once 'CRM/Utils/Hook.php'; - + static function add(&$params) { if (!empty($params['id'])) { CRM_Utils_Hook::pre('edit', 'Auction', $params['id'], $params); } @@ -125,12 +113,8 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * @param array $params reference array contains the values submitted by the form * * @return object - * @access public - * @static - * */ public static function create(&$params) { - require_once 'CRM/Core/Transaction.php'; $transaction = new CRM_Core_Transaction(); $auction = self::add($params); @@ -150,13 +134,8 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * * @param int $id auction id * - * @access public - * @static - * */ - static - function del($id) { - require_once 'CRM/Auction/DAO/Auction.php'; + static function del($id) { $auction = new CRM_Auction_DAO_Auction(); $auction->id = $id; $result = $auction->delete(); @@ -171,10 +150,8 @@ class CRM_Auction_BAO_Auction extends CRM_Auction_DAO_Auction { * @param bool $id * * @return array - * @static */ - static - function getAuctions($all = FALSE, $id = FALSE) { + static function getAuctions($all = FALSE, $id = FALSE) { $query = "SELECT `id`, `title`, `start_date` FROM `civicrm_auction`"; if (!$all) { diff --git a/tools/CRM/Auction/BAO/Item.php b/tools/CRM/Auction/BAO/Item.php index 319a2df64d..26fa5de1d2 100644 --- a/tools/CRM/Auction/BAO/Item.php +++ b/tools/CRM/Auction/BAO/Item.php @@ -55,11 +55,8 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * @param array $defaults (reference ) an assoc array to hold the flattened values * * @return CRM_Auction_BAO_Item object - * @access public - * @static */ - static - function retrieve(&$params, &$defaults) { + static function retrieve(&$params, &$defaults) { $auction = new CRM_Auction_DAO_Item(); $auction->copyValues($params); if ($auction->find(TRUE)) { @@ -76,10 +73,8 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * @param boolean $is_active value we want to set the is_active field * * @return Object DAO object on sucess, null otherwise - * @static */ - static - function setIsActive($id, $is_active) { + static function setIsActive($id, $is_active) { return CRM_Core_DAO::setFieldValue('CRM_Auction_DAO_Item', $id, 'is_active', $is_active); } @@ -87,16 +82,9 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * add the auction * * @param array $params reference array contains the values submitted by the form - * - * @access public - * @static - * * @return object */ - static - function add(&$params) { - require_once 'CRM/Utils/Hook.php'; - + static function add(&$params) { if (!empty($params['id'])) { CRM_Utils_Hook::pre('edit', 'Auction_Item', $params['id'], $params); } @@ -137,12 +125,8 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * @param array $params reference array contains the values submitted by the form * * @return object - * @access public - * @static - * */ public static function create(&$params) { - require_once 'CRM/Core/Transaction.php'; $transaction = new CRM_Core_Transaction(); $auction = self::add($params); @@ -161,14 +145,8 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * delete the auction * * @param int $id auction id - * - * @access public - * @static - * */ - static - function del($id) { - require_once 'CRM/Auction/DAO/Item.php'; + static function del($id) { $auction = new CRM_Auction_DAO_Item(); $auction->id = $id; $result = $auction->delete(); @@ -183,11 +161,8 @@ class CRM_Auction_BAO_Item extends CRM_Auction_DAO_Auction { * @internal param int $id profile id * * @return boolean - * @access public - * @static */ - static - function isEmailInProfile($profileId) { + static function isEmailInProfile($profileId) { $query = " SELECT field_name FROM civicrm_uf_field diff --git a/tools/CRM/Auction/Form/Auction.php b/tools/CRM/Auction/Form/Auction.php index 6aae416921..061bb88e29 100644 --- a/tools/CRM/Auction/Form/Auction.php +++ b/tools/CRM/Auction/Form/Auction.php @@ -34,7 +34,6 @@ * */ -require_once 'CRM/Core/Form.php'; /** * This class manages the auction form @@ -43,7 +42,7 @@ require_once 'CRM/Core/Form.php'; class CRM_Auction_Form_Auction extends CRM_Core_Form { /** - * the id of the auction we are proceessing + * the id of the auction we are processsing * * @var int */ @@ -59,7 +58,6 @@ class CRM_Auction_Form_Auction extends CRM_Core_Form { * set variables up before form is built * * @return void - * @access public */ function preProcess() { $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE); @@ -83,13 +81,9 @@ class CRM_Auction_Form_Auction extends CRM_Core_Form { /** * Set default values for the form. * the default values are retrieved from the database - * - * @access public - * - * @return None + * @return array */ function setDefaultValues() { - require_once 'CRM/Auction/BAO/Auction.php'; $defaults = array(); @@ -107,8 +101,7 @@ class CRM_Auction_Form_Auction extends CRM_Core_Form { /** * Build the form object * - * @return None - * @access public + * @return array */ public function buildQuickForm() { $this->applyFilter('__ALL__', 'trim'); @@ -211,14 +204,9 @@ class CRM_Auction_Form_Auction extends CRM_Core_Form { * @param array $fields the input form values * @param array $files the uploaded files if any * @param $self - * - * * @return true if no errors, else array of errors - * @access public - * @static */ - static - function formRule($fields, $files, $self) { + static function formRule($fields, $files, $self) { $errors = array(); // add rules to validate dates and overlap @@ -227,10 +215,6 @@ class CRM_Auction_Form_Auction extends CRM_Core_Form { /** * Process the form submission - * - * @access public - * - * @return None */ public function postProcess() { if ($this->_action & CRM_Core_Action::VIEW) { diff --git a/tools/CRM/Auction/Form/Item.php b/tools/CRM/Auction/Form/Item.php index 202eeaaf40..50fc0abf4d 100644 --- a/tools/CRM/Auction/Form/Item.php +++ b/tools/CRM/Auction/Form/Item.php @@ -67,7 +67,6 @@ class CRM_Auction_Form_Item extends CRM_Core_Form { * set variables up before form is built * * @return void - * @access public */ function preProcess() { $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'add'); @@ -111,14 +110,9 @@ class CRM_Auction_Form_Item extends CRM_Core_Form { /** * Set default values for the form. * the default values are retrieved from the database - * - * @access public - * - * @return None + * @return array */ function setDefaultValues() { - require_once 'CRM/Auction/BAO/Item.php'; - $defaults = array(); if (isset($this->_id)) { @@ -135,9 +129,6 @@ class CRM_Auction_Form_Item extends CRM_Core_Form { /** * Build the form object - * - * @return None - * @access public */ public function buildQuickForm() { $this->applyFilter('__ALL__', 'trim'); @@ -264,14 +255,9 @@ class CRM_Auction_Form_Item extends CRM_Core_Form { * @param array $fields the input form values * @param array $files the uploaded files if any * @param $self - * - * * @return true if no errors, else array of errors - * @access public - * @static */ - static - function formRule($fields, $files, $self) { + static function formRule($fields, $files, $self) { $errors = array(); if (isset($files['attachFile_1'])) { @@ -286,10 +272,6 @@ class CRM_Auction_Form_Item extends CRM_Core_Form { /** * Process the form submission - * - * @access public - * - * @return None */ public function postProcess() { if ($this->_action & CRM_Core_Action::VIEW) { diff --git a/tools/CRM/Auction/Form/ItemAccount.php b/tools/CRM/Auction/Form/ItemAccount.php index 55635a5e5c..c7d4462622 100644 --- a/tools/CRM/Auction/Form/ItemAccount.php +++ b/tools/CRM/Auction/Form/ItemAccount.php @@ -75,11 +75,7 @@ class CRM_Auction_Form_ItemAccount extends CRM_Core_Form { /** * This virtual function is used to set the default values of * various form elements - * - * access public - * * @return array reference to the array of default values - * */ function setDefaultValues() { if (!$this->_donorID) { @@ -110,9 +106,6 @@ class CRM_Auction_Form_ItemAccount extends CRM_Core_Form { /** * Build the form object - * - * @return None - * @access public */ public function buildQuickForm() { $profileID = CRM_Core_DAO::getFieldValue('CRM_Auction_DAO_Auction', @@ -183,15 +176,10 @@ class CRM_Auction_Form_ItemAccount extends CRM_Core_Form { * @param array $files the uploaded files if any * @param $self * - * - * @return true if no errors, else array of errors - * @access public - * @static + * @return bool|array */ - static - function formRule($fields, $files, $self) { + static function formRule($fields, $files, $self) { $errors = array(); - require_once "CRM/Utils/Rule.php"; foreach ($fields as $key => $value) { if (strpos($key, 'email-') !== FALSE) { $ufContactId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_UFMatch', $value, 'contact_id', 'uf_name'); @@ -205,10 +193,6 @@ class CRM_Auction_Form_ItemAccount extends CRM_Core_Form { /** * Process the form submission - * - * @access public - * - * @return None */ public function postProcess() { $params = $this->controller->exportValues($this->getName()); diff --git a/tools/CRM/Auction/Form/SearchAuction.php b/tools/CRM/Auction/Form/SearchAuction.php index b0f4021db5..70eb0c502e 100644 --- a/tools/CRM/Auction/Form/SearchAuction.php +++ b/tools/CRM/Auction/Form/SearchAuction.php @@ -65,9 +65,6 @@ class CRM_Auction_Form_SearchAuction extends CRM_Core_Form { /** * Build the form object - * - * @access public - * * @return void */ public function buildQuickForm() { diff --git a/tools/CRM/Auction/Form/SearchItem.php b/tools/CRM/Auction/Form/SearchItem.php index eba5409c03..4800e4d086 100644 --- a/tools/CRM/Auction/Form/SearchItem.php +++ b/tools/CRM/Auction/Form/SearchItem.php @@ -44,10 +44,7 @@ class CRM_Auction_Form_SearchItem extends CRM_Core_Form { * This virtual function is used to set the default values of * various form elements * - * access public - * * @return array reference to the array of default values - * */ function setDefaultValues() { $defaults = array(); @@ -58,9 +55,6 @@ class CRM_Auction_Form_SearchItem extends CRM_Core_Form { /** * Build the form object - * - * @access public - * * @return void */ public function buildQuickForm() { @@ -82,6 +76,9 @@ class CRM_Auction_Form_SearchItem extends CRM_Core_Form { )); } + /** + * + */ function postProcess() { $params = $this->controller->exportValues($this->_name); $parent = $this->controller->getParent(); diff --git a/tools/CRM/Auction/Info.php b/tools/CRM/Auction/Info.php index ed317f0f79..4a5612e0e6 100644 --- a/tools/CRM/Auction/Info.php +++ b/tools/CRM/Auction/Info.php @@ -40,18 +40,14 @@ require_once 'CRM/Core/Component/Info.php'; */ class CRM_Auction_Info extends CRM_Core_Component_Info { - // docs inherited from interface protected $keyword = 'auction'; - // docs inherited from interface /** * Provides base information about the component. * Needs to be implemented in component's information * class. * * @return array collection of required component settings - * @access public - * */ public function getInfo() { return array('name' => 'CiviAuction', @@ -76,15 +72,12 @@ class CRM_Auction_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides information about user dashboard element * offered by this component. * - * @return array|null collection of required dashboard settings, + * @return array collection of required dashboard settings, * null if no element offered - * @access public - * */ public function getUserDashboardElement() { return array('name' => ts('Auctions'), @@ -94,15 +87,12 @@ class CRM_Auction_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides information about user dashboard element * offered by this component. * * @return array|null collection of required dashboard settings, * null if no element offered - * @access public - * */ public function registerTab() { return array('title' => ts('Auctions'), @@ -112,15 +102,12 @@ class CRM_Auction_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides information about advanced search pane * offered by this component. * - * @return array|null collection of required pane settings, + * @return array collection of required pane settings, * null if no element offered - * @access public - * */ public function registerAdvancedSearchPane() { return array('title' => ts('Auctions'), @@ -128,7 +115,6 @@ class CRM_Auction_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides potential activity types that this * component might want to register in activity history. @@ -136,15 +122,12 @@ class CRM_Auction_Info extends CRM_Core_Component_Info { * class. * * @return array|null collection of activity types - * @access public - * */ public function getActivityTypes() { $types = array(); return $types; } - // add shortcut to Create New /** * @param $shortCuts */ diff --git a/tools/CRM/Auction/Page/AddItem.php b/tools/CRM/Auction/Page/AddItem.php index 2c19ace71d..51ea348f1a 100644 --- a/tools/CRM/Auction/Page/AddItem.php +++ b/tools/CRM/Auction/Page/AddItem.php @@ -33,8 +33,6 @@ * */ -require_once 'CRM/Core/Page.php'; - /** * Page to decide the flow of adding an item. */ @@ -48,8 +46,6 @@ class CRM_Auction_Page_AddItem extends CRM_Core_Page { * Finally it calls the parent's run method. * * @return void - * @access public - * */ function run() { // get the requested action @@ -91,7 +87,6 @@ class CRM_Auction_Page_AddItem extends CRM_Core_Page { } } - // parent run parent::run(); } } diff --git a/tools/CRM/Auction/Page/DashBoard.php b/tools/CRM/Auction/Page/DashBoard.php index 7a320f8d5f..7fa1da78a8 100644 --- a/tools/CRM/Auction/Page/DashBoard.php +++ b/tools/CRM/Auction/Page/DashBoard.php @@ -45,7 +45,6 @@ class CRM_Auction_Page_DashBoard extends CRM_Core_Page { * it decides the which action has to be taken for the page. * * return null - * @access public */ function run() { parent::run(); diff --git a/tools/CRM/Auction/Page/Item.php b/tools/CRM/Auction/Page/Item.php index eda19ca9f3..d37932376f 100644 --- a/tools/CRM/Auction/Page/Item.php +++ b/tools/CRM/Auction/Page/Item.php @@ -59,8 +59,6 @@ class CRM_Auction_Page_Item extends CRM_Core_Page { * Finally it calls the parent's run method. * * @return void - * @access public - * */ function run() { // get the requested action @@ -118,10 +116,7 @@ class CRM_Auction_Page_Item extends CRM_Core_Page { /** * Browse all auctions * - * * @return void - * @access public - * @static */ function browse() { if ($this->_aid) { diff --git a/tools/CRM/Auction/Page/Manage.php b/tools/CRM/Auction/Page/Manage.php index d5a89c4fda..cadf0cfce0 100644 --- a/tools/CRM/Auction/Page/Manage.php +++ b/tools/CRM/Auction/Page/Manage.php @@ -33,8 +33,6 @@ * */ -require_once 'CRM/Core/Page.php'; - /** * Page for displaying list of auctions */ @@ -44,7 +42,6 @@ class CRM_Auction_Page_Manage extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_actionLinks = NULL; @@ -119,8 +116,6 @@ class CRM_Auction_Page_Manage extends CRM_Core_Page { * Finally it calls the parent's run method. * * @return void - * @access public - * */ function run() { // get the requested action @@ -179,10 +174,7 @@ class CRM_Auction_Page_Manage extends CRM_Core_Page { /** * Browse all auctions * - * * @return void - * @access public - * @static */ function browse() { @@ -251,6 +243,9 @@ ORDER BY start_date desc $this->assign('rows', $auctions); } + /** + * + */ function search() { $form = new CRM_Core_Controller_Simple('CRM_Auction_Form_SearchAuction', ts('Search Items'), CRM_Core_Action::ADD @@ -353,4 +348,3 @@ SELECT count(id) $this->assign('aToZ', $aToZBar); } } - diff --git a/tools/CRM/Auction/Page/ManageItem.php b/tools/CRM/Auction/Page/ManageItem.php index 6da9723ce9..b326292a17 100644 --- a/tools/CRM/Auction/Page/ManageItem.php +++ b/tools/CRM/Auction/Page/ManageItem.php @@ -30,10 +30,8 @@ * @package CRM * @copyright CiviCRM LLC (c) 2004-2014 * $Id$ - * */ -require_once 'CRM/Core/Page.php'; /** * Page for displaying list of auctions @@ -51,7 +49,6 @@ class CRM_Auction_Page_ManageItem extends CRM_Core_Page { * The action links that we need to display for the browse screen * * @var array - * @static */ static $_actionLinks = NULL; @@ -113,8 +110,6 @@ class CRM_Auction_Page_ManageItem extends CRM_Core_Page { * Finally it calls the parent's run method. * * @return void - * @access public - * */ function run() { // get the requested action @@ -175,10 +170,7 @@ class CRM_Auction_Page_ManageItem extends CRM_Core_Page { /** * Browse all auctions * - * * @return void - * @access public - * @static */ function browse() { $this->assign('newItemURL', CRM_Utils_System::url('civicrm/auction/item/add', @@ -274,7 +266,6 @@ class CRM_Auction_Page_ManageItem extends CRM_Core_Page { * all the fields in the event wizard * * @return void - * @access public */ function copy() { $id = CRM_Utils_Request::retrieve('id', 'Positive', $this, TRUE, 0, 'GET'); diff --git a/tools/CRM/Touchstone/Info.php b/tools/CRM/Touchstone/Info.php index cabab603e3..188d446793 100644 --- a/tools/CRM/Touchstone/Info.php +++ b/tools/CRM/Touchstone/Info.php @@ -37,22 +37,17 @@ require_once 'CRM/Core/Component/Info.php'; * @package CRM * @copyright CiviCRM LLC (c) 2004-2014 * $Id$ - * */ class CRM_Touchstone_Info extends CRM_Core_Component_Info { - // docs inherited from interface protected $keyword = 'touchstone'; - // docs inherited from interface /** * Provides base information about the component. * Needs to be implemented in component's information * class. * * @return array collection of required component settings - * @access public - * */ public function getInfo() { return array('name' => 'CiviTouchstone', @@ -62,7 +57,6 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * @return array */ @@ -70,15 +64,12 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { return array('access CiviTouchstone'); } - // docs inherited from interface /** * Provides information about user dashboard element * offered by this component. * * @return array|null collection of required dashboard settings, * null if no element offered - * @access public - * */ public function getUserDashboardElement() { return array('name' => ts('Touchstone'), @@ -88,15 +79,12 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides information about user dashboard element * offered by this component. * * @return array|null collection of required dashboard settings, * null if no element offered - * @access public - * */ public function registerTab() { return array('title' => ts('Touchstone'), @@ -105,15 +93,12 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides information about advanced search pane * offered by this component. * * @return array|null collection of required pane settings, * null if no element offered - * @access public - * */ public function registerAdvancedSearchPane() { return array('title' => ts('Touchstone'), @@ -121,7 +106,6 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { ); } - // docs inherited from interface /** * Provides potential activity types that this * component might want to register in activity history. @@ -129,14 +113,11 @@ class CRM_Touchstone_Info extends CRM_Core_Component_Info { * class. * * @return array|null collection of activity types - * @access public - * */ public function getActivityTypes() { return NULL; } - // add shortcut to Create New /** * @param $shortCuts */ diff --git a/tools/CRM/Touchstone/PseudoConstant.php b/tools/CRM/Touchstone/PseudoConstant.php index 02c590a562..c2286313c3 100644 --- a/tools/CRM/Touchstone/PseudoConstant.php +++ b/tools/CRM/Touchstone/PseudoConstant.php @@ -41,15 +41,12 @@ class CRM_Touchstone_PseudoConstant extends CRM_Core_PseudoConstant { /** * pseudoconstant definition * @var array - * @static */ private static $pseudoConst; /** * Get all values for $pseudoConst pseudoconstant * - * @access public - * * @param null $id * * @return array - array reference of all $pseudoConst values diff --git a/tools/CRM/Touchstone/Task.php b/tools/CRM/Touchstone/Task.php index 1e63e1ca9e..bc69171092 100644 --- a/tools/CRM/Touchstone/Task.php +++ b/tools/CRM/Touchstone/Task.php @@ -45,7 +45,6 @@ class CRM_Touchstone_Task { * the task array * * @var array - * @static */ static $_tasks = NULL; @@ -53,7 +52,6 @@ class CRM_Touchstone_Task { * the optional task array * * @var array - * @static */ static $_optionalTasks = NULL; @@ -62,11 +60,8 @@ class CRM_Touchstone_Task { * on a contact / group of contacts * * @return array the set of tasks for a group of contacts - * @static - * @access public */ - static - function &tasks() { + static function &tasks() { if (!(self::$_tasks)) { self::$_tasks = array( 1 => ts('Perform First Task'), diff --git a/tools/extensions/org.civicrm.payment.googlecheckout/GoogleCheckout.php b/tools/extensions/org.civicrm.payment.googlecheckout/GoogleCheckout.php index fc9b70332b..a274bad6d1 100644 --- a/tools/extensions/org.civicrm.payment.googlecheckout/GoogleCheckout.php +++ b/tools/extensions/org.civicrm.payment.googlecheckout/GoogleCheckout.php @@ -47,7 +47,6 @@ class org_civicrm_payment_googlecheckout extends CRM_Core_Payment { * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -55,7 +54,6 @@ class org_civicrm_payment_googlecheckout extends CRM_Core_Payment { * mode of operation: live or test * * @var object - * @static */ static protected $_mode = NULL; @@ -81,7 +79,6 @@ class org_civicrm_payment_googlecheckout extends CRM_Core_Payment { * * @param object $paymentProcessor * @return object - * @static */ static function &singleton($mode, &$paymentProcessor) { @@ -139,7 +136,6 @@ class org_civicrm_payment_googlecheckout extends CRM_Core_Payment { * @param $component * @throws Exception * @return void - * @access public */ function doTransferCheckout(&$params, $component) { $component = strtolower($component); diff --git a/tools/extensions/org.civicrm.payment.googlecheckout/GoogleIPN.php b/tools/extensions/org.civicrm.payment.googlecheckout/GoogleIPN.php index a2f1ccc80b..42b7ed5719 100644 --- a/tools/extensions/org.civicrm.payment.googlecheckout/GoogleIPN.php +++ b/tools/extensions/org.civicrm.payment.googlecheckout/GoogleIPN.php @@ -48,7 +48,6 @@ class org_civicrm_payment_googlecheckout_GoogleIPN extends CRM_Core_Payment_Base * pattern and cache the instance in this variable * * @var object - * @static */ static private $_singleton = NULL; @@ -56,7 +55,6 @@ class org_civicrm_payment_googlecheckout_GoogleIPN extends CRM_Core_Payment_Base * mode of operation: live or test * * @var object - * @static */ static protected $_mode = NULL; @@ -275,10 +273,8 @@ class org_civicrm_payment_googlecheckout_GoogleIPN extends CRM_Core_Payment_Base * @param $component * @param $paymentProcessor * @return object - * @static */ - static - function &singleton($mode, $component, &$paymentProcessor) { + static function &singleton($mode, $component, &$paymentProcessor) { if (self::$_singleton === NULL) { self::$_singleton = new org_civicrm_payment_googlecheckout_GoogleIPN($mode, $paymentProcessor); } @@ -291,7 +287,6 @@ class org_civicrm_payment_googlecheckout_GoogleIPN extends CRM_Core_Payment_Base * @param int $orderNo send by google * * @return amount - * @access public */ function getAmount($orderNo) { require_once 'CRM/Contribute/DAO/Contribution.php'; @@ -314,12 +309,8 @@ class org_civicrm_payment_googlecheckout_GoogleIPN extends CRM_Core_Payment_Base * @param string $root root of xml-response * * @return array context of this call (test, module, payment processor id) - * @static */ - static - function getContext($xml_response, $privateData, $orderNo, $root) { - require_once 'CRM/Contribute/DAO/Contribution.php'; - + static function getContext($xml_response, $privateData, $orderNo, $root) { $isTest = NULL; $module = NULL; if ($root == 'new-order-notification') {