Merge pull request #4955 from atif-shaikh/master-cleanup

INFRA-132 - Batch #8

CRM/Activity/Import/Form/Summary.php

@@ -105,7 +105,7 @@ public function preProcess() {
       'downloadDuplicateRecordsUrl',
       'downloadMismatchRecordsUrl',
       'groupAdditions',
-      'unMatchCount'
+      'unMatchCount',
     );
     foreach ($properties as $property) {
       $this->assign($property, $this->get($property));

CRM/Admin/Form/RelationshipType.php

@@ -78,12 +78,12 @@ public function buildQuickForm() {
     // add select for contact type
     $contactTypeA = &$this->add('select', 'contact_types_a', ts('Contact Type A') . ' ',
       array(
-        '' => ts('All Contacts')
+        '' => ts('All Contacts'),
       ) + $contactTypes
     );
     $contactTypeB = &$this->add('select', 'contact_types_b', ts('Contact Type B') . ' ',
       array(
-        '' => ts('All Contacts')
+        '' => ts('All Contacts'),
       ) + $contactTypes
     );
 

CRM/Case/Form/EditClient.php

@@ -68,7 +68,7 @@ public function preProcess() {
     }
     elseif (in_array($context, array(
       'dashlet',
-      'dashletFullscreen'
+      'dashletFullscreen',
     ))) {
       $url = CRM_Utils_System::url('civicrm/dashboard', 'reset=1');
     }

CRM/Case/Form/Task/Delete.php

@@ -60,7 +60,7 @@ class CRM_Case_Form_Task_Delete extends CRM_Case_Form_Task {
    *
    * @return void
    */
-  function preProcess() {
+  public function preProcess() {
     //check for delete
     if (!CRM_Core_Permission::checkActionPermission('CiviCase', CRM_Core_Action::DELETE)) {
       CRM_Core_Error::fatal(ts('You do not have permission to access this page.'));

CRM/Contact/BAO/GroupNesting.php

@@ -158,7 +158,7 @@ public function next() {
       $nextGroup = $this->_getNextSiblingGroup($currentGroup);
       if (!$nextGroup) {
         // no sibling, find an ancestor w/ a sibling
-        for (; ;) {
+        for (;;) {
           // since we pop this array everytime, we should be
           // reasonably safe from infinite loops, I think :)
           $ancestor = array_pop($this->_parentStack);
@@ -338,7 +338,7 @@ public static function removeAllParentForChild($childID) {
    * @param $childID
    *   The child id of the association.
    *
-   * @return boolean
+   * @return bool
    *   True if association is found, false otherwise.
    */
   public static function isParentChild($parentID, $childID) {
@@ -358,7 +358,7 @@ public static function isParentChild($parentID, $childID) {
    * @param $groupId
    *   The id of the group to check for child groups.
    *
-   * @return boolean
+   * @return bool
    *   True if 1 or more child groups are found, false otherwise.
    */
   public static function hasChildGroups($groupId) {
@@ -379,7 +379,7 @@ public static function hasChildGroups($groupId) {
    * @param $groupId
    *   The id of the group to check for parent groups.
    *
-   * @return boolean
+   * @return bool
    *   True if 1 or more parent groups are found, false otherwise.
    */
   public static function hasParentGroups($groupId) {
@@ -401,7 +401,7 @@ public static function hasParentGroups($groupId) {
    * @param $checkGroupId
    *   The group id to check if it is a parent of the $groupIds group(s).
    *
-   * @return boolean
+   * @return bool
    *   True if $checkGroupId points to a group that is a parent of one of the $groupIds groups, false otherwise.
    */
   public static function isParentGroup($groupIds, $checkGroupId) {
@@ -433,7 +433,7 @@ public static function isParentGroup($groupIds, $checkGroupId) {
    * @param $checkGroupId
    *   The group id to check if it is a child of the $groupIds group(s).
    *
-   * @return boolean
+   * @return bool
    *   True if $checkGroupId points to a group that is a child of one of the $groupIds groups, false otherwise.
    */
   public static function isChildGroup($groupIds, $checkGroupId) {
@@ -467,7 +467,7 @@ public static function isChildGroup($groupIds, $checkGroupId) {
    * @param $checkGroupId
    *   The group id to check if it is an ancestor of the $groupIds group(s).
    *
-   * @return boolean
+   * @return bool
    *   True if $checkGroupId points to a group that is an ancestor of one of the $groupIds groups, false otherwise.
    */
   public static function isAncestorGroup($groupIds, $checkGroupId) {
@@ -508,7 +508,7 @@ public static function isAncestorGroup($groupIds, $checkGroupId) {
    * @param $checkGroupId
    *   The group id to check if it is a descendent of the $groupIds group(s).
    *
-   * @return boolean
+   * @return bool
    *   True if $checkGroupId points to a group that is a descendent of one of the $groupIds groups, false otherwise.
    */
   public static function isDescendentGroup($groupIds, $checkGroupId) {

CRM/Contact/Form/Task/AddToOrganization.php

@@ -63,7 +63,7 @@ public function buildQuickForm() {
       'relationship_type_id',
       ts('Relationship Type'),
       array(
-        '' => ts('- select -')
+        '' => ts('- select -'),
       ) +
       CRM_Contact_BAO_Relationship::getRelationType("Organization"), TRUE
     );
@@ -88,14 +88,12 @@ public function buildQuickForm() {
       $this->assign('searchRows', $searchRows);
     }
 
-
     $this->assign('searchCount', $searchCount);
     $this->assign('searchDone', $this->get('searchDone'));
     $this->assign('contact_type_display', ts('Organization'));
     $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), array('class' => 'crm-form-submit'));
     $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), array('class' => 'crm-form-submit'));
 
-
     $this->addButtons(array(
         array(
           'type' => 'next',
@@ -166,27 +164,27 @@ public function postProcess() {
             'count' => $valid,
             'plural' => '%count %2 %3 relationships created',
             2 => $relationship,
-            3 => $org
-          ))
+            3 => $org,
+          )),
       );
       if ($duplicate) {
         $status[] = ts('%count was skipped because the contact is already %2 %3', array(
             'count' => $duplicate,
             'plural' => '%count were skipped because the contacts are already %2 %3',
             2 => $relationship,
-            3 => $org
+            3 => $org,
           ));
       }
       if ($invalid) {
         $status[] = ts('%count relationship was not created because the contact is not of the right type for this relationship', array(
             'count' => $invalid,
-            'plural' => '%count relationships were not created because the contact is not of the right type for this relationship'
+            'plural' => '%count relationships were not created because the contact is not of the right type for this relationship',
           ));
       }
       $status = '<ul><li>' . implode('</li><li>', $status) . '</li></ul>';
       CRM_Core_Session::setStatus($status, ts('Relationship created.', array(
             'count' => $valid,
-            'plural' => 'Relationships created.'
+            'plural' => 'Relationships created.',
           )), 'success', array('expires' => 0));
     }
   }

CRM/Contact/Form/Task/PickProfile.php

@@ -77,7 +77,7 @@ public function preProcess() {
     if (count($this->_contactIds) > $this->_maxContacts) {
       CRM_Core_Session::setStatus(ts("The maximum number of contacts you can select for Batch Update is %1. You have selected %2. Please select fewer contacts from your search results and try again.", array(
             1 => $this->_maxContacts,
-            2 => count($this->_contactIds)
+            2 => count($this->_contactIds),
           )), ts('Maximum Exceeded'), 'error');
       $validate = TRUE;
     }

CRM/Contribute/BAO/ManagePremiums.php

@@ -133,7 +133,6 @@ public static function add(&$params, &$ids) {
    *
    * @param int $productID
    */
-
   public static function del($productID) {
     //check dependencies
     $premiumsProduct = new CRM_Contribute_DAO_PremiumsProduct();

CRM/Core/Block.php

@@ -241,7 +241,7 @@ public static function getInfo() {
       if ($value['active']) {
         if (in_array($id, array(
           self::ADD,
-          self::CREATE_NEW
+          self::CREATE_NEW,
         ))) {
           $hasAccess = TRUE;
           if (!CRM_Core_Permission::check('add contacts') &&
@@ -329,7 +329,7 @@ private static function setTemplateValues($id) {
         $urlArray = array(
           'fullTextSearchID' => CRM_Core_DAO::getFieldValue('CRM_Core_DAO_OptionValue',
             'CRM_Contact_Form_Search_Custom_FullText', 'value', 'name'
-          )
+          ),
         );
         self::setProperty(self::FULLTEXT_SEARCH, 'templateValues', $urlArray);
         break;
@@ -369,7 +369,7 @@ private static function setTemplateShortcutValues() {
           'query' => 'action=add&reset=1&context=standalone',
           'ref' => 'new-activity',
           'title' => ts('Activity'),
-        )
+        ),
       ));
 
       $components = CRM_Core_Component::getEnabledComponents();
@@ -392,7 +392,7 @@ private static function setTemplateShortcutValues() {
           'query' => 'atype=3&action=add&reset=1&context=standalone',
           'ref' => 'new-email',
           'title' => ts('Email'),
-        )
+        ),
       ));
 
       if (CRM_Core_Permission::check('edit groups')) {
@@ -402,7 +402,7 @@ private static function setTemplateShortcutValues() {
             'query' => 'reset=1',
             'ref' => 'new-group',
             'title' => ts('Group'),
-          )
+          ),
         ));
       }
 
@@ -413,7 +413,7 @@ private static function setTemplateShortcutValues() {
             'query' => 'reset=1&action=add',
             'ref' => 'new-tag',
             'title' => ts('Tag'),
-          )
+          ),
         ));
       }
 
@@ -481,7 +481,7 @@ private static function setTemplateDashboardValues() {
           'path' => 'civicrm/user',
           'query' => 'reset=1',
           'title' => ts('My Contact Dashboard'),
-        )
+        ),
       );
     }
 
@@ -590,7 +590,7 @@ public static function getContent($id) {
     // return if upgrade mode
     $config = CRM_Core_Config::singleton();
     if ($config->isUpgradeMode()) {
-      return;
+      return NULL;
     }
 
     if (!self::getProperty($id, 'active')) {

CRM/Core/Error.php

@@ -57,7 +57,7 @@ class CRM_Exception extends PEAR_Exception {
    *  - PEAR_Exception(string $message, array $causes);
    *  - PEAR_Exception(string $message, array $causes, int $code);
    *
-   * @param string exception message
+   * @param string $message exception message
    * @param int $code
    * @param Exception $previous
    */
@@ -167,7 +167,7 @@ public static function displaySessionError(&$error, $separator = '<br />') {
    * the errors we expect are from the pear modules DB, DB_DataObject
    * which currently use PEAR::raiseError to notify of error messages.
    *
-   * @param object PEAR_Error
+   * @param object $pearError PEAR_Error
    *
    * @return void
    */
@@ -461,11 +461,11 @@ class_exists('JError')
    * Outputs pre-formatted debug information. Flushes the buffers
    * so we can interrupt a potential POST/redirect
    *
-   * @param string name of debug section
-   * @param mixed reference to variables that we need a trace of
-   * @param bool should we log or return the output
-   * @param bool whether to generate a HTML-escaped output
-   * @param bool should we check permissions before displaying output
+   * @param string $name name of debug section
+   * @param $variable mixed reference to variables that we need a trace of
+   * @param bool $log should we log or return the output
+   * @param bool $html whether to generate a HTML-escaped output
+   * @param bool $checkPermission should we check permissions before displaying output
    *                useful when we die during initialization and permissioning
    *                subsystem is not initialized - CRM-13765
    *
@@ -526,7 +526,7 @@ public static function debug($name, $variable = NULL, $log = TRUE, $html = TRUE,
    * @see CRM_Core_Error::debug()
    * @see CRM_Core_Error::debug_log_message()
    */
-  static function debug_var(
+  public static function debug_var(
     $variable_name,
     $variable,
     $print = TRUE,

CRM/Core/I18n/Schema.php

@@ -121,7 +121,7 @@ public static function makeMultilingual($locale) {
    * @return void
    */
   public static function makeSinglelingual($retain) {
-    $domain = new CRM_Core_DAO_Domain;
+    $domain = new CRM_Core_DAO_Domain();
     $domain->find(TRUE);
     $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
 
@@ -131,7 +131,7 @@ public static function makeSinglelingual($retain) {
     }
 
     // lets drop all triggers first
-    $logging = new CRM_Logging_Schema;
+    $logging = new CRM_Logging_Schema();
     $logging->dropTriggers();
 
     // turn subsequent tables singlelingual
@@ -166,13 +166,13 @@ public static function makeSinglelingual($retain) {
    *
    * @return void
    */
-  static function makeSinglelingualTable(
+  public static function makeSinglelingualTable(
     $retain,
     $table,
     $class = 'CRM_Core_I18n_SchemaStructure',
     $triggers = array()
   ) {
-    $domain = new CRM_Core_DAO_Domain;
+    $domain = new CRM_Core_DAO_Domain();
     $domain->find(TRUE);
     $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
 
@@ -212,7 +212,7 @@ static function makeSinglelingualTable(
     $queries = array_merge($queries, self::createIndexQueries(NULL, $table));
 
     // execute the queries without i18n rewriting
-    $dao = new CRM_Core_DAO;
+    $dao = new CRM_Core_DAO();
     foreach ($queries as $query) {
       $dao->query($query, FALSE);
     }
@@ -318,7 +318,7 @@ public static function rebuildMultilingualSchema($locales, $version = NULL) {
     $indices =& $class::indices();
     $tables =& $class::tables();
     $queries = array();
-    $dao = new CRM_Core_DAO;
+    $dao = new CRM_Core_DAO();
 
     // get all of the already existing indices
     $existing = array();
@@ -562,7 +562,7 @@ public static function triggerInfo(&$info, $tableName = NULL) {
         foreach ($locales as $old) {
           $trigger[] = "ELSEIF NEW.{$column}_{$old} IS NOT NULL THEN";
           foreach (array_merge($locales, array(
-            $locale
+            $locale,
           )) as $loc) {
             if ($loc == $old) {
               continue;
@@ -593,7 +593,7 @@ public static function triggerInfo(&$info, $tableName = NULL) {
         foreach ($locales as $old) {
           $trigger[] = "ELSEIF NEW.{$column}_{$old} IS NOT NULL THEN";
           foreach (array_merge($locales, array(
-            $locale
+            $locale,
           )) as $loc) {
             if ($loc == $old) {
               continue;

CRM/Core/I18n/SchemaStructure_3_1_alpha1.php

@@ -36,7 +36,7 @@ class CRM_Core_I18n_SchemaStructure_3_1_alpha1 {
   /**
    * @return array
    */
-  static function &columns() {
+  public static function &columns() {
     static $result = NULL;
     if (!$result) {
       $result = array(