(NFC) Lint .inc files and ensure that the eval usage in tests/phpunit…

drush/civicrm.drush.inc

@@ -298,7 +298,6 @@ function drush_civicrm_install_validate() {
   return TRUE;
 }
 
-
 /**
  * Implementation of command 'civicrm-install'
  */
@@ -707,7 +706,8 @@ function drush_civicrm_upgrade_db() {
 
     // new since CiviCRM 4.1
     if (is_callable(array(
-      $upgrade, 'setPrint'))) {
+      $upgrade, 'setPrint',
+    ))) {
       $upgrade->setPrint(TRUE);
     }
 
@@ -728,7 +728,6 @@ function drush_civicrm_update_cfg_validate() {
   return _civicrm_init();
 }
 
-
 /**
  * Implementation of command 'civicrm-update-cfg'
  */

modules/civicrm_engage/civicrm_engage.admin.inc

@@ -1,6 +1,5 @@
 <?php
 
-
 function civicrm_engage_admin_settings($form, $form_state) {
   $config = config('civicrm_engage.settings');
   $form['#config'] = 'civicrm_engage.settings';
@@ -130,7 +129,6 @@ function civicrm_engage_admin_load_data($form_state = NULL) {
   return $form;
 }
 
-
 function civicrm_engage_admin_load_data_submit($form, &$form_state) {
   if ($form_state['values']['contact_subtypes'] == 1) {
     civicrm_engage_load_contact_subtypes();

modules/civicrm_member_roles/civicrm_member_roles.drush.inc

@@ -30,6 +30,7 @@ function civicrm_member_roles_drush_command() {
   );
   return $items;
 }
+
 /**
  * (Drush callback)
  *

modules/civicrm_rules/civicrm_rules.contact-eval.inc

@@ -41,7 +41,8 @@
  * @{
  */
 require_once 'civicrm_rules_utils.inc';
-function civicrm_rules_rules_action_contact_send_email($to, $subject, $message, $from = NULL, $settings, RulesState$state, RulesPlugin$element) {
+
+function civicrm_rules_rules_action_contact_send_email($to, $subject, $message, $from = NULL, $settings, RulesState $state, RulesPlugin $element) {
 
   $to = str_replace(array("\r", "\n"), ',', $to);
   $toEmails = explode(',', $to);
@@ -51,7 +52,8 @@ function civicrm_rules_rules_action_contact_send_email($to, $subject, $message,
   foreach ($toEmails as $toEmail) {
     $params            = array();
     $params['from']    = !empty($from) ? str_replace(array(
-      "\r", "\n"), '', $from) : 'Admin';
+      "\r", "\n",
+    ), '', $from) : 'Admin';
     $params['toEmail'] = $toEmail;
     $params['subject'] = $subject;
     $params['text']    = is_array($message) ? implode("\n", $message) : $message;

modules/civicrm_rules/civicrm_rules.event-eval.inc

@@ -34,6 +34,7 @@
  */
 
 require_once 'civicrm_rules_utils.inc';
+
 function civicrm_rules_condition_event_node(&$entityobj, $roleID, $field) {
   //just a hack for our site
   //SELECT * FROM `content_type_og_node` WHERE `field_civicrm_event_value` =993

modules/civicrm_rules/civicrm_rules.mailing-eval.inc

@@ -34,13 +34,14 @@
  */
 
 require_once 'civicrm_rules_utils.inc';
+
 function civicrm_rules_rules_action_mailing_send_email($to,
   $subject,
   $message,
   $from = NULL,
   $settings,
-  RulesState$state,
-  RulesPlugin$element
+  RulesState $state,
+  RulesPlugin $element
 ) {
   if (isset($state->variables['mailing']) && $state->variables['mailing']->id) {
     $to = str_replace(array("\r", "\n"), ',', $to);
@@ -59,7 +60,8 @@ function civicrm_rules_rules_action_mailing_send_email($to,
 
     $params            = array();
     $params['from']    = !empty($from) ? str_replace(array(
-      "\r", "\n"), '', $from) : 'Admin';
+      "\r", "\n",
+    ), '', $from) : 'Admin';
     $params['subject'] = CRM_Utils_Token::replaceMailingTokens($subject, $state->variables['mailing'], NULL, $tokens);
     $params['html']    = CRM_Utils_Token::replaceMailingTokens($message, $state->variables['mailing'], NULL, $tokens);
 

modules/civicrm_rules/civicrm_rules_admin_form.inc

@@ -1,4 +1,5 @@
 <?php
+
 function civicrm_rules_admin_settings($form_state = NULL) {
 
   $form['civicrm_rules_post_entities'] = array(

modules/civicrm_rules/civicrm_rules_condition.inc

@@ -85,7 +85,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
         'type' => 'list<integer>',
         'label' => t('Participant role'),
         'options list' => 'civicrm_rules_get_participant_role_options',
-      ));
+      ),
+    );
   }
 
   if ($type == 'event') {
@@ -94,7 +95,8 @@ function civicrm_rules_condition_parameter($label, $type = 'contact') {
         'type' => 'list<integer>',
         'label' => t('CiviCRM event type'),
         'options list' => 'civicrm_rules_get_event_type_options',
-      ));
+      ),
+    );
   }
 
   return $default;

