diff --git a/CRM/Admin/Form/Job.php b/CRM/Admin/Form/Job.php
index ddd4b2bf2572feeaccaa7e8b80343f2389e09c3b..fb400ee24b24b4e7df621f68901534a279acff78 100644
--- a/CRM/Admin/Form/Job.php
+++ b/CRM/Admin/Form/Job.php
@@ -37,7 +37,9 @@
  *
  */
 class CRM_Admin_Form_Job extends CRM_Admin_Form {
-  protected $_id = NULL; function preProcess() {
+  protected $_id = NULL;
+
+  function preProcess() {
 
     parent::preProcess();
 
diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php
index a37243019e91791a161ab0bc9c376984feae4fe4..08b91539209ad806f29526115a8f10428c7d62bc 100644
--- a/CRM/Admin/Form/MessageTemplates.php
+++ b/CRM/Admin/Form/MessageTemplates.php
@@ -40,7 +40,9 @@
  */
 class CRM_Admin_Form_MessageTemplates extends CRM_Admin_Form {
   // which (and whether) mailing workflow this template belongs to
-  protected $_workflow_id = NULL; function preProcess() {
+  protected $_workflow_id = NULL;
+
+  function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Positive', $this);
     $this->_action = CRM_Utils_Request::retrieve('action', 'String',
       $this, FALSE, 'add'
diff --git a/CRM/Admin/Page/MessageTemplates.php b/CRM/Admin/Page/MessageTemplates.php
index e0cd1f7a1abdd12ec6ba02c8ceb4cccb0665ce71..b6ebc1d804117ea91f370a317c0cf2ac6836eeff 100644
--- a/CRM/Admin/Page/MessageTemplates.php
+++ b/CRM/Admin/Page/MessageTemplates.php
@@ -50,7 +50,9 @@ class CRM_Admin_Page_MessageTemplates extends CRM_Core_Page_Basic {
   protected $_revertible = array();
 
   // set to the id that we’re reverting at the given moment (if we are)
-  protected $_revertedId; function __construct($title = NULL, $mode = NULL) {
+  protected $_revertedId;
+
+  function __construct($title = NULL, $mode = NULL) {
     parent::__construct($title, $mode);
 
     // fetch the ids of templates which diverted from defaults and can be reverted –
diff --git a/CRM/Campaign/Form/Petition/Signature.php b/CRM/Campaign/Form/Petition/Signature.php
index 18feedb5352319991306694093858bfdfc8e9edf..7c77d301802e1c2aad3dda043b1d21a5fd721c46 100644
--- a/CRM/Campaign/Form/Petition/Signature.php
+++ b/CRM/Campaign/Form/Petition/Signature.php
@@ -138,7 +138,9 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form {
 
   protected $_image_URL;
 
-  protected $_defaults = NULL; function __construct() {
+  protected $_defaults = NULL;
+
+  function __construct() {
     parent::__construct();
     // this property used by civicrm_fb module and if true, forces thank you email to be sent
     // for users signing in via Facebook connect; also sets Fb email to check against
diff --git a/CRM/Case/Page/Tab.php b/CRM/Case/Page/Tab.php
index 0b39236a4609de3fd319a20eec0d8449e0848338..7c25b3db2d6f6c027a9e84fc72dae0f1c664e205 100644
--- a/CRM/Case/Page/Tab.php
+++ b/CRM/Case/Page/Tab.php
@@ -47,7 +47,9 @@ class CRM_Case_Page_Tab extends CRM_Core_Page {
    */
   static $_links = NULL;
   public $_permission = NULL;
-  public $_contactId = NULL; function preProcess() {
+  public $_contactId = NULL;
+
+  function preProcess() {
     $this->_action = CRM_Utils_Request::retrieve('action', 'String', $this, FALSE, 'browse');
     $this->_contactId = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
 
diff --git a/CRM/Contact/Form/Search/Custom/ActivitySearch.php b/CRM/Contact/Form/Search/Custom/ActivitySearch.php
index cc804c7ec46031aa7068da9167f809751e8e5c06..8c9c50b22bb94f4f71bd325ce787751c4e45aecd 100644
--- a/CRM/Contact/Form/Search/Custom/ActivitySearch.php
+++ b/CRM/Contact/Form/Search/Custom/ActivitySearch.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_ActivitySearch implements CRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     /**
diff --git a/CRM/Contact/Form/Search/Custom/Basic.php b/CRM/Contact/Form/Search/Custom/Basic.php
index ddcf2fb2d6f099ccdb2e542278f65367e0718bcd..44c1af6b4c4529ee227fcb0042e7ec78e04c41db 100644
--- a/CRM/Contact/Form/Search/Custom/Basic.php
+++ b/CRM/Contact/Form/Search/Custom/Basic.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_Basic extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
 
-  protected $_query; function __construct(&$formValues) {
+  protected $_query;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->normalize();
diff --git a/CRM/Contact/Form/Search/Custom/ContribSYBNT.php b/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
index 515698b20ef9104da634999cde9f4a1681a46d6b..563240e13c9d2555eb49399e91c93bcc559968ea 100644
--- a/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
+++ b/CRM/Contact/Form/Search/Custom/ContribSYBNT.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_ContribSYBNT implements CRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     $this->_columns = array(
diff --git a/CRM/Contact/Form/Search/Custom/ContributionAggregate.php b/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
index 7552ca61524d4c2ec8041bf04a947282ed264d7e..b5be40461fb488fb298132b9f60ad3a4f9f6d22a 100644
--- a/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
+++ b/CRM/Contact/Form/Search/Custom/ContributionAggregate.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_ContributionAggregate implements CRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     /**
diff --git a/CRM/Contact/Form/Search/Custom/DateAdded.php b/CRM/Contact/Form/Search/Custom/DateAdded.php
index a181df5346af5101f069a69ea16f19a4570d12e8..bc133cfd061c953ab7b098e8bd2902a93e8f1201 100644
--- a/CRM/Contact/Form/Search/Custom/DateAdded.php
+++ b/CRM/Contact/Form/Search/Custom/DateAdded.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_DateAdded extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
 
-  protected $_debug = 0; function __construct(&$formValues) {
+  protected $_debug = 0;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->_includeGroups = CRM_Utils_Array::value('includeGroups', $formValues, array());
diff --git a/CRM/Contact/Form/Search/Custom/EventAggregate.php b/CRM/Contact/Form/Search/Custom/EventAggregate.php
index e7435082b0c0653e4ef7abeefe8fa2d687f76450..75a3f69582d653dfaba4a833efb12626916275d3 100644
--- a/CRM/Contact/Form/Search/Custom/EventAggregate.php
+++ b/CRM/Contact/Form/Search/Custom/EventAggregate.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_EventAggregate extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     /**
diff --git a/CRM/Contact/Form/Search/Custom/MultipleValues.php b/CRM/Contact/Form/Search/Custom/MultipleValues.php
index fb873f3e05d5c3ba8ef291b61cc2231c5c0204e9..191f5dc4ec15a0acf8126949910b9306ba2777f0 100644
--- a/CRM/Contact/Form/Search/Custom/MultipleValues.php
+++ b/CRM/Contact/Form/Search/Custom/MultipleValues.php
@@ -36,7 +36,9 @@ class CRM_Contact_Form_Search_Custom_MultipleValues extends CRM_Contact_Form_Sea
 
   protected $_groupTree;
   protected $_tables;
-  protected $_options; function __construct(&$formValues) {
+  protected $_options;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->_groupTree = CRM_Core_BAO_CustomGroup::getTree("'Contact', 'Individual', 'Organization', 'Household'",
diff --git a/CRM/Contact/Form/Search/Custom/PriceSet.php b/CRM/Contact/Form/Search/Custom/PriceSet.php
index dc3fe401484b8f587dfe92b98e81330f6f53ddad..894d249abea91b51e10b70fb05311572639389d9 100644
--- a/CRM/Contact/Form/Search/Custom/PriceSet.php
+++ b/CRM/Contact/Form/Search/Custom/PriceSet.php
@@ -36,7 +36,9 @@ class CRM_Contact_Form_Search_Custom_PriceSet extends CRM_Contact_Form_Search_Cu
 
   protected $_eventID = NULL;
 
-  protected $_tableName = NULL; function __construct(&$formValues) {
+  protected $_tableName = NULL;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->_eventID = CRM_Utils_Array::value('event_id',
diff --git a/CRM/Contact/Form/Search/Custom/Proximity.php b/CRM/Contact/Form/Search/Custom/Proximity.php
index 9d17cc8415fcf1ec268d20f5615aad5794e816ca..47330aca382d161f2c85e2403143d8f5dfe4c4d1 100644
--- a/CRM/Contact/Form/Search/Custom/Proximity.php
+++ b/CRM/Contact/Form/Search/Custom/Proximity.php
@@ -36,7 +36,9 @@ class CRM_Contact_Form_Search_Custom_Proximity extends CRM_Contact_Form_Search_C
 
   protected $_latitude = NULL;
   protected $_longitude = NULL;
-  protected $_distance = NULL; function __construct(&$formValues) {
+  protected $_distance = NULL;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     // unset search profile and other search params if set
diff --git a/CRM/Contact/Form/Search/Custom/RandomSegment.php b/CRM/Contact/Form/Search/Custom/RandomSegment.php
index 8f2d015ef01380b334b66d97f33abf4d61ea7550..d645aa235315ce182038e2175e554bd880f99091 100644
--- a/CRM/Contact/Form/Search/Custom/RandomSegment.php
+++ b/CRM/Contact/Form/Search/Custom/RandomSegment.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_RandomSegment extends CRM_Contact_Form_Search_Custom_Base implements CRM_Contact_Form_Search_Interface {
 
-  protected $_debug = 0; function __construct(&$formValues) {
+  protected $_debug = 0;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->_columns = array(
diff --git a/CRM/Contact/Form/Search/Custom/TagContributions.php b/CRM/Contact/Form/Search/Custom/TagContributions.php
index 35aa7691fa5eb3e60d9f58ff89dbae5c2fa56c3a..eeb89e9a8a1000866568b29328be3237596a26bf 100644
--- a/CRM/Contact/Form/Search/Custom/TagContributions.php
+++ b/CRM/Contact/Form/Search/Custom/TagContributions.php
@@ -34,7 +34,9 @@
  */
 class CRM_Contact_Form_Search_Custom_TagContributions implements CRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     /**
diff --git a/CRM/Contact/Form/Task/SMS.php b/CRM/Contact/Form/Task/SMS.php
index 8fc300c2df0073420bd03d4c9822e9822e427c90..883f9eb996ad4d686a15f845a7e6047dfba0e0e3 100644
--- a/CRM/Contact/Form/Task/SMS.php
+++ b/CRM/Contact/Form/Task/SMS.php
@@ -52,7 +52,9 @@ class CRM_Contact_Form_Task_SMS extends CRM_Contact_Form_Task {
    *
    * @var array
    */
-  public $_templates = NULL; function preProcess() {
+  public $_templates = NULL;
+
+  function preProcess() {
 
     $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this);
 
diff --git a/CRM/Contact/Page/View/UserDashBoard.php b/CRM/Contact/Page/View/UserDashBoard.php
index eaa3aaa26df487a05f6ac228b7e0b709198ab85c..f158dc97bfa04c6e4ca28b06cfd73003a46c0e04 100644
--- a/CRM/Contact/Page/View/UserDashBoard.php
+++ b/CRM/Contact/Page/View/UserDashBoard.php
@@ -55,7 +55,9 @@ class CRM_Contact_Page_View_UserDashBoard extends CRM_Core_Page {
    * @var array
    * @static
    */
-  static $_links = NULL; function __construct() {
+  static $_links = NULL;
+
+  function __construct() {
     parent::__construct();
 
     $check = CRM_Core_Permission::check('access Contact Dashboard');
diff --git a/CRM/Contribute/Form.php b/CRM/Contribute/Form.php
index 3e359c836d76f5f2d1140e1f8655482fd950c623..e4aba5da377cf319066dc8d2eacdc202ab810642 100644
--- a/CRM/Contribute/Form.php
+++ b/CRM/Contribute/Form.php
@@ -51,7 +51,9 @@ class CRM_Contribute_Form extends CRM_Core_Form {
    *
    * @var string
    */
-  protected $_BAOName; function preProcess() {
+  protected $_BAOName;
+
+  function preProcess() {
     $this->_id = $this->get('id');
     $this->_BAOName = $this->get('BAOName');
   }
diff --git a/CRM/Contribute/Form/ContributionCharts.php b/CRM/Contribute/Form/ContributionCharts.php
index ce2fdc288aa19f9a3e55223a058ccc6d347e9f0f..50af4a5806bd724f604580013ad23f161574b018 100644
--- a/CRM/Contribute/Form/ContributionCharts.php
+++ b/CRM/Contribute/Form/ContributionCharts.php
@@ -46,7 +46,9 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
    *
    * @var string
    */
-  protected $_chartType = NULL; function preProcess() {
+  protected $_chartType = NULL;
+
+  function preProcess() {
     $this->_year = CRM_Utils_Request::retrieve('year', 'Int', $this);
     $this->_chartType = CRM_Utils_Request::retrieve('type', 'String', $this);
 
diff --git a/CRM/Contribute/Form/ContributionPage/Widget.php b/CRM/Contribute/Form/ContributionPage/Widget.php
index f6b2ba0256bd40b2985fe9ee727afc6b520fbabc..ff5ae0a114d08b99d17bc76235d77226265161ea 100644
--- a/CRM/Contribute/Form/ContributionPage/Widget.php
+++ b/CRM/Contribute/Form/ContributionPage/Widget.php
@@ -35,7 +35,9 @@
 class CRM_Contribute_Form_ContributionPage_Widget extends CRM_Contribute_Form_ContributionPage {
   protected $_colors;
 
-  protected $_widget; function preProcess() {
+  protected $_widget;
+
+  function preProcess() {
     parent::preProcess();
 
     $this->_widget = new CRM_Contribute_DAO_Widget();
diff --git a/CRM/Contribute/Form/UpdateSubscription.php b/CRM/Contribute/Form/UpdateSubscription.php
index a0e51e90d892a4bdb7fcf33d7a84df1d1a5d640a..0b2adcdb4e44e0acc97a1795c352a1e6fb4eb266 100644
--- a/CRM/Contribute/Form/UpdateSubscription.php
+++ b/CRM/Contribute/Form/UpdateSubscription.php
@@ -66,7 +66,9 @@ class CRM_Contribute_Form_UpdateSubscription extends CRM_Core_Form {
    * @var int
    * @public
    */
-  public $_contactID; function preProcess() {
+  public $_contactID;
+
+  function preProcess() {
 
     $this->_crid = CRM_Utils_Request::retrieve('crid', 'Integer', $this, FALSE);
     if ($this->_crid) {
diff --git a/CRM/Contribute/Import/Field.php b/CRM/Contribute/Import/Field.php
index 745ba58dee430bc0f32e09a59d6f8fe2be9b301e..97140ae0bc8f8b6baffe710d6dbed7ef9e74fb88 100644
--- a/CRM/Contribute/Import/Field.php
+++ b/CRM/Contribute/Import/Field.php
@@ -89,7 +89,9 @@ class CRM_Contribute_Import_Field {
    * this is soft credit field
    * @var string
    */
-  public $_softCreditField; function __construct($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//', $softCreditField = NULL) {
+  public $_softCreditField;
+
+  function __construct($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//', $softCreditField = NULL) {
     $this->_name = $name;
     $this->_title = $title;
     $this->_type = $type;
diff --git a/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php b/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
index 67a9810b636191b68c5f138505071f13b238593d..d96b08be7c275c7568bb43b199b567a012704731 100644
--- a/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
+++ b/CRM/Event/Cart/Form/Checkout/ConferenceEvents.php
@@ -3,7 +3,9 @@ class CRM_Event_Cart_Form_Checkout_ConferenceEvents extends CRM_Event_Cart_Form_
   public $conference_event = NULL;
   public $events_by_slot = array();
   public $main_participant = NULL;
-  public $contact_id = NULL; function preProcess() {
+  public $contact_id = NULL;
+
+  function preProcess() {
     parent::preProcess();
     $matches = array();
     preg_match("/.*_(\d+)_(\d+)/", $this->getAttribute('name'), $matches);
diff --git a/CRM/Event/Cart/Form/Checkout/ThankYou.php b/CRM/Event/Cart/Form/Checkout/ThankYou.php
index 98ff59c9de524286d5fa996c2fed8392d2fd61e4..f653d3e3b9ecd4b9f3458fa0bdf22e6cf13f3c5a 100644
--- a/CRM/Event/Cart/Form/Checkout/ThankYou.php
+++ b/CRM/Event/Cart/Form/Checkout/ThankYou.php
@@ -1,7 +1,9 @@
 <?php
 class CRM_Event_Cart_Form_Checkout_ThankYou extends CRM_Event_Cart_Form_Cart {
   public $line_items = NULL;
-  public $sub_total = 0; function buildLineItems() {
+  public $sub_total = 0;
+
+  function buildLineItems() {
     foreach ($this->cart->events_in_carts as $event_in_cart) {
       $event_in_cart->load_location();
     }
diff --git a/CRM/Event/Page/ParticipantListing/Simple.php b/CRM/Event/Page/ParticipantListing/Simple.php
index ab690363f003f5372f3e53a5293c40f4573a2fc6..a12a17ccd913ee89fdcb1f7d7d2dcb4955d2aab5 100644
--- a/CRM/Event/Page/ParticipantListing/Simple.php
+++ b/CRM/Event/Page/ParticipantListing/Simple.php
@@ -40,7 +40,9 @@ class CRM_Event_Page_ParticipantListing_Simple extends CRM_Core_Page {
 
   protected $_eventTitle;
 
-  protected $_pager; function preProcess() {
+  protected $_pager;
+
+  function preProcess() {
     $this->_id = CRM_Utils_Request::retrieve('id', 'Integer', $this, TRUE);
 
     // retrieve Event Title and include it in page title
diff --git a/CRM/Logging/Reverter.php b/CRM/Logging/Reverter.php
index fb8d07c76a905419f71a4b650fb8a754626c2361..bab99d308f047c7e5f1d8919eb476ed1e0241fa6 100644
--- a/CRM/Logging/Reverter.php
+++ b/CRM/Logging/Reverter.php
@@ -35,7 +35,9 @@
 class CRM_Logging_Reverter {
   private $db;
   private $log_conn_id;
-  private $log_date; function __construct($log_conn_id, $log_date) {
+  private $log_date;
+
+  function __construct($log_conn_id, $log_date) {
     $dsn               = defined('CIVICRM_LOGGING_DSN') ? DB::parseDSN(CIVICRM_LOGGING_DSN) : DB::parseDSN(CIVICRM_DSN);
     $this->db          = $dsn['database'];
     $this->log_conn_id = $log_conn_id;
diff --git a/CRM/Member/Import/Field.php b/CRM/Member/Import/Field.php
index 5d23a17062aeb02a5d8aa8a573e5487d108dc170..7d192a7a8f270458ea56de27b7ebf48aad02783b 100644
--- a/CRM/Member/Import/Field.php
+++ b/CRM/Member/Import/Field.php
@@ -83,7 +83,9 @@ class CRM_Member_Import_Field {
    * value of this field
    * @var object
    */
-  public $_value; function __construct($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') {
+  public $_value;
+
+  function __construct($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern = '//', $dataPattern = '//') {
     $this->_name = $name;
     $this->_title = $title;
     $this->_type = $type;
diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
index f94c923edad02130be3fe44c569de7472519ff78..0c44361fc5ecdc6d9cf6fd163360e67909295579 100644
--- a/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@ -37,7 +37,10 @@
 class CRM_Report_Form_Activity extends CRM_Report_Form {
 
   protected $_customGroupExtends = array(
-    'Activity'); function __construct() {
+    'Activity'
+  );
+
+  function __construct() {
     $config = CRM_Core_Config::singleton();
     $campaignEnabled = in_array("CiviCampaign", $config->enableComponents);
     if ($campaignEnabled) {
diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php
index 95ce6d5c9c102f30458b77360a3daea5d3ca51c0..573c62c623a247e12745c3c3e32e4151edbf9934 100644
--- a/CRM/Report/Form/ActivitySummary.php
+++ b/CRM/Report/Form/ActivitySummary.php
@@ -37,7 +37,9 @@
 class CRM_Report_Form_ActivitySummary extends CRM_Report_Form {
 
   protected $_emailField = FALSE;
-  protected $_phoneField = FALSE; function __construct() {
+  protected $_phoneField = FALSE;
+
+  function __construct() {
     $this->_columns = array(
       'civicrm_contact' =>
       array(
diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php
index 172b3f18321de792191e4a7ea4149b3619681541..d09caf5273542f99cf5804ee1d2d47c540f58cb1 100644
--- a/CRM/Report/Form/Campaign/SurveyDetails.php
+++ b/CRM/Report/Form/Campaign/SurveyDetails.php
@@ -47,7 +47,9 @@ class CRM_Report_Form_Campaign_SurveyDetails extends CRM_Report_Form {
   protected $_customGroupExtends = array('Contact', 'Individual', 'Household', 'Organization', 'Activity');
   public $_drilldownReport = array('contact/detail' => 'Link to Detail Report');
 
-  private static $_surveyRespondentStatus; function __construct() {
+  private static $_surveyRespondentStatus;
+
+  function __construct() {
 
     //filter options for survey activity status.
     $responseStatus = array('' => '- Any -');
diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php
index aaa34500e6d0e5626c7bb9bafaf0fa2f5cc0748d..7ef77b3eeced10e669ebe7f5c3deb3bb73f3118f 100644
--- a/CRM/Report/Form/Case/Detail.php
+++ b/CRM/Report/Form/Case/Detail.php
@@ -53,7 +53,9 @@ class CRM_Report_Form_Case_Detail extends CRM_Report_Form {
   protected $_includeCaseDetailExtra = FALSE;
 
   protected $_caseDetailExtra = array(
-    ); function __construct() {
+    );
+
+  function __construct() {
     $this->case_statuses = CRM_Case_PseudoConstant::caseStatus();
     $this->case_types    = CRM_Case_PseudoConstant::caseType();
     $rels                = CRM_Core_PseudoConstant::relationshipType();
diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php
index 8065b499063a8879891ae87a49449e853bb32c2f..46328672380e73b8c45ba5771f2835e61f59c2d9 100644
--- a/CRM/Report/Form/Contribute/Lybunt.php
+++ b/CRM/Report/Form/Contribute/Lybunt.php
@@ -46,7 +46,9 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form {
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
 
   protected $lifeTime_from = NULL;
-  protected $lifeTime_where = NULL; function __construct() {
+  protected $lifeTime_where = NULL;
+
+  function __construct() {
     $yearsInPast   = 10;
     $yearsInFuture = 1;
     $date          = CRM_Core_SelectValues::date('custom', NULL, $yearsInPast, $yearsInFuture);
diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index ff5f5a87f21eefdc65ac9856f03efe92c9d5fd62..716ab384df651fe5bd08695f4c5893458c373461 100644
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -43,7 +43,9 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form {
   );
   public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report');
 
-  protected $_add2groupSupported = FALSE; function __construct() {
+  protected $_add2groupSupported = FALSE;
+
+  function __construct() {
     $yearsInPast   = 10;
     $yearsInFuture = 1;
     $date          = CRM_Core_SelectValues::date('custom', NULL, $yearsInPast, $yearsInFuture);
diff --git a/CRM/Report/Form/Walklist/Walklist.php b/CRM/Report/Form/Walklist/Walklist.php
index 333b3201a01558e569fd440d409c03c1c8c30169..b6e5efc67a6e28a6ed61a9a7f1b6805bc5594c2e 100644
--- a/CRM/Report/Form/Walklist/Walklist.php
+++ b/CRM/Report/Form/Walklist/Walklist.php
@@ -46,7 +46,10 @@ class CRM_Report_Form_Walklist_Walklist extends CRM_Report_Form {
   public $_drilldownReport = array('contact/detail' => 'Link to Detail Report');
 
   protected $_customGroupExtends = array(
-    'Contact', 'Individual', 'Household', 'Organization'); function __construct() {
+    'Contact', 'Individual', 'Household', 'Organization'
+  );
+
+  function __construct() {
     $this->_columns = array(
       'civicrm_contact' =>
       array(
diff --git a/CRM/SMS/Form/Provider.php b/CRM/SMS/Form/Provider.php
index a0fefad3cc83ec9738ac1c03eb17c04b359083b9..787e3477d95b6dbcab5f6af6f008a8aa56c91c39 100644
--- a/CRM/SMS/Form/Provider.php
+++ b/CRM/SMS/Form/Provider.php
@@ -37,7 +37,9 @@
  *
  */
 class CRM_SMS_Form_Provider extends CRM_Core_Form {
-  protected $_id = NULL; function preProcess() {
+  protected $_id = NULL;
+
+  function preProcess() {
 
     $this->_id = $this->get('id');
 
diff --git a/CRM/Tag/Form/Tag.php b/CRM/Tag/Form/Tag.php
index f87edd36774414480f295b48e44137f3b748fab9..f3ee85be02bd8895525ec221fc17decd001dc4cb 100644
--- a/CRM/Tag/Form/Tag.php
+++ b/CRM/Tag/Form/Tag.php
@@ -45,7 +45,9 @@ class CRM_Tag_Form_Tag extends CRM_Core_Form {
    * @var int
    */
   protected $_entityID;
-  protected $_entityTable; function preProcess() {
+  protected $_entityTable;
+
+  function preProcess() {
     if ($this->get('entityID')) {
       $this->_entityID = $this->get('entityID');
     }
diff --git a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
index 52623dfac931e1ce963f032ac3ffb44c85d19c48..b803f8afd84ad4f808fb25e36d98515479ceaaf9 100644
--- a/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
+++ b/tests/phpunit/CRM/Core/Payment/BaseIPNTest.php
@@ -44,7 +44,9 @@ class CRM_Core_Payment_BaseIPNTest extends CiviUnitTestCase {
   protected $input;
   protected $ids;
   protected $objects;
-  public $DBResetRequired = FALSE; function get_info() {
+  public $DBResetRequired = FALSE;
+
+  function get_info() {
     return array(
       'name' => 'BaseIPN test',
       'description' => 'Test BaseIPN methods (via subclass A.net).',
diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php
index cb9ea5183a1b32d36b50422f0f9ac24a90c54958..a46bdade0f47c1d9372d69bc2baa967183c462be 100644
--- a/tests/phpunit/api/v3/ACLPermissionTest.php
+++ b/tests/phpunit/api/v3/ACLPermissionTest.php
@@ -43,7 +43,9 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase {
 
   public $_eNoticeCompliant = TRUE;
 
-  protected $_entity; function setUp() {
+  protected $_entity;
+
+  function setUp() {
     $this->_apiversion = 3;
 
     parent::setUp();
diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php
index 3b2163c4c204cb525b33477586fdb9eb7716738a..fc7b172b6571407598dd0baa6de0d2f3b8caad5c 100644
--- a/tests/phpunit/api/v3/AddressTest.php
+++ b/tests/phpunit/api/v3/AddressTest.php
@@ -41,7 +41,9 @@ class api_v3_AddressTest extends CiviUnitTestCase {
   protected $_locationType;
   protected $_params;
   public $_eNoticeCompliant = TRUE;
-  protected $_entity; function setUp() {
+  protected $_entity;
+
+  function setUp() {
     $this->_apiversion = 3;
     $this->_entity = 'Address';
     parent::setUp();
diff --git a/tests/phpunit/api/v3/CampaignTest.php b/tests/phpunit/api/v3/CampaignTest.php
index 76986e2b349a2e4d76ac7d2a821449540fa46109..d5bdba925eac7f1fe24f8d82035f68f29f2aee1d 100644
--- a/tests/phpunit/api/v3/CampaignTest.php
+++ b/tests/phpunit/api/v3/CampaignTest.php
@@ -8,7 +8,9 @@ class api_v3_CampaignTest extends CiviUnitTestCase {
   protected $params;
   protected $id;
   public $_eNoticeCompliant = TRUE;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     $this->_apiversion = 3;
     $this->params = array(
       'version' => 3,
diff --git a/tests/phpunit/api/v3/ContributionRecurTest.php b/tests/phpunit/api/v3/ContributionRecurTest.php
index 4fd1be4ef0997ea3ef4a6804bc7b6bd434b8ba76..3710cc3f484c98788d8257371e889fb6e7bc2f98 100644
--- a/tests/phpunit/api/v3/ContributionRecurTest.php
+++ b/tests/phpunit/api/v3/ContributionRecurTest.php
@@ -42,7 +42,9 @@ class api_v3_ContributionRecurTest extends CiviUnitTestCase {
   protected $ids = array();
   protected $_entity = 'contribution_recur';
   public $_eNoticeCompliant = TRUE;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     parent::setUp();
     $this->ids['contact'][0] = $this->individualCreate();
     $this->params = array(
diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php
index 7b3a0c52085ced00400320af27f6512617c65f89..3fdcb31d5aa59ba4cb20f758a7db402897bde330 100644
--- a/tests/phpunit/api/v3/EventTest.php
+++ b/tests/phpunit/api/v3/EventTest.php
@@ -32,7 +32,9 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 class api_v3_EventTest extends CiviUnitTestCase {
   protected $_params;
   protected $_apiversion;
-  protected $_entity; function get_info() {
+  protected $_entity;
+
+  function get_info() {
     return array(
       'name' => 'Event Create',
       'description' => 'Test all Event Create API methods.',
diff --git a/tests/phpunit/api/v3/ImTest.php b/tests/phpunit/api/v3/ImTest.php
index 68d0016b7561f3d1abe9d3b04d029ded25f6d431..e27e554b2e8c96ae6c3cf4f5905112bf50a98358 100644
--- a/tests/phpunit/api/v3/ImTest.php
+++ b/tests/phpunit/api/v3/ImTest.php
@@ -41,7 +41,9 @@ class api_v3_ImTest extends CiviUnitTestCase {
   protected $id;
   protected $_entity;
   public $_eNoticeCompliant = TRUE;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     parent::setUp();
 
     $this->_entity     = 'im';
diff --git a/tests/phpunit/api/v3/MailSettingsTest.php b/tests/phpunit/api/v3/MailSettingsTest.php
index de3e722bde652156dcb3648a681c2c5f92edb8a3..436e5416bec58439a0853a91573c0d41ec535d5d 100644
--- a/tests/phpunit/api/v3/MailSettingsTest.php
+++ b/tests/phpunit/api/v3/MailSettingsTest.php
@@ -7,7 +7,9 @@ class api_v3_MailSettingsTest extends CiviUnitTestCase {
   protected $_apiversion;
   protected $params;
   protected $id;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     $this->_apiversion = 3;
     $this->params = array(
       'domain_id' => 1,
diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php
index 050a54747603dc9ce84e23619cf78680b7a23e8f..925fcc8df4f60199467e055d918809193e4aaeca 100644
--- a/tests/phpunit/api/v3/MailingGroupTest.php
+++ b/tests/phpunit/api/v3/MailingGroupTest.php
@@ -35,7 +35,9 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 class api_v3_MailingGroupTest extends CiviUnitTestCase {
   protected $_groupID;
   protected $_email;
-  protected $_apiversion; function get_info() {
+  protected $_apiversion;
+
+  function get_info() {
     return array(
       'name' => 'Mailer Group',
       'description' => 'Test all Mailer Group methods.',
diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php
index 43ab2f51a898e0376fc04806f8095b35274253c5..e36855c7f02132b39c38d381b315779ddd1aea28 100644
--- a/tests/phpunit/api/v3/MailingTest.php
+++ b/tests/phpunit/api/v3/MailingTest.php
@@ -34,7 +34,9 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 class api_v3_MailingTest extends CiviUnitTestCase {
   protected $_groupID;
   protected $_email;
-  protected $_apiversion; function get_info() {
+  protected $_apiversion;
+
+  function get_info() {
     return array(
       'name' => 'Mailer',
       'description' => 'Test all Mailer methods.',
diff --git a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php
index 6a1dd316da3e1c4fef2878ed7a9e9bc90b565946..c6430215f81ad7623c70312ae537332034cf7437 100644
--- a/tests/phpunit/api/v3/ParticipantStatusTypeTest.php
+++ b/tests/phpunit/api/v3/ParticipantStatusTypeTest.php
@@ -9,7 +9,9 @@ class api_v3_ParticipantStatusTypeTest extends CiviUnitTestCase {
   protected $id;
   public $_eNoticeCompliant = TRUE;
 
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     $this->_apiversion = 3;
     $this->params = array(
       'version' => 3,
diff --git a/tests/phpunit/api/v3/PledgePaymentTest.php b/tests/phpunit/api/v3/PledgePaymentTest.php
index 3aaeabad963073d93137f9a60e6e6201b7cb08af..1f2bd4d724324c34e362154f9a501086f5fe26e2 100644
--- a/tests/phpunit/api/v3/PledgePaymentTest.php
+++ b/tests/phpunit/api/v3/PledgePaymentTest.php
@@ -45,7 +45,9 @@ class api_v3_PledgePaymentTest extends CiviUnitTestCase {
   protected $_contributionTypeId;
   protected $_entity = 'PledgePayment';
 
-  public $DBResetRequired = TRUE; function setUp() {
+  public $DBResetRequired = TRUE;
+
+  function setUp() {
     $this->_apiversion = 3;
     parent::setUp();
     $tablesToTruncate = array(
diff --git a/tests/phpunit/api/v3/SurveyTest.php b/tests/phpunit/api/v3/SurveyTest.php
index 06b28b3991f511c9cf59e4b2ca22a527b16b1e28..145480badec9ec6d6bd772321512a60f8c47c058 100644
--- a/tests/phpunit/api/v3/SurveyTest.php
+++ b/tests/phpunit/api/v3/SurveyTest.php
@@ -40,7 +40,9 @@ class api_v3_SurveyTest extends CiviUnitTestCase {
   protected $_apiversion;
   protected $params;
   protected $id;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     $this->_apiversion = 3;
     $phoneBankActivity = civicrm_api('Option_value', 'Get', array('label' => 'PhoneBank', 'version' => $this->_apiversion, 'sequential' => 1));
     $phoneBankActivityTypeID = $phoneBankActivity['values'][0]['value'];
diff --git a/tests/phpunit/api/v3/WebsiteTest.php b/tests/phpunit/api/v3/WebsiteTest.php
index fe2bd434558511de17e40a817c1fa7b082d18509..c2cc0f40465c64852d4f8d4321cd40c68f5d67fc 100644
--- a/tests/phpunit/api/v3/WebsiteTest.php
+++ b/tests/phpunit/api/v3/WebsiteTest.php
@@ -41,7 +41,9 @@ class api_v3_WebsiteTest extends CiviUnitTestCase {
   protected $id;
   protected $_entity;
   public $_eNoticeCompliant = TRUE;
-  public $DBResetRequired = FALSE; function setUp() {
+  public $DBResetRequired = FALSE;
+
+  function setUp() {
     parent::setUp();
 
     $this->_entity     = 'website';
diff --git a/tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php b/tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
index d99350aa75ec68cc913e7b378f5c2c178657f2d8..c7234a5b8aee7d60311d37895aedf31842b199ae 100644
--- a/tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
+++ b/tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
@@ -36,7 +36,9 @@ require_once 'CRM/Report/Form.php';
 require_once 'GiftAid/Utils/Contribution.php';
 class GiftAid_Report_Form_Contribute_GiftAid extends CRM_Report_Form {
   protected $_addressField = FALSE;
-  protected $_customGroupExtends = array('Contribution'); function __construct() {
+  protected $_customGroupExtends = array('Contribution');
+
+  function __construct() {
     $this->_columns = array('civicrm_entity_batch' =>
       array('dao' => 'CRM_Batch_DAO_EntityBatch',
         'filters' =>
diff --git a/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php b/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php
index 41741e49be5a63b867effb953e74f7da7b1d5f62..35bdd14af3d6d918dcd30553dd4eeae0093bb5de 100755
--- a/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php
+++ b/tools/extensions/org.civicrm.report.baykeeper/Baykeeper.php
@@ -45,7 +45,9 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form {
 
   protected $_summary = NULL;
 
-  protected $_customGroupExtends = array('Contact', 'Contribution'); function __construct() {
+  protected $_customGroupExtends = array('Contact', 'Contribution');
+
+  function __construct() {
     $this->_columns = array('civicrm_contact' =>
       array('dao' => 'CRM_Contact_DAO_Contact',
         'fields' =>
@@ -261,7 +263,7 @@ class CRM_Report_Form_Contribute_Baykeeper extends CRM_Report_Form {
       array('dao' => 'CRM_Contact_DAO_GroupContact',
         'alias' => 'cgroup',
         'fields' =>
-        array(,
+        array(
         ),
         'filters' =>
         array('gid' =>
diff --git a/tools/extensions/org.civicrm.report.grant/Grant.php b/tools/extensions/org.civicrm.report.grant/Grant.php
index 408259b584f8c7e9871be653cdb70506e43e772f..44a5fa1e9f15393124b75481350eb9ff784017a4 100644
--- a/tools/extensions/org.civicrm.report.grant/Grant.php
+++ b/tools/extensions/org.civicrm.report.grant/Grant.php
@@ -37,7 +37,9 @@ require_once 'CRM/Report/Form.php';
 require_once 'CRM/Grant/PseudoConstant.php';
 class org_civicrm_report_grant extends CRM_Report_Form {
 
-  protected $_addressField = FALSE; function __construct() {
+  protected $_addressField = FALSE;
+
+  function __construct() {
     $this->_columns = array(
       'civicrm_contact' =>
       array('dao' => 'CRM_Contact_DAO_Contact',
diff --git a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
index 67b3ffd432052a08bcc11f9fb0640c0d35d7d163..abbacddc8b9e01b1a7797f6d00446dd4abd173df 100644
--- a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
+++ b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
@@ -36,7 +36,9 @@
 require_once 'CRM/Contact/Form/Search/Interface.php';
 class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
 
-  protected $_formValues; function __construct(&$formValues) {
+  protected $_formValues;
+
+  function __construct(&$formValues) {
     $this->_formValues = $formValues;
 
     /**
diff --git a/tools/extensions/org.civicrm.search.basic/Basic.php b/tools/extensions/org.civicrm.search.basic/Basic.php
index 4a489a851dc34e3a4534010cce8e5403899f2d49..d186e81991d7d3dc28fc08585a0e9eff46c0bde0 100644
--- a/tools/extensions/org.civicrm.search.basic/Basic.php
+++ b/tools/extensions/org.civicrm.search.basic/Basic.php
@@ -36,7 +36,9 @@
 require_once 'CRM/Contact/Form/Search/Custom/Base.php';
 class org_civicrm_search_basic extends CRM_Contact_Form_Search_Custom_BaseimplementsCRM_Contact_Form_Search_Interface {
 
-  protected $_query; function __construct(&$formValues) {
+  protected $_query;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     $this->normalize();
diff --git a/tools/extensions/org.civicrm.search.multivalue/MultiValue.php b/tools/extensions/org.civicrm.search.multivalue/MultiValue.php
index c87be6ed8ee0246c1b953b37cdb1c4343dca63f1..9f351f048009f82535f146e37ce7da25e283e4c1 100644
--- a/tools/extensions/org.civicrm.search.multivalue/MultiValue.php
+++ b/tools/extensions/org.civicrm.search.multivalue/MultiValue.php
@@ -38,7 +38,9 @@ class org_civicrm_search_multivalue extends CRM_Contact_Form_Search_Custom_Basei
 
   protected $_groupTree;
   protected $_tables;
-  protected $_options; function __construct(&$formValues) {
+  protected $_options;
+
+  function __construct(&$formValues) {
     parent::__construct($formValues);
 
     require_once 'CRM/Core/BAO/CustomGroup.php';