modules/civicrm_rules/civicrm_rules_utils.inc

@@ -136,7 +136,6 @@ function _civicrm_rules_load_mailing($mailingID) {
   return $mailing;
 }
 
-
 /**
  * function to return labels for checkboxes & stuff
  */

modules/civicrmtheme/plugins/access/civicrmtheme_layout_access.inc

@@ -5,10 +5,11 @@
  */
 
 class CivicrmLayoutAccess extends LayoutAccess {
+
   /**
    * Constructor for a Layout access rule.
    */
-  function __construct($plugin_name, array $data = array()) {
+  public function __construct($plugin_name, array $data = array()) {
     parent::__construct($plugin_name, $data);
     $this->settings += array(
       'civicrm' => array(),
@@ -18,10 +19,10 @@ class CivicrmLayoutAccess extends LayoutAccess {
   /**
    * {@inheritdoc}
    */
-  function summary() {
+  public function summary() {
     $civicrm = array(
       'admin' => t('Admin'),
-      'public' => t('Public')
+      'public' => t('Public'),
     );
     $names = array();
     foreach ($this->settings['civicrm'] as $civi) {
@@ -36,7 +37,7 @@ class CivicrmLayoutAccess extends LayoutAccess {
   /**
    * {@inheritdoc}
    */
-  function checkAccess() {
+  public function checkAccess() {
     if (arg(0) != 'civicrm') {
       return FALSE;
     }
@@ -55,17 +56,19 @@ class CivicrmLayoutAccess extends LayoutAccess {
     $item = CRM_Core_Menu::get($path);
 
     // Check path for public or not and use layout if matches settings
-    switch(CRM_Utils_Array::value('is_public', $item)) {
+    switch (CRM_Utils_Array::value('is_public', $item)) {
       case TRUE:
         if (in_array('public', $this->settings['civicrm'])) {
           return TRUE;
         }
         break;
+
       case FALSE:
         if (in_array('admin', $this->settings['civicrm'])) {
           return TRUE;
         }
         break;
+
       default:
         return FALSE;
     }
@@ -74,11 +77,11 @@ class CivicrmLayoutAccess extends LayoutAccess {
   /**
    * {@inheritdoc}
    */
-  function form(&$form, &$form_state) {
+  public function form(&$form, &$form_state) {
     parent::form($form, $form_state);
     $options = array(
       'admin' => t('Admin'),
-      'public' => t('Public')
+      'public' => t('Public'),
     );
     $form['civicrm'] = array(
       '#title' => t('CiviCRM pages'),
@@ -92,8 +95,9 @@ class CivicrmLayoutAccess extends LayoutAccess {
   /**
    * {@inheritdoc}
    */
-  function formSubmit($form, &$form_state) {
+  public function formSubmit($form, &$form_state) {
     parent::formSubmit($form, $form_state);
     $this->settings['civicrm'] = array_keys(array_filter($form_state['values']['civicrm']));
   }
+
 }

modules/views/civicrm/civicrm_handler_field_activity.inc

@@ -29,7 +29,8 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_activity extends civicrm_handler_field {
-  static $_recordType;
+  public static $_recordType;
+
   public function construct() {
     parent::construct();
     if (!self::$_recordType) {

modules/views/civicrm/civicrm_handler_field_backdropid.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_backdropid extends views_handler_field {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {

modules/views/civicrm/civicrm_handler_field_component.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_component extends views_handler_field {
+
   public function render($values) {
     $value = $this->get_value($values);
     return CRM_Core_Component::getComponentName($value);

modules/views/civicrm/civicrm_handler_field_contact_image.inc

@@ -1,6 +1,7 @@
 <?php
 
 class civicrm_handler_field_contact_image extends views_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['url_only'] = array(

modules/views/civicrm/civicrm_handler_field_country.inc

@@ -32,8 +32,9 @@
  *
  */
 class civicrm_handler_field_country extends civicrm_handler_field_address {
-  static $_countries;
-  static $_countries_full;
+  public static $_countries;
+  public static $_countries_full;
+
   public function construct() {
     parent::construct();
     if (!self::$_countries) {

modules/views/civicrm/civicrm_handler_field_county.inc

@@ -30,7 +30,8 @@
  *
  */
 class civicrm_handler_field_county extends civicrm_handler_field_address {
-  static $_counties;
+  public static $_counties;
+
   public function construct() {
     parent::construct();
     if (!self::$_counties) {

modules/views/civicrm/civicrm_handler_field_custom.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();

modules/views/civicrm/civicrm_handler_field_custom_file.inc

@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_custom_file extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();
@@ -53,7 +54,8 @@ class civicrm_handler_field_custom_file extends views_handler_field {
       );
 
       if ($fileType && in_array($fileType, array(
-        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png"))) {
+        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png",
+      ))) {
         $uri = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
           $value,
           'uri'

modules/views/civicrm/civicrm_handler_field_email.inc

@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_email extends civicrm_handler_field_location {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_user'] = array('default' => 'mailto');

modules/views/civicrm/civicrm_handler_field_encounter_medium.inc

@@ -31,7 +31,8 @@
  *
  */
 class civicrm_handler_field_encounter_medium extends views_handler_field {
-  static $_encounter_medium;
+  public static $_encounter_medium;
+
   public function construct() {
     parent::construct();
     if (!self::$_encounter_medium) {

modules/views/civicrm/civicrm_handler_field_file.inc

@@ -37,6 +37,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_file extends views_handler_field {
+
   public function construct() {
     parent::construct();
     civicrm_initialize();
@@ -56,7 +57,8 @@ class civicrm_handler_field_file extends views_handler_field {
       );
 
       if ($fileType && in_array($fileType, array(
-        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png"))) {
+        "image/jpeg", "image/pjpeg", "image/gif", "image/x-png", "image/png",
+      ))) {
         $uri = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_File',
           $fileId,
           'uri'

modules/views/civicrm/civicrm_handler_field_im.inc

@@ -29,7 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_im extends civicrm_handler_field_location {
-  static $_provider;
+  public static $_provider;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_link.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link extends civicrm_handler_field {
+
   public function construct() {
     parent::construct();
     $this->additional_fields['id'] = 'id';

modules/views/civicrm/civicrm_handler_field_link_edit.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_link_edit extends civicrm_handler_field_link {
+
   /**
    * An example of field level access control.
    */

modules/views/civicrm/civicrm_handler_field_location.inc

@@ -29,9 +29,9 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_location extends civicrm_handler_field {
-  static $_locationTypes;
-  static $_locationOps;
-  static $location_op;
+  public static $_locationTypes;
+  public static $_locationOps;
+  public static $location_op;
 
   public function construct() {
     parent::construct();

modules/views/civicrm/civicrm_handler_field_mail.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_mail extends civicrm_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
     $options['link_to_civicrm'] = array('default' => 'mailto');

modules/views/civicrm/civicrm_handler_field_markup.inc

@@ -5,6 +5,7 @@
  *
  */
 class civicrm_handler_field_markup extends views_handler_field {
+
   public function option_definition() {
     $options = parent::option_definition();
 

modules/views/civicrm/civicrm_handler_field_money.inc

@@ -29,6 +29,7 @@
  * @ingroup civicrm_field_handlers
  */
 class civicrm_handler_field_money extends views_handler_field {
+
   public function construct() {
     parent::construct();
     if (!civicrm_initialize()) {