eventespresso / event-espresso-core

core/db_classes/EE_Message_Template_Group.class.php

Spacing +51 added lines, -51 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_Message_Template_Group class
@@ -18,9 +18,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -30,8 +30,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Message_Template_Group
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -40,11 +40,11 @@ 
 	 * @param bool $message_type
 	 * @throws EE_Error
 	 */
-	public function set_message_type( $message_type = FALSE ) {
-		if ( ! $message_type ) {
-			throw new EE_Error( __( 'Missing required value for the message_type parameter', 'event_espresso' ) );
+	public function set_message_type($message_type = FALSE) {
+		if ( ! $message_type) {
+			throw new EE_Error(__('Missing required value for the message_type parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_message_type', $message_type );
+		$this->set('MTP_message_type', $message_type);
 	}
 
 
@@ -53,11 +53,11 @@ 
 	 * @param bool $messenger
 	 * @throws EE_Error
 	 */
-	public function set_messenger( $messenger = FALSE ) {
-		if ( ! $messenger ) {
-			throw new EE_Error( __( 'Missing required value for the messenger parameter', 'event_espresso' ) );
+	public function set_messenger($messenger = FALSE) {
+		if ( ! $messenger) {
+			throw new EE_Error(__('Missing required value for the messenger parameter', 'event_espresso'));
 		}
-		$this->set( 'MTP_messenger', $messenger );
+		$this->set('MTP_messenger', $messenger);
 	}
 
 
@@ -66,11 +66,11 @@ 
 	 * @param bool $GRP_ID
 	 * @throws EE_Error
 	 */
-	public function set_group_template_id( $GRP_ID = FALSE ) {
-		if ( ! $GRP_ID ) {
-			throw new EE_Error( __( 'Missing required value for the message template group id', 'event_espresso' ) );
+	public function set_group_template_id($GRP_ID = FALSE) {
+		if ( ! $GRP_ID) {
+			throw new EE_Error(__('Missing required value for the message template group id', 'event_espresso'));
 		}
-		$this->set( 'GRP_ID', $GRP_ID );
+		$this->set('GRP_ID', $GRP_ID);
 	}
 
 
@@ -81,7 +81,7 @@ 
 	 * @return int
 	 */
 	public function GRP_ID() {
-		return $this->get( 'GRP_ID' );
+		return $this->get('GRP_ID');
 	}
 
 
@@ -92,8 +92,8 @@ 
 	 * @return int
 	 */
 	public function user() {
-		$user_id = $this->get( 'MTP_user_id' );
-		return empty( $user_id ) ? get_current_user_id() : $user_id;
+		$user_id = $this->get('MTP_user_id');
+		return empty($user_id) ? get_current_user_id() : $user_id;
 	}
 
 
@@ -116,7 +116,7 @@ 
 	 * @return int
 	 */
 	public function count_events() {
-		return $this->count_related( 'Event' );
+		return $this->count_related('Event');
 	}
 
 
@@ -126,7 +126,7 @@ 
 	 * @return string
 	 */
 	public function name() {
-		return $this->get( 'MTP_name' );
+		return $this->get('MTP_name');
 	}
 
 
@@ -136,7 +136,7 @@ 
 	 * @return string
 	 */
 	public function description() {
-		return $this->get( 'MTP_description' );
+		return $this->get('MTP_description');
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @param  array $query_params like EEM_Base::get_all()
 	 * @return EE_Message_Template[]
 	 */
-	public function message_templates( $query_params = array() ) {
-		return $this->get_many_related( 'Message_Template', $query_params );
+	public function message_templates($query_params = array()) {
+		return $this->get_many_related('Message_Template', $query_params);
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @return string
 	 */
 	public function messenger() {
-		return $this->get( 'MTP_messenger' );
+		return $this->get('MTP_messenger');
 	}
 
 
@@ -175,10 +175,10 @@ 
 	public function messenger_obj() {
 		$messenger = $this->messenger();
 		try {
-			$messenger = EEH_MSG_Template::messenger_obj( $messenger );
-		} catch( EE_Error $e ) {
+			$messenger = EEH_MSG_Template::messenger_obj($messenger);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for this messenger in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -194,7 +194,7 @@ 
 	 * @return string
 	 */
 	public function message_type() {
-		return $this->get( 'MTP_message_type' );
+		return $this->get('MTP_message_type');
 	}
 
 
@@ -212,10 +212,10 @@ 
 	public function message_type_obj() {
 		$message_type = $this->message_type();
 		try {
-			$message_type = EEH_MSG_Template::message_type_obj( $message_type );
-		} catch(EE_Error $e) {
+			$message_type = EEH_MSG_Template::message_type_obj($message_type);
+		} catch (EE_Error $e) {
 			//if an exception was thrown then let's deactivate this message template group because it means there is no class for the message type in this group.
-			$this->set( 'MTP_is_active', false );
+			$this->set('MTP_is_active', false);
 			$this->save();
 			return null;
 		}
@@ -252,13 +252,13 @@ 
 	 */
 	public function context_templates() {
 		$mtps_arr = array();
-		$mtps = $this->get_many_related( 'Message_Template' );
-		if ( empty( $mtps ) ) {
+		$mtps = $this->get_many_related('Message_Template');
+		if (empty($mtps)) {
 			return array();
 		}
 		//note contexts could have CHECKBOX fields per context. So we return the objects indexed by context AND field.
-		foreach ( $mtps as $mtp ) {
-			$mtps_arr[ $mtp->get( 'MTP_context' ) ][ $mtp->get( 'MTP_template_field' ) ] = $mtp;
+		foreach ($mtps as $mtp) {
+			$mtps_arr[$mtp->get('MTP_context')][$mtp->get('MTP_template_field')] = $mtp;
 		}
 		return $mtps_arr;
 	}
@@ -270,7 +270,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_global() {
-		return $this->get( 'MTP_is_global' );
+		return $this->get('MTP_is_global');
 	}
 
 
@@ -280,7 +280,7 @@ 
 	 * @return boolean true if it is, false if it isn't
 	 */
 	public function is_active() {
-		return $this->get( 'MTP_is_active' );
+		return $this->get('MTP_is_active');
 	}
 
 
@@ -296,10 +296,10 @@ 
 	 * @param bool   $merged  If TRUE then we don't return shortcodes indexed by field but instead an array of the unique shortcodes for all the given (or all) fields.
 	 * @return mixed (array|bool) an array of shortcodes in the format array( '[shortcode] => 'label') OR FALSE if no shortcodes found.
 	 */
-	public function get_shortcodes( $context, $fields = array(), $merged = FALSE ) {
+	public function get_shortcodes($context, $fields = array(), $merged = FALSE) {
 		$messenger = $this->messenger();
 		$message_type = $this->message_type();
-		return EEH_MSG_Template::get_shortcodes( $message_type, $messenger, $fields, $context, $merged );
+		return EEH_MSG_Template::get_shortcodes($message_type, $messenger, $fields, $context, $merged);
 	}
 
 
@@ -340,7 +340,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_name() {
-		return $this->get_extra_meta( 'MTP_template_pack', true, 'default' );
+		return $this->get_extra_meta('MTP_template_pack', true, 'default');
 	}
 
 
@@ -355,8 +355,8 @@ 
 	 */
 	public function get_template_pack() {
 		$pack_name = $this->get_template_pack_name();
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $pack_name );
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($pack_name);
 	}
 
 
@@ -369,7 +369,7 @@ 
 	 * @return string
 	 */
 	public function get_template_pack_variation() {
-		return $this->get_extra_meta( 'MTP_variation', TRUE, 'default' );
+		return $this->get_extra_meta('MTP_variation', TRUE, 'default');
 	}
 
 
@@ -381,8 +381,8 @@ 
 	 * @param string $template_pack_name What message template pack is assigned.
 	 * @return int
 	 */
-	public function set_template_pack_name( $template_pack_name ) {
-		return $this->update_extra_meta( 'MTP_template_pack', $template_pack_name );
+	public function set_template_pack_name($template_pack_name) {
+		return $this->update_extra_meta('MTP_template_pack', $template_pack_name);
 	}
 
 
@@ -394,8 +394,8 @@ 
 	 * @param string $variation What variation is being set on the message template group.
 	 * @return int
 	 */
-	public function set_template_pack_variation( $variation ) {
-		return $this->update_extra_meta( 'MTP_variation', $variation );
+	public function set_template_pack_variation($variation) {
+		return $this->update_extra_meta('MTP_variation', $variation);
 	}
 }
 //end EE_Message_Template_Group class

modules/messages/EED_Messages.module.php

Spacing +182 added lines, -182 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return EED_Module
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,11 +84,11 @@ 
 	 */
 	public static function set_hooks() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 2 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 2);
 		//filters
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 		//register routes
 		self::_register_routes();
 	}
@@ -101,16 +101,16 @@ 
 	 */
 	public static function set_hooks_admin() {
 		//actions
-		add_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', array( 'EED_Messages', 'payment' ), 10, 2 );
-		add_action( 'AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array( 'EED_Messages', 'payment_reminder' ), 10 );
-		add_action( 'AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array( 'EED_Messages', 'maybe_registration' ), 10, 3 );
-		add_action( 'AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array( 'EED_Messages', 'send_newsletter_message' ), 10, 2 );
-		add_action( 'AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array( 'EED_Messages', 'cancelled_registration' ), 10 );
-		add_action( 'AHEE__EE_Admin_Page___process_admin_payment_notification', array( 'EED_Messages', 'process_admin_payment' ), 10, 1 );
+		add_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', array('EED_Messages', 'payment'), 10, 2);
+		add_action('AHEE__Transactions_Admin_Page___send_payment_reminder__process_admin_payment_reminder', array('EED_Messages', 'payment_reminder'), 10);
+		add_action('AHEE__EE_Registration_Processor__trigger_registration_update_notifications', array('EED_Messages', 'maybe_registration'), 10, 3);
+		add_action('AHEE__Extend_Registrations_Admin_Page___newsletter_selected_send__with_registrations', array('EED_Messages', 'send_newsletter_message'), 10, 2);
+		add_action('AHEE__EES_Espresso_Cancelled__process_shortcode__transaction', array('EED_Messages', 'cancelled_registration'), 10);
+		add_action('AHEE__EE_Admin_Page___process_admin_payment_notification', array('EED_Messages', 'process_admin_payment'), 10, 1);
 		//filters
-		add_filter( 'FHEE__EE_Admin_Page___process_resend_registration__success', array( 'EED_Messages', 'process_resend' ), 10, 2 );
-		add_filter( 'FHEE__EE_Registration__receipt_url__receipt_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
-		add_filter( 'FHEE__EE_Registration__invoice_url__invoice_url', array( 'EED_Messages', 'registration_message_trigger_url' ), 10, 4 );
+		add_filter('FHEE__EE_Admin_Page___process_resend_registration__success', array('EED_Messages', 'process_resend'), 10, 2);
+		add_filter('FHEE__EE_Registration__receipt_url__receipt_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
+		add_filter('FHEE__EE_Registration__invoice_url__invoice_url', array('EED_Messages', 'registration_message_trigger_url'), 10, 4);
 	}
 
 
@@ -124,11 +124,11 @@ 
 	 * @return void
 	 */
 	protected static function _register_routes() {
-		EE_Config::register_route( 'msg_url_trigger', 'Messages', 'run' );
-		EE_Config::register_route( 'msg_cron_trigger', 'Messages', 'execute_batch_request' );
-		EE_Config::register_route( 'msg_browser_trigger', 'Messages', 'browser_trigger' );
-		EE_Config::register_route( 'msg_browser_error_trigger', 'Messages', 'browser_error_trigger' );
-		do_action( 'AHEE__EED_Messages___register_routes' );
+		EE_Config::register_route('msg_url_trigger', 'Messages', 'run');
+		EE_Config::register_route('msg_cron_trigger', 'Messages', 'execute_batch_request');
+		EE_Config::register_route('msg_browser_trigger', 'Messages', 'browser_trigger');
+		EE_Config::register_route('msg_browser_error_trigger', 'Messages', 'browser_error_trigger');
+		do_action('AHEE__EED_Messages___register_routes');
 	}
 
 
@@ -139,18 +139,18 @@ 
 	 * @since 4.9.0
 	 * @param WP $WP
 	 */
-	public function browser_trigger( $WP ) {
+	public function browser_trigger($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
-		$token = EE_Registry::instance()->REQ->get( 'token' );
+		$token = EE_Registry::instance()->REQ->get('token');
 		try {
-			$mtg = new EE_Message_Generated_From_Token( $token, 'html', self::$_message_resource_manager );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $mtg );
-		} catch( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$mtg = new EE_Message_Generated_From_Token($token, 'html', self::$_message_resource_manager);
+			self::$_MSG_PROCESSOR->generate_and_send_now($mtg);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -166,20 +166,20 @@ 
 	 * @since 4.9.0
 	 * @param $WP
 	 */
-	public function browser_error_trigger( $WP ) {
-		$token = EE_Registry::instance()->REQ->get( 'token' );
-		if ( $token ) {
-			$message = EEM_Message::instance()->get_one_by_token( $token );
-			if ( $message instanceof EE_Message ) {
-				header( 'HTTP/1.1 200 OK' );
-				$error_msg = nl2br( $message->error_message() );
+	public function browser_error_trigger($WP) {
+		$token = EE_Registry::instance()->REQ->get('token');
+		if ($token) {
+			$message = EEM_Message::instance()->get_one_by_token($token);
+			if ($message instanceof EE_Message) {
+				header('HTTP/1.1 200 OK');
+				$error_msg = nl2br($message->error_message());
 				?>
 				<!DOCTYPE html>
 				<html>
 					<head></head>
 					<body>
-						<?php echo empty( $error_msg )
-						? esc_html__( 'Unfortunately, we were unable to capture the error message for this message.', 'event_espresso' )
+						<?php echo empty($error_msg)
+						? esc_html__('Unfortunately, we were unable to capture the error message for this message.', 'event_espresso')
 						: wp_kses(
 							$error_msg,
 							array(
@@ -214,19 +214,19 @@ 
 	 * @throws EE_Error
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 		//ensure controller is loaded
 		self::_load_controller();
 		// attempt to process message
 		try {
 			/** @type EE_Message_To_Generate_From_Request $message_to_generate */
-			$message_to_generate = EE_Registry::instance()->load_lib( 'Message_To_Generate_From_Request' );
-			self::$_MSG_PROCESSOR->generate_and_send_now( $message_to_generate );
-		} catch ( EE_Error $e ) {
-			$error_msg = __( 'Please note that a system message failed to send due to a technical issue.', 'event_espresso' );
+			$message_to_generate = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
+			self::$_MSG_PROCESSOR->generate_and_send_now($message_to_generate);
+		} catch (EE_Error $e) {
+			$error_msg = __('Please note that a system message failed to send due to a technical issue.', 'event_espresso');
 			// add specific message for developers if WP_DEBUG in on
-			$error_msg .= '||' . $e->getMessage();
-			EE_Error::add_error( $error_msg, __FILE__, __FUNCTION__, __LINE__ );
+			$error_msg .= '||'.$e->getMessage();
+			EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -235,9 +235,9 @@ 
 	 * This is triggered by the 'msg_cron_trigger' route.
 	 * @param WP $WP
 	 */
-	public function execute_batch_request( $WP ) {
+	public function execute_batch_request($WP) {
 		$this->run_cron();
-		header( 'HTTP/1.1 200 OK' );
+		header('HTTP/1.1 200 OK');
 		exit();
 	}
 
@@ -251,35 +251,35 @@ 
 	public function run_cron() {
 		self::_load_controller();
 		//get required vars
-		$cron_type = EE_Registry::instance()->REQ->get( 'type' );
-		$transient_key = EE_Registry::instance()->REQ->get( 'key' );
+		$cron_type = EE_Registry::instance()->REQ->get('type');
+		$transient_key = EE_Registry::instance()->REQ->get('key');
 
 		//now let's verify transient, if not valid exit immediately
-		if ( ! get_transient( $transient_key ) ) {
+		if ( ! get_transient($transient_key)) {
 			/**
 			 * trigger error so this gets in the error logs.  This is important because it happens on a non-user request.
 			 */
-			trigger_error( esc_attr__( 'Invalid Request (Transient does not exist)', 'event_espresso' ) );
+			trigger_error(esc_attr__('Invalid Request (Transient does not exist)', 'event_espresso'));
 		}
 
 		//if made it here, lets' delete the transient to keep the db clean
-		delete_transient( $transient_key );
+		delete_transient($transient_key);
 
-		if ( apply_filters( 'FHEE__EED_Messages__run_cron__use_wp_cron', true ) ) {
+		if (apply_filters('FHEE__EED_Messages__run_cron__use_wp_cron', true)) {
 
-			$method = 'batch_' . $cron_type . '_from_queue';
-			if ( method_exists( self::$_MSG_PROCESSOR, $method ) ) {
+			$method = 'batch_'.$cron_type.'_from_queue';
+			if (method_exists(self::$_MSG_PROCESSOR, $method)) {
 				self::$_MSG_PROCESSOR->$method();
 			} else {
 				//no matching task
 				/**
 				 * trigger error so this gets in the error logs.  This is important because it happens on a non user request.
 				 */
-				trigger_error( esc_attr( sprintf( __( 'There is no task corresponding to this route %s', 'event_espresso' ), $cron_type ) ) );
+				trigger_error(esc_attr(sprintf(__('There is no task corresponding to this route %s', 'event_espresso'), $cron_type)));
 			}
 		}
 
-		do_action( 'FHEE__EED_Messages__run_cron__end' );
+		do_action('FHEE__EED_Messages__run_cron__end');
 	}
 
 
@@ -295,9 +295,9 @@ 
 	 *
 	 * @return EE_Messages_Template_Pack
 	 */
-	public static function get_template_pack( $template_pack_name ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::get_template_pack( $template_pack_name );
+	public static function get_template_pack($template_pack_name) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_template_pack($template_pack_name);
 	}
 
 
@@ -311,14 +311,14 @@ 
 	 * @return EE_Messages_Template_Pack[]
 	 */
 	public static function get_template_packs() {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+		EE_Registry::instance()->load_helper('MSG_Template');
 
 		//for backward compat, let's make sure this returns in the same format as originally.
 		$template_pack_collection = EEH_MSG_Template::get_template_pack_collection();
 		$template_pack_collection->rewind();
 		$template_packs = array();
-		while ( $template_pack_collection->valid() ) {
-			$template_packs[ $template_pack_collection->current()->dbref ] = $template_pack_collection->current();
+		while ($template_pack_collection->valid()) {
+			$template_packs[$template_pack_collection->current()->dbref] = $template_pack_collection->current();
 			$template_pack_collection->next();
 		}
 		return $template_packs;
@@ -334,14 +334,14 @@ 
 	 * @return void
 	 */
 	public static function set_autoloaders() {
-		if ( empty( self::$_MSG_PATHS ) ) {
+		if (empty(self::$_MSG_PATHS)) {
 			self::_set_messages_paths();
-			foreach ( self::$_MSG_PATHS as $path ) {
-				EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $path );
+			foreach (self::$_MSG_PATHS as $path) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($path);
 			}
 			// add aliases
-			EEH_Autoloader::add_alias( 'EE_messages', 'EE_messages' );
-			EEH_Autoloader::add_alias( 'EE_messenger', 'EE_messenger' );
+			EEH_Autoloader::add_alias('EE_messages', 'EE_messages');
+			EEH_Autoloader::add_alias('EE_messenger', 'EE_messenger');
 		}
 	}
 
@@ -369,10 +369,10 @@ 
 			'shortcodes',
 			);
 		$paths = array();
-		foreach ( $dir_ref as $index => $dir ) {
-			$paths[ $index ] = EE_LIBRARIES . $dir;
+		foreach ($dir_ref as $index => $dir) {
+			$paths[$index] = EE_LIBRARIES.$dir;
 		}
-		self::$_MSG_PATHS = apply_filters( 'FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths );
+		self::$_MSG_PATHS = apply_filters('FHEE__EED_Messages___set_messages_paths___MSG_PATHS', $paths);
 	}
 
 
@@ -383,12 +383,12 @@ 
 	 * @return void
 	 */
 	protected static function _load_controller() {
-		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor ) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! self::$_MSG_PROCESSOR instanceof EE_Messages_Processor) {
+			EE_Registry::instance()->load_core('Request_Handler');
 			self::set_autoloaders();
-			self::$_EEMSG = EE_Registry::instance()->load_lib( 'messages' );
-			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib( 'Messages_Processor' );
-			self::$_message_resource_manager = EE_Registry::instance()->load_lib( 'Message_Resource_Manager' );
+			self::$_EEMSG = EE_Registry::instance()->load_lib('messages');
+			self::$_MSG_PROCESSOR = EE_Registry::instance()->load_lib('Messages_Processor');
+			self::$_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
 		}
 	}
 
@@ -397,10 +397,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function payment_reminder( EE_Transaction $transaction ) {
+	public static function payment_reminder(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'payment_reminder', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('payment_reminder', $data);
 	}
 
 
@@ -411,14 +411,14 @@ 
 	 * @param  EE_Payment object
 	 * @return void
 	 */
-	public static function payment( EE_Transaction $transaction, EE_Payment $payment ) {
+	public static function payment(EE_Transaction $transaction, EE_Payment $payment) {
 		self::_load_controller();
-		$data = array( $transaction, $payment );
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		$data = array($transaction, $payment);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 		//if payment amount is less than 0 then switch to payment_refund message type.
 		$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 	}
 
 
@@ -426,10 +426,10 @@ 
 	/**
 	 * @param EE_Transaction $transaction
 	 */
-	public static function cancelled_registration( EE_Transaction $transaction ) {
+	public static function cancelled_registration(EE_Transaction $transaction) {
 		self::_load_controller();
-		$data = array( $transaction, null );
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'cancelled_registration', $data );
+		$data = array($transaction, null);
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('cancelled_registration', $data);
 	}
 
 
@@ -442,9 +442,9 @@ 
 	 * @param array $extra_details
 	 * @return void
 	 */
-	public static function maybe_registration( EE_Registration $registration, $extra_details = array() ) {
+	public static function maybe_registration(EE_Registration $registration, $extra_details = array()) {
 
-		if ( ! self::_verify_registration_notification_send( $registration, $extra_details ) ) {
+		if ( ! self::_verify_registration_notification_send($registration, $extra_details)) {
 			//no messages please
 			return;
 		}
@@ -459,22 +459,22 @@ 
 		$mtgs = array();
 
 		//loop through registrations and trigger messages once per status.
-		foreach ( $all_registrations as $reg ) {
+		foreach ($all_registrations as $reg) {
 
 			//already triggered?
-			if ( in_array( $reg->status_ID(), $statuses_sent ) ) {
+			if (in_array($reg->status_ID(), $statuses_sent)) {
 				continue;
 			}
 
-			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type( $reg->status_ID() );
-			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( $message_type, array( $registration->transaction(), null, $reg->status_ID() ) );
+			$message_type = EEH_MSG_Template::convert_reg_status_to_message_type($reg->status_ID());
+			$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers($message_type, array($registration->transaction(), null, $reg->status_ID()));
 			$statuses_sent[] = $reg->status_ID();
 		}
 
-		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers( 'registration_summary', array( $registration->transaction(), null ) );
+		$mtgs = $mtgs + self::$_MSG_PROCESSOR->setup_mtgs_for_all_active_messengers('registration_summary', array($registration->transaction(), null));
 
 		//batch queue and initiate request
-		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $mtgs );
+		self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($mtgs);
 		self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
 	}
 
@@ -489,39 +489,39 @@ 
 	 *
 	 * @return bool          true = send away, false = nope halt the presses.
 	 */
-	protected static function _verify_registration_notification_send( EE_Registration $registration, $extra_details = array() ) {
+	protected static function _verify_registration_notification_send(EE_Registration $registration, $extra_details = array()) {
 		 //self::log(
 		 //	__CLASS__, __FUNCTION__, __LINE__,
 		 //	$registration->transaction(),
 		 //	array( '$extra_details' => $extra_details )
 		 //);
 		// currently only using this to send messages for the primary registrant
-		if ( ! $registration->is_primary_registrant() ) {
+		if ( ! $registration->is_primary_registrant()) {
 			return false;
 		}
 		// first we check if we're in admin and not doing front ajax
-		if ( is_admin() && ! EE_FRONT_AJAX ) {
+		if (is_admin() && ! EE_FRONT_AJAX) {
 			//make sure appropriate admin params are set for sending messages
-			if ( empty( $_REQUEST['txn_reg_status_change']['send_notifications'] ) || ! absint( $_REQUEST['txn_reg_status_change']['send_notifications'] ) ) {
+			if (empty($_REQUEST['txn_reg_status_change']['send_notifications']) || ! absint($_REQUEST['txn_reg_status_change']['send_notifications'])) {
 				//no messages sent please.
 				return false;
 			}
 		} else {
 			// frontend request (either regular or via AJAX)
 			// TXN is NOT finalized ?
-			if ( ! isset( $extra_details['finalized'] ) || $extra_details['finalized'] === false ) {
+			if ( ! isset($extra_details['finalized']) || $extra_details['finalized'] === false) {
 				return false;
 			}
 			// return visit but nothing changed ???
 			if (
-				isset( $extra_details['revisit'], $extra_details['status_updates'] ) &&
+				isset($extra_details['revisit'], $extra_details['status_updates']) &&
 				$extra_details['revisit'] && ! $extra_details['status_updates']
 			) {
 				return false;
 			}
 			// NOT sending messages && reg status is something other than "Not-Approved"
 			if (
-				! apply_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', false ) &&
+				! apply_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications', false) &&
 				$registration->status_ID() !== EEM_Registration::status_id_not_approved
 			) {
 				return false;
@@ -543,10 +543,10 @@ 
 	 *
 	 * @return array
 	 */
-	protected static function _get_reg_status_array( $reg_status = '' ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
-			? EEH_MSG_Template::convert_reg_status_to_message_type( $reg_status )
+	protected static function _get_reg_status_array($reg_status = '') {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
+			? EEH_MSG_Template::convert_reg_status_to_message_type($reg_status)
 			: EEH_MSG_Template::reg_status_to_message_type_array();
 	}
 
@@ -562,10 +562,10 @@ 
 	 *
 	 * @return string|bool The payment message type slug matching the status or false if no match.
 	 */
-	protected static function _get_payment_message_type( $payment_status ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
-		return EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
-			? EEH_MSG_Template::convert_payment_status_to_message_type( $payment_status )
+	protected static function _get_payment_message_type($payment_status) {
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
+			? EEH_MSG_Template::convert_payment_status_to_message_type($payment_status)
 			: false;
 	}
 
@@ -579,33 +579,33 @@ 
 	 * @param array $req_data This is the $_POST & $_GET data sent from EE_Admin Pages
 	 * @return bool          success/fail
 	 */
-	public static function process_resend( $req_data ) {
+	public static function process_resend($req_data) {
 		self::_load_controller();
 
 		//if $msgID in this request then skip to the new resend_message
-		if ( EE_Registry::instance()->REQ->get( 'MSG_ID' ) ) {
+		if (EE_Registry::instance()->REQ->get('MSG_ID')) {
 			return self::resend_message();
 		}
 
 		//make sure any incoming request data is set on the REQ so that it gets picked up later.
 		$req_data = (array) $req_data;
-		foreach( $req_data as $request_key => $request_value ) {
-			EE_Registry::instance()->REQ->set( $request_key, $request_value );
+		foreach ($req_data as $request_key => $request_value) {
+			EE_Registry::instance()->REQ->set($request_key, $request_value);
 		}
 
-		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request() ) {
+		if ( ! $messages_to_send = self::$_MSG_PROCESSOR->setup_messages_to_generate_from_registration_ids_in_request()) {
 			return false;
 		}
 
 		try {
-			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist( $messages_to_send );
+			self::$_MSG_PROCESSOR->batch_queue_for_generation_and_persist($messages_to_send);
 			self::$_MSG_PROCESSOR->get_queue()->initiate_request_by_priority();
-		} catch( EE_Error $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+		} catch (EE_Error $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		EE_Error::add_success(
-			__( 'Messages have been successfully queued for generation and sending.', 'event_espresso' )
+			__('Messages have been successfully queued for generation and sending.', 'event_espresso')
 		);
 		return true; //everything got queued.
 	}
@@ -618,17 +618,17 @@ 
 	public static function resend_message() {
 		self::_load_controller();
 
-		$msgID = EE_Registry::instance()->REQ->get( 'MSG_ID' );
-		if ( ! $msgID ) {
-			EE_Error::add_error( __( 'Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		$msgID = EE_Registry::instance()->REQ->get('MSG_ID');
+		if ( ! $msgID) {
+			EE_Error::add_error(__('Something went wrong because there is no "MSG_ID" value in the request', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( (array) $msgID );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send((array) $msgID);
 
 		//setup success message.
-		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		EE_Error::add_success( sprintf(
+		$count_ready_for_resend = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		EE_Error::add_success(sprintf(
 			_n(
 				'There was %d message queued for resending.',
 				'There were %d messages queued for resending.',
@@ -636,7 +636,7 @@ 
 				'event_espresso'
 			),
 			$count_ready_for_resend
-		) );
+		));
 		return true;
 	}
 
@@ -649,13 +649,13 @@ 
 	 * @param  EE_Payment $payment EE_payment object
 	 * @return bool              success/fail
 	 */
-	public static function process_admin_payment( EE_Payment $payment ) {
-		EE_Registry::instance()->load_helper( 'MSG_Template' );
+	public static function process_admin_payment(EE_Payment $payment) {
+		EE_Registry::instance()->load_helper('MSG_Template');
 		//we need to get the transaction object
 		$transaction = $payment->transaction();
-		if ( $transaction instanceof EE_Transaction ) {
-			$data = array( $transaction, $payment );
-			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type( $payment->STS_ID() );
+		if ($transaction instanceof EE_Transaction) {
+			$data = array($transaction, $payment);
+			$message_type = EEH_MSG_Template::convert_payment_status_to_message_type($payment->STS_ID());
 
 			//if payment amount is less than 0 then switch to payment_refund message type.
 			$message_type = $payment->amount() < 0 ? 'payment_refund' : $message_type;
@@ -665,22 +665,22 @@ 
 
 			self::_load_controller();
 
-			self::$_MSG_PROCESSOR->generate_for_all_active_messengers( $message_type, $data );
+			self::$_MSG_PROCESSOR->generate_for_all_active_messengers($message_type, $data);
 
 			//get count of queued for generation
-			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( array( EEM_Message::status_incomplete, EEM_Message::status_idle ) );
+			$count_to_generate = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(array(EEM_Message::status_incomplete, EEM_Message::status_idle));
 
-			if ( $count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0 ) {
-				add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+			if ($count_to_generate > 0 && self::$_MSG_PROCESSOR->get_queue()->get_message_repository()->count() !== 0) {
+				add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 				return true;
 			} else {
-				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::instance()->stati_indicating_failed_sending() );
+				$count_failed = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::instance()->stati_indicating_failed_sending());
 				/**
 				 * Verify that there are actually errors.  If not then we return a success message because the queue might have been emptied due to successful
 				 * IMMEDIATE generation.
 				 */
-				if ( $count_failed > 0 ) {
-					EE_Error::add_error( sprintf(
+				if ($count_failed > 0) {
+					EE_Error::add_error(sprintf(
 						_n(
 							'The payment notification generation failed.',
 							'%d payment notifications failed being sent.',
@@ -688,11 +688,11 @@ 
 							'event_espresso'
 						),
 						$count_failed
-					), __FILE__, __FUNCTION__, __LINE__ );
+					), __FILE__, __FUNCTION__, __LINE__);
 
 					return false;
 				} else {
-					add_filter( 'FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true' );
+					add_filter('FHEE__EE_Admin_Page___process_admin_payment_notification__success', '__return_true');
 					return true;
 				}
 			}
@@ -716,11 +716,11 @@ 
 	 * @param  int      	      $grp_id     a specific message template group id.
 	 * @return void
 	 */
-	public static function send_newsletter_message( $registrations, $grp_id ) {
+	public static function send_newsletter_message($registrations, $grp_id) {
 		//make sure mtp is id and set it in the EE_Request Handler later messages setup.
-		EE_Registry::instance()->REQ->set( 'GRP_ID', (int) $grp_id );
+		EE_Registry::instance()->REQ->set('GRP_ID', (int) $grp_id);
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->generate_for_all_active_messengers( 'newsletter', $registrations );
+		self::$_MSG_PROCESSOR->generate_for_all_active_messengers('newsletter', $registrations);
 	}
 
 
@@ -735,9 +735,9 @@ 
 	 * @param string 	$message_type
 	 * @return 	string
 	 */
-	public static function registration_message_trigger_url( $registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice' ) {
+	public static function registration_message_trigger_url($registration_message_trigger_url, EE_Registration $registration, $messenger = 'html', $message_type = 'invoice') {
 		// whitelist $messenger
-		switch ( $messenger ) {
+		switch ($messenger) {
 			case 'pdf' :
 				$sending_messenger = 'pdf';
 				$generating_messenger = 'html';
@@ -749,7 +749,7 @@ 
 				break;
 		}
 		// whitelist $message_type
-		switch ( $message_type ) {
+		switch ($message_type) {
 			case 'receipt' :
 				$message_type = 'receipt';
 				break;
@@ -759,7 +759,7 @@ 
 				break;
 		}
 		// verify that both the messenger AND the message type are active
-		if ( EEH_MSG_Template::is_messenger_active( $sending_messenger ) && EEH_MSG_Template::is_mt_active( $message_type ) ) {
+		if (EEH_MSG_Template::is_messenger_active($sending_messenger) && EEH_MSG_Template::is_mt_active($message_type)) {
 			//need to get the correct message template group for this (i.e. is there a custom invoice for the event this registration is registered for?)
 			$template_query_params = array(
 				'MTP_is_active' => true,
@@ -768,16 +768,16 @@ 
 				'Event.EVT_ID' => $registration->event_ID()
 			);
 			//get the message template group.
-			$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+			$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				// remove EVT_ID from query params so that global templates get picked up
-				unset( $template_query_params['Event.EVT_ID'] );
+				unset($template_query_params['Event.EVT_ID']);
 				//get global template as the fallback
-				$msg_template_group = EEM_Message_Template_Group::instance()->get_one( array( $template_query_params ) );
+				$msg_template_group = EEM_Message_Template_Group::instance()->get_one(array($template_query_params));
 			}
 			//if we don't have an EE_Message_Template_Group then return
-			if ( ! $msg_template_group instanceof EE_Message_Template_Group ) {
+			if ( ! $msg_template_group instanceof EE_Message_Template_Group) {
 				return '';
 			}
 			// generate the URL
@@ -806,7 +806,7 @@ 
 	 * @param bool 	  $send true we will do a test send using the messenger delivery, false we just do a regular preview
 	 * @return string|bool          The body of the message or if send is requested, sends.
 	 */
-	public static function preview_message( $type, $context, $messenger, $send = false ) {
+	public static function preview_message($type, $context, $messenger, $send = false) {
 		self::_load_controller();
 		$mtg = new EE_Message_To_Generate(
 			$messenger,
@@ -815,8 +815,8 @@ 
 			$context,
 			true
 		);
-		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview( $mtg, $send );
-		if ( $generated_preview_queue instanceof EE_Messages_Queue ) {
+		$generated_preview_queue = self::$_MSG_PROCESSOR->generate_for_preview($mtg, $send);
+		if ($generated_preview_queue instanceof EE_Messages_Queue) {
 			return $generated_preview_queue->get_message_repository()->current()->content();
 		} else {
 			return $generated_preview_queue;
@@ -843,7 +843,7 @@ 
 	 *
 	 * @return bool          success or fail.
 	 */
-	public static function send_message_with_messenger_only( $messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '' ) {
+	public static function send_message_with_messenger_only($messenger, $message_type, EE_Messages_Queue $queue, $custom_subject = '') {
 		self::_load_controller();
 		/** @type EE_Message_To_Generate_From_Queue $message_to_generate */
 		$message_to_generate = EE_Registry::instance()->load_lib(
@@ -855,7 +855,7 @@ 
 				$custom_subject,
 			)
 		);
-		return self::$_MSG_PROCESSOR->queue_for_sending( $message_to_generate );
+		return self::$_MSG_PROCESSOR->queue_for_sending($message_to_generate);
 	}
 
 
@@ -868,22 +868,22 @@ 
 	 * @param array     $message_ids An array of message ids
 	 * @return bool | EE_Messages_Queue     false if nothing was generated, EE_Messages_Queue containing generated messages.
 	 */
-	public static function generate_now( $message_ids ) {
+	public static function generate_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
+					'MSG_ID' => array('IN', $message_ids),
 					'STS_ID' => EEM_Message::status_incomplete,
 				)
 			)
 		);
 
-		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue( $messages );
+		$generated_queue = self::$_MSG_PROCESSOR->batch_generate_from_queue($messages);
 
-		if ( ! $generated_queue instanceof EE_Messages_Queue ) {
+		if ( ! $generated_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not generated.  This is usually because there is already a batch being generated on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -902,28 +902,28 @@ 
 	 *
 	 * @return bool | EE_Messages_Queue  false if no messages sent.
 	 */
-	public static function send_now( $message_ids ) {
+	public static function send_now($message_ids) {
 		self::_load_controller();
 		$messages = EEM_Message::instance()->get_all(
 			array(
 				0 => array(
-					'MSG_ID' => array( 'IN', $message_ids ),
-					'STS_ID' => array( 'IN', array( EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry ) )
+					'MSG_ID' => array('IN', $message_ids),
+					'STS_ID' => array('IN', array(EEM_Message::status_idle, EEM_Message::status_resend, EEM_Message::status_retry))
 				)
 			)
 		);
 
-		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue( $messages );
+		$sent_queue = self::$_MSG_PROCESSOR->batch_send_from_queue($messages);
 
-		if ( ! $sent_queue instanceof EE_Messages_Queue ) {
+		if ( ! $sent_queue instanceof EE_Messages_Queue) {
 			EE_Error::add_error(
-				__( 'The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso' ),
+				__('The messages were not sent.  This is usually because there is already a batch being sent on a separate request.  You can wait a minute or two and try again.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		} else {
 			//can count how many sent by using the messages in the queue
-			$sent_count = $sent_queue->count_STS_in_queue( EEM_Message::instance()->stati_indicating_sent() );
-			if ( $sent_count > 0 ) {
+			$sent_count = $sent_queue->count_STS_in_queue(EEM_Message::instance()->stati_indicating_sent());
+			if ($sent_count > 0) {
 				EE_Error::add_success(
 					sprintf(
 						_n(
@@ -938,8 +938,8 @@ 
 			} else {
 				EE_Error::overwrite_errors();
 				EE_Error::add_error(
-					__( 'No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
-					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso' ),
+					__('No message was sent because of problems with sending. Either all the messages you selected were not a sendable message, they were ALREADY sent on a different scheduled task, or there was an error.
+					If there was an error, you can look at the messages in the message activity list table for any error messages.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -960,13 +960,13 @@ 
 	 *
 	 * @return bool  true means messages were successfully queued for resending, false means none were queued for resending.
 	 */
-	public static function queue_for_resending( $message_ids ) {
+	public static function queue_for_resending($message_ids) {
 		self::_load_controller();
-		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send( $message_ids );
+		self::$_MSG_PROCESSOR->setup_messages_from_ids_and_send($message_ids);
 
 		//get queue and count
-		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue( EEM_Message::status_resend );
-		if ( $queue_count > 0 ) {
+		$queue_count = self::$_MSG_PROCESSOR->get_queue()->count_STS_in_queue(EEM_Message::status_resend);
+		if ($queue_count > 0) {
 			EE_Error::add_success(
 				sprintf(
 					_n(
@@ -980,7 +980,7 @@ 
 			);
 		} else {
 			EE_Error::add_error(
-				__( 'No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso' ),
+				__('No messages were queued for resending. This usually only happens when all the messages flagged for resending are not a status that can be resent.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1002,16 +1002,16 @@ 
 	 * @param array $info
 	 * @param bool $display_request
 	 */
-	protected static function log( $class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false ) {
-		if ( WP_DEBUG && false ) {
-			if ( $transaction instanceof EE_Transaction ) {
+	protected static function log($class = '', $func = '', $line = '', EE_Transaction $transaction, $info = array(), $display_request = false) {
+		if (WP_DEBUG && false) {
+			if ($transaction instanceof EE_Transaction) {
 				// don't serialize objects
-				$info = EEH_Debug_Tools::strip_objects( $info );
+				$info = EEH_Debug_Tools::strip_objects($info);
 				$info['TXN_status'] = $transaction->status_ID();
 				$info['TXN_reg_steps'] = $transaction->reg_steps();
-				if ( $transaction->ID() ) {
-					$index = 'EE_Transaction: ' . $transaction->ID();
-					EEH_Debug_Tools::log( $class, $func, $line, $info, $display_request, $index );
+				if ($transaction->ID()) {
+					$index = 'EE_Transaction: '.$transaction->ID();
+					EEH_Debug_Tools::log($class, $func, $line, $info, $display_request, $index);
 				}
 			}
 		}

core/libraries/form_sections/strategies/display/EE_Checkbox_Display_Strategy.strategy.php

Spacing +20 added lines, -20 removed lines

@@ -18,42 +18,42 @@
 	 * @throws EE_Error
 	 * @return string of html to display the field
 	 */
-	public function display(){
+	public function display() {
 		$input = $this->get_input();
 		//d( $input );
-		$multi = count( $input->options() ) > 1 ? TRUE : FALSE;
+		$multi = count($input->options()) > 1 ? TRUE : FALSE;
 		$input->set_label_sizes();
 		$label_size_class = $input->get_label_size_class();
 		$html = '';
-		if ( ! is_array( $input->raw_value() ) && $input->raw_value() !== NULL ) {
+		if ( ! is_array($input->raw_value()) && $input->raw_value() !== NULL) {
 			EE_Error::doing_it_wrong(
 				'EE_Checkbox_Display_Strategy::display()',
 				sprintf(
-					__( 'Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
+					__('Input values for checkboxes should be an array of values, but the value for input "%1$s" is "%2$s". Please verify that the input name is exactly "%3$s"', 'event_espresso'),
 					$input->html_id(),
-					var_export( $input->raw_value(), true),
-					$input->html_name() . '[]'
+					var_export($input->raw_value(), true),
+					$input->html_name().'[]'
 				),
 				'4.8.1'
 			);
 		}
-		$input_raw_value = (array)$input->raw_value();
-		foreach( $input->options() as $value => $display_text ){
-			$value = $input->get_normalization_strategy()->unnormalize_one( $value );
-			$html_id = $multi ? $this->get_sub_input_id( $value ) : $input->html_id();
-			$html .= EEH_HTML::nl( 0, 'checkbox' );
-			$html .= '<label for="' . $html_id . '" id="' . $html_id . '-lbl" class="ee-checkbox-label-after' . $label_size_class . '">';
-			$html .= EEH_HTML::nl( 1, 'checkbox' );
+		$input_raw_value = (array) $input->raw_value();
+		foreach ($input->options() as $value => $display_text) {
+			$value = $input->get_normalization_strategy()->unnormalize_one($value);
+			$html_id = $multi ? $this->get_sub_input_id($value) : $input->html_id();
+			$html .= EEH_HTML::nl(0, 'checkbox');
+			$html .= '<label for="'.$html_id.'" id="'.$html_id.'-lbl" class="ee-checkbox-label-after'.$label_size_class.'">';
+			$html .= EEH_HTML::nl(1, 'checkbox');
 			$html .= '<input type="checkbox"';
-			$html .= ' name="' . $input->html_name() . '[]"';
-			$html .= ' id="' . $html_id . '"';
-			$html .= ' class="' . $input->html_class() . '"';
-			$html .= ' style="' . $input->html_style() . '"';
-			$html .= ' value="' . esc_attr( $value ) . '"';
-			$html .= ! empty( $input_raw_value ) && in_array( $value, $input_raw_value ) ? ' checked="checked"' : '';
+			$html .= ' name="'.$input->html_name().'[]"';
+			$html .= ' id="'.$html_id.'"';
+			$html .= ' class="'.$input->html_class().'"';
+			$html .= ' style="'.$input->html_style().'"';
+			$html .= ' value="'.esc_attr($value).'"';
+			$html .= ! empty($input_raw_value) && in_array($value, $input_raw_value) ? ' checked="checked"' : '';
 			$html .= '>&nbsp;';
 			$html .= $display_text;
-			$html .= EEH_HTML::nl( -1, 'checkbox' ) . '</label>';
+			$html .= EEH_HTML::nl( -1, 'checkbox' ).'</label>';
 		}
 		return $html;
 	}

core/libraries/form_sections/strategies/display/EE_Select2_Display_Strategy.strategy.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
  * @since 				$VID:$
  *
  */
-class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy{
+class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy {
 	
 	/**
 	 * Arguments that will be passed into the select2 javascript constructor
@@ -25,7 +25,7 @@ 
 	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
 	 * to pass into the select2 js/html input. See https://select2.github.io
 	 */
-	public function __construct( $select2_js_args = array() ) {
+	public function __construct($select2_js_args = array()) {
 		$this->_select2_js_args = $select2_js_args;
 		parent::__construct();
 	}
@@ -35,8 +35,8 @@ 
 	 * the select2 css
 	 */
 	public function enqueue_js() {
-		wp_enqueue_script( 'form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true );
-		wp_enqueue_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
 	}
 	
 	/**
@@ -51,7 +51,7 @@ 
 	 * Sets the exact js args which will be passed into the select2 js/html input
 	 * @param array $js_args
 	 */
-	public function set_js_args( $js_args ) {
+	public function set_js_args($js_args) {
 		$this->_select2_js_args = $js_args;
 	}
 	
@@ -60,12 +60,12 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
-		$other_js_data = parent::get_other_js_data( $other_js_data );
-		if( ! isset( $other_js_data[ 'select2s' ] ) ) {
+	public function get_other_js_data($other_js_data = array()) {
+		$other_js_data = parent::get_other_js_data($other_js_data);
+		if ( ! isset($other_js_data['select2s'])) {
 			$other_js_data['select2s'] = array();
 		}
-		$other_js_data[ 'select2s' ][ $this->_input->html_id() ] = $this->get_js_args();
+		$other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
 		return $other_js_data;
 	}
 }
\ No newline at end of file

core/libraries/form_sections/base/EE_Form_Section_Proper.form.php

Spacing +181 added lines, -181 removed lines

@@ -7,7 +7,7 @@ 
  * before the hook wp_enqueue_scripts is called (so that the form section can enqueue its needed scripts).
  * However, you may output the form (usually by calling get_html) anywhere you like.
  */
-class EE_Form_Section_Proper extends EE_Form_Section_Validatable{
+class EE_Form_Section_Proper extends EE_Form_Section_Validatable {
 
 	/**
 	 * Subsections
@@ -69,49 +69,49 @@ 
 	 *                               } @see EE_Form_Section_Validatable::__construct()
 	 * @throws \EE_Error
 	 */
-	public function __construct( $options_array = array() ){
-		$options_array = (array) apply_filters( 'FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this );
+	public function __construct($options_array = array()) {
+		$options_array = (array) apply_filters('FHEE__EE_Form_Section_Proper___construct__options_array', $options_array, $this);
 		//call parent first, as it may be setting the name
 		parent::__construct($options_array);
 		//if they've included subsections in the constructor, add them now
-		if( isset( $options_array['include'] )){
+		if (isset($options_array['include'])) {
 			//we are going to make sure we ONLY have those subsections to include
 			//AND we are going to make sure they're in that specified order
 			$reordered_subsections = array();
-			foreach($options_array['include'] as $input_name){
-				if(isset($this->_subsections[$input_name])){
+			foreach ($options_array['include'] as $input_name) {
+				if (isset($this->_subsections[$input_name])) {
 					$reordered_subsections[$input_name] = $this->_subsections[$input_name];
 				}
 			}
 			$this->_subsections = $reordered_subsections;
 		}
-		if(isset($options_array['exclude'])){
+		if (isset($options_array['exclude'])) {
 			$exclude = $options_array['exclude'];
 			$this->_subsections = array_diff_key($this->_subsections, array_flip($exclude));
 		}
-		if(isset($options_array['layout_strategy'])){
+		if (isset($options_array['layout_strategy'])) {
 			$this->_layout_strategy = $options_array['layout_strategy'];
 		}
-		if( ! $this->_layout_strategy){
+		if ( ! $this->_layout_strategy) {
 			$this->_layout_strategy = new EE_Two_Column_Layout();
 		}
 		$this->_layout_strategy->_construct_finalize($this);
 
 		//ok so we are definitely going to want the forms JS,
 		//so enqueue it or remember to enqueue it during wp_enqueue_scripts
-		if( did_action( 'wp_enqueue_scripts' )
-			|| did_action( 'admin_enqueue_scripts' ) ) {
+		if (did_action('wp_enqueue_scripts')
+			|| did_action('admin_enqueue_scripts')) {
 			//ok so they've constructed this object after when they should have.
 			//just enqueue the generic form scripts and initialize the form immediately in the JS
-			\EE_Form_Section_Proper::wp_enqueue_scripts( true );
+			\EE_Form_Section_Proper::wp_enqueue_scripts(true);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
-			add_action( 'admin_enqueue_scripts', array( 'EE_Form_Section_Proper', 'wp_enqueue_scripts' ));
+			add_action('wp_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
+			add_action('admin_enqueue_scripts', array('EE_Form_Section_Proper', 'wp_enqueue_scripts'));
 		}
-		add_action( 'wp_footer', array( $this, 'ensure_scripts_localized' ), 1 );
+		add_action('wp_footer', array($this, 'ensure_scripts_localized'), 1);
 
-		if( isset( $options_array[ 'name' ] ) ) {
-			$this->_construct_finalize( null, $options_array[ 'name' ] );
+		if (isset($options_array['name'])) {
+			$this->_construct_finalize(null, $options_array['name']);
 		}
 	}
 
@@ -124,25 +124,25 @@ 
 	 * @param string                 $name
 	 * @throws \EE_Error
 	 */
-	public function _construct_finalize( $parent_form_section, $name ) {
+	public function _construct_finalize($parent_form_section, $name) {
 		parent::_construct_finalize($parent_form_section, $name);
 		$this->_set_default_name_if_empty();
 		$this->_set_default_html_id_if_empty();
-		foreach( $this->_subsections as $subsection_name => $subsection ){
-			if ( $subsection instanceof EE_Form_Section_Base ) {
-				$subsection->_construct_finalize( $this, $subsection_name );
+		foreach ($this->_subsections as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Section_Base) {
+				$subsection->_construct_finalize($this, $subsection_name);
 			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso' ),
+						__('Subsection "%s" is not an instanceof EE_Form_Section_Base on form "%s". It is a "%s"', 'event_espresso'),
 						$subsection_name,
 						get_class($this),
-						$subsection ? get_class($subsection) : __( 'NULL', 'event_espresso' )
+						$subsection ? get_class($subsection) : __('NULL', 'event_espresso')
 					)
 				);
 			}
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name );
+		do_action('AHEE__EE_Form_Section_Proper___construct_finalize__end', $this, $parent_form_section, $name);
 	}
 
 
@@ -151,7 +151,7 @@ 
 	 * Gets the layout strategy for this form section
 	 * @return EE_Form_Section_Layout_Base
 	 */
-	public function get_layout_strategy(){
+	public function get_layout_strategy() {
 		return $this->_layout_strategy;
 	}
 
@@ -163,7 +163,7 @@ 
 	 * @param EE_Form_Input_Base $input
 	 * @return string
 	 */
-	public function get_html_for_input($input){
+	public function get_html_for_input($input) {
 		return $this->_layout_strategy->layout_input($input);
 	}
 
@@ -176,7 +176,7 @@ 
 	 * @param null $form_data
 	 * @return boolean
 	 */
-	public function was_submitted($form_data = NULL){
+	public function was_submitted($form_data = NULL) {
 		return $this->form_data_present_in($form_data);
 	}
 
@@ -201,17 +201,17 @@ 
 	 *                          (eg you validated the data then stored it in the DB) you may want to skip this step.
 	 * @return void
 	 */
-	public function receive_form_submission($req_data = NULL, $validate = TRUE){
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate );
-		if( $req_data === NULL){
-			$req_data = array_merge( $_GET, $_POST );
+	public function receive_form_submission($req_data = NULL, $validate = TRUE) {
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__req_data', $req_data, $this, $validate);
+		if ($req_data === NULL) {
+			$req_data = array_merge($_GET, $_POST);
 		}
-		$req_data = apply_filters( 'FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this );
+		$req_data = apply_filters('FHEE__EE_Form_Section_Proper__receive_form_submission__request_data', $req_data, $this);
 		$this->_normalize($req_data);
-		if( $validate ){
+		if ($validate) {
 			$this->_validate();
 		}
-		do_action( 'AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate );
+		do_action('AHEE__EE_Form_Section_Proper__receive_form_submission__end', $req_data, $this, $validate);
 	}
 
 
@@ -224,12 +224,12 @@ 
 	 * the value being an array formatted in teh same way
 	 * @param array $default_data
 	 */
-	public function populate_defaults($default_data){
-		foreach($this->subsections() as $subsection_name => $subsection){
-			if(isset($default_data[$subsection_name])){
-				if($subsection instanceof EE_Form_Input_Base){
+	public function populate_defaults($default_data) {
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if (isset($default_data[$subsection_name])) {
+				if ($subsection instanceof EE_Form_Input_Base) {
 					$subsection->set_default($default_data[$subsection_name]);
-				}elseif($subsection instanceof EE_Form_Section_Proper){
+				}elseif ($subsection instanceof EE_Form_Section_Proper) {
 					$subsection->populate_defaults($default_data[$subsection_name]);
 				}
 			}
@@ -251,8 +251,8 @@ 
 	 * @return EE_Form_Section_Base
 	 * @throws \EE_Error
 	 */
-	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		if( $require_construction_to_be_finalized ){
+	public function get_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		if ($require_construction_to_be_finalized) {
 			$this->ensure_construct_finalized_called();
 		}
 		return isset($this->_subsections[$name]) ? $this->_subsections[$name] : NULL;
@@ -264,10 +264,10 @@ 
 	 * Gets all the validatable subsections of this form section
 	 * @return EE_Form_Section_Validatable[]
 	 */
-	public function get_validatable_subsections(){
+	public function get_validatable_subsections() {
 		$validatable_subsections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Validatable){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Validatable) {
 				$validatable_subsections[$name] = $obj;
 			}
 		}
@@ -287,10 +287,10 @@ 
 	 * @return EE_Form_Input_Base
 	 * @throws EE_Error
 	 */
-	public function get_input($name, $require_construction_to_be_finalized = TRUE ){
+	public function get_input($name, $require_construction_to_be_finalized = TRUE) {
 		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
-		if( ! $subsection instanceof EE_Form_Input_Base){
-			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'),$name, get_class($this),$subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
+		if ( ! $subsection instanceof EE_Form_Input_Base) {
+			throw new EE_Error(sprintf(__("Subsection '%s' is not an instanceof EE_Form_Input_Base on form '%s'. It is a '%s'", 'event_espresso'), $name, get_class($this), $subsection ? get_class($subsection) : __("NULL", 'event_espresso')));
 		}
 		return $subsection;
 	}
@@ -308,10 +308,10 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws EE_Error
 	 */
-	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE ){
-		$subsection = $this->get_subsection( $name, $require_construction_to_be_finalized );
-		if( ! $subsection instanceof EE_Form_Section_Proper){
-			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'),$name, get_class($this)));
+	public function get_proper_subsection($name, $require_construction_to_be_finalized = TRUE) {
+		$subsection = $this->get_subsection($name, $require_construction_to_be_finalized);
+		if ( ! $subsection instanceof EE_Form_Section_Proper) {
+			throw new EE_Error(sprintf(__("Subsection '%'s is not an instanceof EE_Form_Section_Proper on form '%s'", 'event_espresso'), $name, get_class($this)));
 		}
 		return $subsection;
 	}
@@ -326,7 +326,7 @@ 
 	 * @return mixed depending on the input's type and its normalization strategy
 	 * @throws \EE_Error
 	 */
-	public function get_input_value($name){
+	public function get_input_value($name) {
 		$input = $this->get_input($name);
 		return $input->normalized_value();
 	}
@@ -339,16 +339,16 @@ 
 	 * @return boolean
 	 */
 	public function is_valid() {
-		if( ! $this->has_received_submission()){
+		if ( ! $this->has_received_submission()) {
 			throw new EE_Error(sprintf(__("You cannot check if a form is valid before receiving the form submission using receive_form_submission", "event_espresso")));
 		}
-		if( ! parent::is_valid()){
+		if ( ! parent::is_valid()) {
 			return false;
 		}
 		//ok so no errors general to this entire form section. so let's check the subsections
-		foreach( $this->get_validatable_subsections() as $subsection ){
-			if( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '' ){
-				$this->set_submission_error_message( $subsection->get_validation_error_string() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ( ! $subsection->is_valid() || $subsection->get_validation_error_string() !== '') {
+				$this->set_submission_error_message($subsection->get_validation_error_string());
 				return false;
 			}
 		}
@@ -361,11 +361,11 @@ 
 	 * gets teh default name of this form section if none is specified
 	 * @return string
 	 */
-	protected function _set_default_name_if_empty(){
-		if( ! $this->_name ){
+	protected function _set_default_name_if_empty() {
+		if ( ! $this->_name) {
 			$classname = get_class($this);
 			$default_name = str_replace("EE_", "", $classname);
-			$this->_name =  $default_name;
+			$this->_name = $default_name;
 		}
 	}
 
@@ -380,7 +380,7 @@ 
 	 *             and get_html when you are about to display the form.
 	 * @throws \EE_Error
 	 */
-	public function get_html_and_js(){
+	public function get_html_and_js() {
 		//no doing_it_wrong yet because we ourselves are still doing it wrong...
 		//and theoretically this CAN be used properly, provided its used during "wp_enqueue_scripts"
 		$this->enqueue_js();
@@ -395,7 +395,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_html(){
+	public function get_html() {
 		$this->ensure_construct_finalized_called();
 		return $this->_layout_strategy->layout_form();
 	}
@@ -408,9 +408,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function enqueue_js(){
+	public function enqueue_js() {
 		$this->_enqueue_and_localize_form_js();
-		foreach( $this->subsections() as $subsection ) {
+		foreach ($this->subsections() as $subsection) {
 			$subsection->enqueue_js();
 		}
 	}
@@ -427,10 +427,10 @@ 
 	 * @param boolean $init_form_validation_automatically whether or not we want the form validation to be triggered automatically or not
 	 * @return void
 	 */
-	public static function wp_enqueue_scripts( $init_form_validation_automatically = true ){
-		add_filter( 'FHEE_load_jquery_validate', '__return_true' );
-		wp_register_script( 'ee_form_section_validation', EE_GLOBAL_ASSETS_URL . 'scripts' . DS . 'form_section_validation.js', array( 'jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_validation_init', array( 'init' => $init_form_validation_automatically ? true : false ) );
+	public static function wp_enqueue_scripts($init_form_validation_automatically = true) {
+		add_filter('FHEE_load_jquery_validate', '__return_true');
+		wp_register_script('ee_form_section_validation', EE_GLOBAL_ASSETS_URL.'scripts'.DS.'form_section_validation.js', array('jquery-validate', 'jquery-ui-datepicker', 'jquery-validate-extra-methods'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_validation_init', array('init' => $init_form_validation_automatically ? true : false));
 	}
 
 
@@ -442,14 +442,14 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function _enqueue_and_localize_form_js(){
+	public function _enqueue_and_localize_form_js() {
 		$this->ensure_construct_finalized_called();
 		//actually, we don't want to localize just yet. There may be other forms on the page.
 		//so we need to add our form section data to a static variable accessible by all form sections
 		//and localize it just before the footer
 		$this->localize_validation_rules();
-		add_action( 'wp_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ), 2 );
-		add_action( 'admin_footer', array( 'EE_Form_Section_Proper', 'localize_script_for_all_forms' ) );
+		add_action('wp_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'), 2);
+		add_action('admin_footer', array('EE_Form_Section_Proper', 'localize_script_for_all_forms'));
 	}
 
 
@@ -461,11 +461,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function localize_validation_rules( $return_for_subsection = FALSE ){
+	public function localize_validation_rules($return_for_subsection = FALSE) {
 		// we only want to localize vars ONCE for the entire form, so if the form section doesn't have a parent, then it must be the top dog
-		if ( $return_for_subsection || ! $this->parent_section() ) {
-			EE_Form_Section_Proper::$_js_localization['form_data'][ $this->html_id() ] = array(
-				'form_section_id'=> $this->html_id( TRUE ),
+		if ($return_for_subsection || ! $this->parent_section()) {
+			EE_Form_Section_Proper::$_js_localization['form_data'][$this->html_id()] = array(
+				'form_section_id'=> $this->html_id(TRUE),
 				'validation_rules'=> $this->get_jquery_validation_rules(),
 				'other_data' => $this->get_other_js_data(),
 				'errors'=> $this->subsection_validation_errors_by_html_name()
@@ -481,9 +481,9 @@ 
 	 * @param array $form_other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $form_other_js_data = array() ) {
-		foreach( $this->subsections() as $subsection ) {
-			$form_other_js_data = $subsection->get_other_js_data( $form_other_js_data );
+	public function get_other_js_data($form_other_js_data = array()) {
+		foreach ($this->subsections() as $subsection) {
+			$form_other_js_data = $subsection->get_other_js_data($form_other_js_data);
 		}
 		return $form_other_js_data;
 	}
@@ -494,12 +494,12 @@ 
 	 * Keys are their form names, and values are the inputs themselves
 	 * @return EE_Form_Input_Base
 	 */
-	public function inputs_in_subsections(){
+	public function inputs_in_subsections() {
 		$inputs = array();
-		foreach($this->subsections() as $subsection){
-			if( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection->html_name() ] = $subsection;
-			}elseif($subsection instanceof EE_Form_Section_Proper ){
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection->html_name()] = $subsection;
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
 				$inputs += $subsection->inputs_in_subsections();
 			}
 		}
@@ -512,12 +512,12 @@ 
 	 * and values are a string of all their validation errors
 	 * @return string[]
 	 */
-	public function subsection_validation_errors_by_html_name(){
+	public function subsection_validation_errors_by_html_name() {
 		$inputs = $this->inputs();
 		$errors = array();
-		foreach( $inputs as $form_input ){
-			if ( $form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors() ){
-				$errors[ $form_input->html_name() ] = $form_input->get_validation_error_string();
+		foreach ($inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Input_Base && $form_input->get_validation_errors()) {
+				$errors[$form_input->html_name()] = $form_input->get_validation_error_string();
 			}
 		}
 		return $errors;
@@ -529,16 +529,16 @@ 
 	 * passes all the form data required by the JS to the JS, and enqueues the few required JS files.
 	 * Should be setup by each form during the _enqueues_and_localize_form_js
 	 */
-	public static function localize_script_for_all_forms(){
+	public static function localize_script_for_all_forms() {
 		//allow inputs and stuff to hook in their JS and stuff here
 		do_action('AHEE__EE_Form_Section_Proper__localize_script_for_all_forms__begin');
 		EE_Form_Section_Proper::$_js_localization['localized_error_messages'] = EE_Form_Section_Proper::_get_localized_error_messages();
-		$email_validation_level = isset( EE_Registry::instance()->CFG->registration->email_validation_level )
+		$email_validation_level = isset(EE_Registry::instance()->CFG->registration->email_validation_level)
 			? EE_Registry::instance()->CFG->registration->email_validation_level
 			: 'wp_default';
 		EE_Form_Section_Proper::$_js_localization['email_validation_level'] = $email_validation_level;
-		wp_enqueue_script( 'ee_form_section_validation' );
-		wp_localize_script( 'ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization );
+		wp_enqueue_script('ee_form_section_validation');
+		wp_localize_script('ee_form_section_validation', 'ee_form_section_vars', EE_Form_Section_Proper::$_js_localization);
 	}
 
 
@@ -546,8 +546,8 @@ 
 	/**
 	 * ensure_scripts_localized
 	 */
-	public function ensure_scripts_localized(){
-		if ( ! EE_Form_Section_Proper::$_scripts_localized ) {
+	public function ensure_scripts_localized() {
+		if ( ! EE_Form_Section_Proper::$_scripts_localized) {
 			$this->_enqueue_and_localize_form_js();
 		}
 	}
@@ -559,10 +559,10 @@ 
 	 * is that the key here should be the same as the custom validation rule put in the JS file
 	 * @return array keys are custom validation rules, and values are internationalized strings
 	 */
-	private static function _get_localized_error_messages(){
+	private static function _get_localized_error_messages() {
 		return array(
 			'validUrl'=>  __("This is not a valid absolute URL. Eg, http://domain.com/monkey.jpg", "event_espresso"),
-			'regex' => __( 'Please check your input', 'event_espresso' ),
+			'regex' => __('Please check your input', 'event_espresso'),
 		);
 	}
 
@@ -590,10 +590,10 @@ 
 	 * Gets the JS to put inside the jquery validation rules for subsection of this form section. See parent function for more...
 	 * @return array
 	 */
-	public function get_jquery_validation_rules(){
+	public function get_jquery_validation_rules() {
 		$jquery_validation_rules = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			$jquery_validation_rules = array_merge( $jquery_validation_rules,  $subsection->get_jquery_validation_rules() );
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			$jquery_validation_rules = array_merge($jquery_validation_rules, $subsection->get_jquery_validation_rules());
 		}
 		return $jquery_validation_rules;
 	}
@@ -608,11 +608,11 @@ 
 	protected function _normalize($req_data) {
 		$this->_received_submission = TRUE;
 		$this->_validation_errors = array();
-		foreach($this->get_validatable_subsections() as $subsection){
-			try{
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			try {
 				$subsection->_normalize($req_data);
-			}catch( EE_Validation_Error $e ){
-				$subsection->add_validation_error( $e );
+			} catch (EE_Validation_Error $e) {
+				$subsection->add_validation_error($e);
 			}
 		}
 	}
@@ -626,9 +626,9 @@ 
 	 * calling parent::_validate() first.
 	 */
 	protected function _validate() {
-		foreach($this->get_validatable_subsections() as $subsection_name => $subsection){
-			if(method_exists($this,'_validate_'.$subsection_name)){
-				call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if (method_exists($this, '_validate_'.$subsection_name)) {
+				call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
 			}
 			$subsection->_validate();
 		}
@@ -640,13 +640,13 @@ 
 	 * Gets all the validated inputs for the form section
 	 * @return array
 	 */
-	public function valid_data(){
+	public function valid_data() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Section_Proper ) {
-				$inputs[ $subsection_name ] = $subsection->valid_data();
-			} else if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection->normalized_value();
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
+				$inputs[$subsection_name] = $subsection->valid_data();
+			} else if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection->normalized_value();
 			}
 		}
 		return $inputs;
@@ -658,11 +658,11 @@ 
 	 * Gets all the inputs on this form section
 	 * @return EE_Form_Input_Base[]
 	 */
-	public function inputs(){
+	public function inputs() {
 		$inputs = array();
-		foreach( $this->subsections() as $subsection_name =>$subsection ){
-			if ( $subsection instanceof EE_Form_Input_Base ){
-				$inputs[ $subsection_name ] = $subsection;
+		foreach ($this->subsections() as $subsection_name =>$subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$inputs[$subsection_name] = $subsection;
 			}
 		}
 		return $inputs;
@@ -674,10 +674,10 @@ 
 	 * Gets all the subsections which are a proper form
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subforms(){
+	public function subforms() {
 		$form_sections = array();
-		foreach($this->subsections() as $name=>$obj){
-			if($obj instanceof EE_Form_Section_Proper){
+		foreach ($this->subsections() as $name=>$obj) {
+			if ($obj instanceof EE_Form_Section_Proper) {
 				$form_sections[$name] = $obj;
 			}
 		}
@@ -692,7 +692,7 @@ 
 	 * if you only want form inputs or proper form sections.
 	 * @return EE_Form_Section_Proper[]
 	 */
-	public function subsections(){
+	public function subsections() {
 		$this->ensure_construct_finalized_called();
 		return $this->_subsections;
 	}
@@ -710,8 +710,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_values( $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( false, $include_subform_inputs, $flatten );
+	public function input_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(false, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -727,8 +727,8 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function input_pretty_values(  $include_subform_inputs = false, $flatten = false ){
-		return $this->_input_values( true, $include_subform_inputs, $flatten );
+	public function input_pretty_values($include_subform_inputs = false, $flatten = false) {
+		return $this->_input_values(true, $include_subform_inputs, $flatten);
 	}
 
 	/**
@@ -741,17 +741,17 @@ 
 	 * it can be a multidimensional array where keys are always subsection names and values are either the
 	 * input's normalized value, or an array like the top-level array
 	 */
-	public function _input_values( $pretty = false, $include_subform_inputs = false, $flatten = false ) {
+	public function _input_values($pretty = false, $include_subform_inputs = false, $flatten = false) {
 		$input_values = array();
-		foreach( $this->subsections() as $subsection_name => $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				$input_values[ $subsection_name ] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
-			} else if( $subsection instanceof EE_Form_Section_Proper && $include_subform_inputs ) {
-				$subform_input_values = $subsection->_input_values( $pretty, $include_subform_inputs, $flatten );
-				if( $flatten ) {
-					$input_values = array_merge( $input_values, $subform_input_values );
+		foreach ($this->subsections() as $subsection_name => $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				$input_values[$subsection_name] = $pretty ? $subsection->pretty_value() : $subsection->normalized_value();
+			} else if ($subsection instanceof EE_Form_Section_Proper && $include_subform_inputs) {
+				$subform_input_values = $subsection->_input_values($pretty, $include_subform_inputs, $flatten);
+				if ($flatten) {
+					$input_values = array_merge($input_values, $subform_input_values);
 				} else {
-					$input_values[ $subsection_name ] = $subform_input_values;
+					$input_values[$subsection_name] = $subform_input_values;
 				}
 			}
 		}
@@ -767,7 +767,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function has_received_submission(){
+	public function has_received_submission() {
 		$this->ensure_construct_finalized_called();
 		return $this->_received_submission;
 	}
@@ -780,8 +780,8 @@ 
 	 * @param array $inputs_to_exclude values are the input names
 	 * @return void
 	 */
-	public function exclude($inputs_to_exclude = array()){
-		foreach($inputs_to_exclude as $input_to_exclude_name){
+	public function exclude($inputs_to_exclude = array()) {
+		foreach ($inputs_to_exclude as $input_to_exclude_name) {
 			unset($this->_subsections[$input_to_exclude_name]);
 		}
 	}
@@ -792,8 +792,8 @@ 
 	 * @param array $inputs_to_hide
 	 * @throws \EE_Error
 	 */
-	public function hide($inputs_to_hide= array()){
-		foreach($inputs_to_hide as $input_to_hide){
+	public function hide($inputs_to_hide = array()) {
+		foreach ($inputs_to_hide as $input_to_hide) {
 			$input = $this->get_input($input_to_hide);
 
 			$input->set_display_strategy(new EE_Hidden_Display_Strategy());
@@ -818,13 +818,13 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function add_subsections( $new_subsections, $subsection_name_to_target = NULL, $add_before = true ){
-		foreach($new_subsections as $subsection_name => $subsection){
-			if( ! $subsection instanceof EE_Form_Section_Base){
+	public function add_subsections($new_subsections, $subsection_name_to_target = NULL, $add_before = true) {
+		foreach ($new_subsections as $subsection_name => $subsection) {
+			if ( ! $subsection instanceof EE_Form_Section_Base) {
 				EE_Error::add_error(
 					sprintf(
 						__("Trying to add a %s as a subsection (it was named '%s') to the form section '%s'. It was removed.", "event_espresso"),
-						get_class( $subsection ),
+						get_class($subsection),
 						$subsection_name,
 						$this->name()
 					)
@@ -833,7 +833,7 @@ 
 			}
 		}
 
-		$this->_subsections = EEH_Array::insert_into_array( $this->_subsections, $new_subsections, $subsection_name_to_target, $add_before );
+		$this->_subsections = EEH_Array::insert_into_array($this->_subsections, $new_subsections, $subsection_name_to_target, $add_before);
 
 		/*$subsections_before = array();
 		if( $subsection_name_to_target ){
@@ -864,8 +864,8 @@ 
 				$this->_subsections = $new_subsections;
 			}
 		}*/
-		if( $this->_construction_finalized ){
-			foreach($this->_subsections as $name => $subsection){
+		if ($this->_construction_finalized) {
+			foreach ($this->_subsections as $name => $subsection) {
 				$subsection->_construct_finalize($this, $name);
 			}
 		}
@@ -876,8 +876,8 @@ 
 	/**
 	 * Just gets all validatable subsections to clean their sensitive data
 	 */
-	public function clean_sensitive_data(){
-		foreach($this->get_validatable_subsections() as $subsection){
+	public function clean_sensitive_data() {
+		foreach ($this->get_validatable_subsections() as $subsection) {
 			$subsection->clean_sensitive_data();
 		}
 	}
@@ -887,8 +887,8 @@ 
 	/**
 	 * @param string $form_submission_error_message
 	 */
-	public function set_submission_error_message( $form_submission_error_message = '' ) {
-		$this->_form_submission_error_message .= ! empty( $form_submission_error_message ) ? $form_submission_error_message : __( 'Form submission failed due to errors', 'event_espresso' );
+	public function set_submission_error_message($form_submission_error_message = '') {
+		$this->_form_submission_error_message .= ! empty($form_submission_error_message) ? $form_submission_error_message : __('Form submission failed due to errors', 'event_espresso');
 	}
 
 
@@ -905,8 +905,8 @@ 
 	/**
 	 * @param string $form_submission_success_message
 	 */
-	public function set_submission_success_message( $form_submission_success_message ) {
-		$this->_form_submission_success_message .= ! empty( $form_submission_success_message ) ? $form_submission_success_message : __( 'Form submitted successfully', 'event_espresso' );
+	public function set_submission_success_message($form_submission_success_message) {
+		$this->_form_submission_success_message .= ! empty($form_submission_success_message) ? $form_submission_success_message : __('Form submitted successfully', 'event_espresso');
 	}
 
 
@@ -929,10 +929,10 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function html_name_prefix(){
-		if( $this->parent_section() instanceof EE_Form_Section_Proper ){
-			return $this->parent_section()->html_name_prefix() . '[' . $this->name() . ']';
-		}else{
+	public function html_name_prefix() {
+		if ($this->parent_section() instanceof EE_Form_Section_Proper) {
+			return $this->parent_section()->html_name_prefix().'['.$this->name().']';
+		} else {
 			return $this->name();
 		}
 	}
@@ -947,7 +947,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		$this->ensure_construct_finalized_called();
 		return parent::name();
 	}
@@ -958,7 +958,7 @@ 
 	 * @return EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	public function parent_section(){
+	public function parent_section() {
 		$this->ensure_construct_finalized_called();
 		return parent::parent_section();
 	}
@@ -971,9 +971,9 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function ensure_construct_finalized_called(){
-		if( ! $this->_construction_finalized ){
-			$this->_construct_finalize($this->_parent_section, $this->_name );
+	public function ensure_construct_finalized_called() {
+		if ( ! $this->_construction_finalized) {
+			$this->_construct_finalize($this->_parent_section, $this->_name);
 		}
 	}
 
@@ -985,17 +985,17 @@ 
 	 * @param array $req_data
 	 * @return boolean
 	 */
-	public function form_data_present_in( $req_data = NULL ) {
-		if( $req_data === NULL){
+	public function form_data_present_in($req_data = NULL) {
+		if ($req_data === NULL) {
 			$req_data = $_POST;
 		}
-		foreach( $this->subsections() as $subsection ) {
-			if($subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+		foreach ($this->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
-			}elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				if( $subsection->form_data_present_in( $req_data ) ) {
+			}elseif ($subsection instanceof EE_Form_Section_Proper) {
+				if ($subsection->form_data_present_in($req_data)) {
 					return TRUE;
 				}
 			}
@@ -1012,14 +1012,14 @@ 
 	 */
 	public function get_validation_errors_accumulated() {
 		$validation_errors = $this->get_validation_errors();
-		foreach($this->get_validatable_subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Section_Proper ) {
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Section_Proper) {
 				$validation_errors_on_this_subsection = $subsection->get_validation_errors_accumulated();
 			} else {
-				$validation_errors_on_this_subsection =  $subsection->get_validation_errors();
+				$validation_errors_on_this_subsection = $subsection->get_validation_errors();
 			}
-			if( $validation_errors_on_this_subsection ){
-				$validation_errors = array_merge( $validation_errors, $validation_errors_on_this_subsection );
+			if ($validation_errors_on_this_subsection) {
+				$validation_errors = array_merge($validation_errors, $validation_errors_on_this_subsection);
 			}
 		}
 		return $validation_errors;
@@ -1041,24 +1041,24 @@ 
 	 * @param string|false $form_section_path we accept false also because substr( '../', '../' ) = false
 	 * @return EE_Form_Section_Base
 	 */
-	public function find_section_from_path( $form_section_path ) {
+	public function find_section_from_path($form_section_path) {
 		//check if we can find the input from purely going straight up the tree
-		$input = parent::find_section_from_path( $form_section_path );
-		if( $input instanceof EE_Form_Section_Base ) {
+		$input = parent::find_section_from_path($form_section_path);
+		if ($input instanceof EE_Form_Section_Base) {
 			return $input;
 		}
 
-		$next_slash_pos = strpos( $form_section_path, '/' );
-		if( $next_slash_pos !== false ) {
-			$child_section_name = substr( $form_section_path, 0, $next_slash_pos );
-			$subpath = substr( $form_section_path, $next_slash_pos + 1 );
+		$next_slash_pos = strpos($form_section_path, '/');
+		if ($next_slash_pos !== false) {
+			$child_section_name = substr($form_section_path, 0, $next_slash_pos);
+			$subpath = substr($form_section_path, $next_slash_pos + 1);
 		} else {
 			$child_section_name = $form_section_path;
 			$subpath = '';
 		}
-		$child_section =  $this->get_subsection( $child_section_name );
-		if ( $child_section instanceof EE_Form_Section_Base ) {
-			return $child_section->find_section_from_path( $subpath );
+		$child_section = $this->get_subsection($child_section_name);
+		if ($child_section instanceof EE_Form_Section_Base) {
+			return $child_section->find_section_from_path($subpath);
 		} else {
 			return null;
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
 	 *                                                      with construction finalize being called later
 	 *                                                      (realizing that the subsections' html names
 	 *                                                      might not be set yet, etc.)
-	 * @return EE_Form_Section_Base
+	 * @return EE_Form_Section_Validatable|null
 	 * @throws \EE_Error
 	 */
 	public function get_subsection($name, $require_construction_to_be_finalized = TRUE ){

core/db_models/helpers/EE_Table_Base.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
  * Base class for defining the tables that comprise models. This is used to store information
  * about the table\s alias, private key, etc.
  */
-abstract class EE_Table_Base{
+abstract class EE_Table_Base {
 
 	/**
 	 * This holds the table_name without the table prefix.
@@ -41,12 +41,12 @@ 
 	 * @param boolean $global whether the table is "global" as in there is only 1 table on an entire multisite install,
 	 *					or whether each site on a multisite install has a copy of this table
 	 */
-	function __construct($table_name, $pk_column, $global = false ){
+	function __construct($table_name, $pk_column, $global = false) {
 		$this->_global = $global;
 		$prefix = $this->get_table_prefix();
 		//if they added the prefix, let's remove it because we delay adding the prefix until right when its needed.
-		if ( strpos( $table_name, $prefix ) === 0 ) {
-			$table_name = ltrim( $table_name, $prefix );
+		if (strpos($table_name, $prefix) === 0) {
+			$table_name = ltrim($table_name, $prefix);
 		}
 		$this->_table_name = $table_name;
 		$this->_pk_column = $pk_column;
@@ -64,10 +64,10 @@ 
 	public function get_table_prefix() {
 		global $wpdb;
 
-		if ( $this->_global ) {
+		if ($this->_global) {
 			$prefix = $wpdb->base_prefix;
 		} else {
-			$prefix = $wpdb->get_blog_prefix( EEM_Base::get_model_query_blog_id() );
+			$prefix = $wpdb->get_blog_prefix(EEM_Base::get_model_query_blog_id());
 		}
 		return $prefix;
 	}
@@ -78,7 +78,7 @@ 
 	 *
 	 * @param string $table_alias
 	 */
-	function _construct_finalize_with_alias($table_alias){
+	function _construct_finalize_with_alias($table_alias) {
 		$this->_table_alias = $table_alias;
 	}
 
@@ -87,8 +87,8 @@ 
 	 * Returns the fully qualified table name for the database (includes the table prefix current for the blog).
 	 * @return string
 	 */
-	function get_table_name(){
-		return $this->get_table_prefix() . $this->_table_name;
+	function get_table_name() {
+		return $this->get_table_prefix().$this->_table_name;
 	}
 
 
@@ -100,8 +100,8 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	function get_table_alias(){
-		if( ! $this->_table_alias){
+	function get_table_alias() {
+		if ( ! $this->_table_alias) {
 			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
 		}
 		return $this->_table_alias;
@@ -113,7 +113,7 @@ 
 	 *
 	 * @return string name of column of PK
 	 */
-	function get_pk_column(){
+	function get_pk_column() {
 		return $this->_pk_column;
 	}
 
@@ -123,8 +123,8 @@ 
 	 * returns a string with the table alias, a period, and the private key's column.
 	 * @return string
 	 */
-	function get_fully_qualified_pk_column(){
-		$sql =  $this->get_table_alias().".".$this->get_pk_column();
+	function get_fully_qualified_pk_column() {
+		$sql = $this->get_table_alias().".".$this->get_pk_column();
 		return $sql;
 	}
 
@@ -133,9 +133,9 @@ 
 	 * returns the special sql for a inner select with a limit.
 	 * @return string    SQL select
 	 */
-	public function get_select_join_limit( $limit ) {
-		$limit = is_array( $limit ) ? 'LIMIT ' . implode(',', array_map( 'intval', $limit ) ) : 'LIMIT ' . (int) $limit;
-		$SQL = SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+	public function get_select_join_limit($limit) {
+		$limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
+		$SQL = SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
 		return $SQL;
 	}
 }

modules/single_page_checkout/reg_steps/payment_options/EE_SPCO_Reg_Step_Payment_Options.class.php

Spacing +332 added lines, -332 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -38,32 +38,32 @@ 
 	public static function set_hooks() {
 		add_filter(
 			'FHEE__SPCO__EE_Line_Item_Filter_Collection',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'add_spco_line_item_filters')
 		);
 		add_action(
 			'wp_ajax_switch_spco_billing_form',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form')
 		);
 		add_action(
 			'wp_ajax_nopriv_switch_spco_billing_form',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'switch_spco_billing_form')
 		);
-		add_action( 'wp_ajax_save_payer_details', array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' ) );
+		add_action('wp_ajax_save_payer_details', array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details'));
 		add_action(
 			'wp_ajax_nopriv_save_payer_details',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'save_payer_details')
 		);
 		add_action(
 			'wp_ajax_get_transaction_details_for_gateways',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
 		add_action(
 			'wp_ajax_nopriv_get_transaction_details_for_gateways',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details' )
+			array('EE_SPCO_Reg_Step_Payment_Options', 'get_transaction_details')
 		);
 		add_filter(
 			'FHEE__EED_Recaptcha___bypass_recaptcha__bypass_request_params_array',
-			array( 'EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method' ),
+			array('EE_SPCO_Reg_Step_Payment_Options', 'bypass_recaptcha_for_load_payment_method'),
 			10,
 			1
 		);
@@ -77,7 +77,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function switch_spco_billing_form() {
-		EED_Single_Page_Checkout::process_ajax_request( 'switch_payment_method' );
+		EED_Single_Page_Checkout::process_ajax_request('switch_payment_method');
 	}
 
 
@@ -88,7 +88,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function save_payer_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'save_payer_details_via_ajax' );
+		EED_Single_Page_Checkout::process_ajax_request('save_payer_details_via_ajax');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function get_transaction_details() {
-		EED_Single_Page_Checkout::process_ajax_request( 'get_transaction_details_for_gateways' );
+		EED_Single_Page_Checkout::process_ajax_request('get_transaction_details_for_gateways');
 	}
 
 
@@ -127,10 +127,10 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Payment_Options
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'payment_options';
-		$this->_name = __( 'Payment Options', 'event_espresso' );
-		$this->_template = SPCO_REG_STEPS_PATH . $this->_slug . DS . 'payment_options_main.template.php';
+		$this->_name = __('Payment Options', 'event_espresso');
+		$this->_template = SPCO_REG_STEPS_PATH.$this->_slug.DS.'payment_options_main.template.php';
 		$this->checkout = $checkout;
 		$this->_reset_success_message();
 		$this->set_instructions(
@@ -155,7 +155,7 @@ 
 	/**
 	 * @param null $line_item_display
 	 */
-	public function set_line_item_display( $line_item_display ) {
+	public function set_line_item_display($line_item_display) {
 		$this->line_item_display = $line_item_display;
 	}
 
@@ -173,8 +173,8 @@ 
 	/**
 	 * @param boolean $handle_IPN_in_this_request
 	 */
-	public function set_handle_IPN_in_this_request( $handle_IPN_in_this_request ) {
-		$this->handle_IPN_in_this_request = filter_var( $handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN );
+	public function set_handle_IPN_in_this_request($handle_IPN_in_this_request) {
+		$this->handle_IPN_in_this_request = filter_var($handle_IPN_in_this_request, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -209,15 +209,15 @@ 
 	public function enqueue_styles_and_scripts() {
 		$transaction = $this->checkout->transaction;
 		//if the transaction isn't set or nothing is owed on it, don't enqueue any JS
-		if( ! $transaction instanceof EE_Transaction 
-			|| EEH_Money::compare_floats( $transaction->remaining(), 0 ) ) {
+		if ( ! $transaction instanceof EE_Transaction 
+			|| EEH_Money::compare_floats($transaction->remaining(), 0)) {
 			return;
 		}
-		foreach( EEM_Payment_Method::instance()->get_all_for_transaction( $transaction, EEM_Payment_Method::scope_cart ) as $payment_method ) {
+		foreach (EEM_Payment_Method::instance()->get_all_for_transaction($transaction, EEM_Payment_Method::scope_cart) as $payment_method) {
 			$type_obj = $payment_method->type_obj();
-			if( $type_obj instanceof EE_PMT_Base ) {
-				$billing_form = $type_obj->generate_new_billing_form( $transaction );
-				if( $billing_form instanceof EE_Form_Section_Proper ) {
+			if ($type_obj instanceof EE_PMT_Base) {
+				$billing_form = $type_obj->generate_new_billing_form($transaction);
+				if ($billing_form instanceof EE_Form_Section_Proper) {
 					$billing_form->enqueue_js();
 				}
 			}
@@ -242,20 +242,20 @@ 
 			// 	$ 0.00 transactions (no payment required)
 			! $this->checkout->payment_required()
 			// but do NOT remove if current action being called belongs to this reg step
-			&& ! is_callable( array( $this, $this->checkout->action ) )
+			&& ! is_callable(array($this, $this->checkout->action))
 			&& ! $this->completed()
 		) {
 			// and if so, then we no longer need the Payment Options step
-			if ( $this->is_current_step() ) {
+			if ($this->is_current_step()) {
 				$this->checkout->generate_reg_form = false;
 			}
-			$this->checkout->remove_reg_step( $this->_slug );
+			$this->checkout->remove_reg_step($this->_slug);
 			// DEBUG LOG
 			//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
 			return false;
 		}
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		// get all active payment methods
 		$this->checkout->available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 			$this->checkout->transaction,
@@ -281,8 +281,8 @@ 
 		$sold_out_events = array();
 		$reg_count = 0;
 		// loop thru registrations to gather info
-		$registrations = $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params );
-		foreach ( $registrations as $registration ) {
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		foreach ($registrations as $registration) {
 			/** @var $registration EE_Registration */
 			$reg_count++;
 			// if returning registrant is Approved then do NOT do this
@@ -292,9 +292,9 @@ 
 				&& $registration->status_ID() === EEM_Registration::status_id_approved
 			)
 			) {
-				if ( $registration->event()->is_sold_out() || $registration->event()->is_sold_out( true ) ) {
+				if ($registration->event()->is_sold_out() || $registration->event()->is_sold_out(true)) {
 					// add event to list of events that are sold out
-					$sold_out_events[ $registration->event()->ID() ] = $registration->event();
+					$sold_out_events[$registration->event()->ID()] = $registration->event();
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__sold_out_event',
 						$registration->event(),
@@ -302,9 +302,9 @@ 
 					);
 				}
 				// event requires admin approval
-				if ( $registration->status_ID() === EEM_Registration::status_id_not_approved ) {
+				if ($registration->status_ID() === EEM_Registration::status_id_not_approved) {
 					// add event to list of events with pre-approval reg status
-					$registrations_requiring_pre_approval[ $registration->ID() ] = $registration;
+					$registrations_requiring_pre_approval[$registration->ID()] = $registration;
 					do_action(
 						'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_pre_approval',
 						$registration->event(),
@@ -313,8 +313,8 @@ 
 				}
 			}
 			// are they allowed to pay now and is there monies owing?
-			if ( $registration->owes_monies_and_can_pay() ) {
-				$registrations_requiring_payment[ $registration->ID() ] = $registration;
+			if ($registration->owes_monies_and_can_pay()) {
+				$registrations_requiring_payment[$registration->ID()] = $registration;
 				do_action(
 					'AHEE__EE_SPCO_Reg_Step_Payment_Options__generate_reg_form__event_requires_payment',
 					$registration->event(),
@@ -325,23 +325,23 @@ 
 				&& $registration->status_ID() !== EEM_Registration::status_id_not_approved
 				&& $registration->ticket()->is_free()
 			) {
-				$registrations_for_free_events[ $registration->event()->ID() ] = $registration;
+				$registrations_for_free_events[$registration->event()->ID()] = $registration;
 			}
 		}
 		$subsections = array();
 		// now decide which template to load
-		if ( ! empty( $sold_out_events ) ) {
-			$subsections['sold_out_events'] = $this->_sold_out_events( $sold_out_events );
+		if ( ! empty($sold_out_events)) {
+			$subsections['sold_out_events'] = $this->_sold_out_events($sold_out_events);
 		}
-		if ( ! empty( $registrations_requiring_pre_approval ) ) {
+		if ( ! empty($registrations_requiring_pre_approval)) {
 			$subsections['registrations_requiring_pre_approval'] = $this->_registrations_requiring_pre_approval(
 				$registrations_requiring_pre_approval
 			);
 		}
-		if ( ! empty( $registrations_for_free_events ) ) {
-			$subsections['no_payment_required'] = $this->_no_payment_required( $registrations_for_free_events );
+		if ( ! empty($registrations_for_free_events)) {
+			$subsections['no_payment_required'] = $this->_no_payment_required($registrations_for_free_events);
 		}
-		if ( ! empty( $registrations_requiring_payment ) ) {
+		if ( ! empty($registrations_requiring_payment)) {
 			// autoload Line_Item_Display classes
 			EEH_Autoloader::register_line_item_filter_autoloaders();
 			$line_item_filter_processor = new EE_Line_Item_Filter_Processor(
@@ -353,17 +353,17 @@ 
 			);
 			/** @var EE_Line_Item $filtered_line_item_tree */
 			$filtered_line_item_tree = $line_item_filter_processor->process();
-			if ( $this->checkout->amount_owing > 0 ) {
+			if ($this->checkout->amount_owing > 0) {
 				EEH_Autoloader::register_line_item_display_autoloaders();
-				$this->set_line_item_display( new EE_Line_Item_Display( 'spco' ) );
+				$this->set_line_item_display(new EE_Line_Item_Display('spco'));
 				$subsections['payment_options'] = $this->_display_payment_options(
 					$this->line_item_display->display_line_item(
 						$filtered_line_item_tree,
-						array( 'registrations' => $registrations )
+						array('registrations' => $registrations)
 					)
 				);
 				$this->checkout->amount_owing = $filtered_line_item_tree->total();
-				$this->_apply_registration_payments_to_amount_owing( $registrations );
+				$this->_apply_registration_payments_to_amount_owing($registrations);
 			}
 		} else {
 			$this->_hide_reg_step_submit_button_if_revisit();
@@ -393,7 +393,7 @@ 
 	 * @param \EE_Line_Item_Filter_Collection $line_item_filter_collection
 	 * @return \EE_Line_Item_Filter_Collection
 	 */
-	public static function add_spco_line_item_filters( EE_Line_Item_Filter_Collection $line_item_filter_collection ) {
+	public static function add_spco_line_item_filters(EE_Line_Item_Filter_Collection $line_item_filter_collection) {
 		$line_item_filter_collection->add(
 			new EE_Billable_Line_Item_Filter(
 				EE_Registry::instance()->SSN->checkout()->transaction->registrations(
@@ -401,7 +401,7 @@ 
 				)
 			)
 		);
-		$line_item_filter_collection->add( new EE_Non_Zero_Line_Item_Filter() );
+		$line_item_filter_collection->add(new EE_Non_Zero_Line_Item_Filter());
 		return $line_item_filter_collection;
 	}
 
@@ -415,8 +415,8 @@ 
 	 * @return void
 	 */
 	protected function _hide_reg_step_submit_button_if_revisit() {
-		if ( $this->checkout->revisit ) {
-			add_filter( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string' );
+		if ($this->checkout->revisit) {
+			add_filter('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', '__return_empty_string');
 		}
 	}
 
@@ -429,13 +429,13 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _sold_out_events( $sold_out_events_array = array() ) {
+	private function _sold_out_events($sold_out_events_array = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'events_sold_out';
 		$sold_out_events = '';
-		foreach ( $sold_out_events_array as $sold_out_event ) {
+		foreach ($sold_out_events_array as $sold_out_event) {
 			$sold_out_events .= EEH_HTML::li(
-				EEH_HTML::span( $sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text' )
+				EEH_HTML::span($sold_out_event->name(), '', 'dashicons dashicons-marker ee-icon-size-16 pink-text')
 			);
 		}
 		return new EE_Form_Section_Proper(
@@ -480,17 +480,17 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _registrations_requiring_pre_approval( $registrations_requiring_pre_approval = array() ) {
+	private function _registrations_requiring_pre_approval($registrations_requiring_pre_approval = array()) {
 		$events_requiring_pre_approval = '';
-		foreach ( $registrations_requiring_pre_approval as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->event() instanceof EE_Event ) {
-				$events_requiring_pre_approval[ $registration->event()->ID() ] = EEH_HTML::li(
+		foreach ($registrations_requiring_pre_approval as $registration) {
+			if ($registration instanceof EE_Registration && $registration->event() instanceof EE_Event) {
+				$events_requiring_pre_approval[$registration->event()->ID()] = EEH_HTML::li(
 					EEH_HTML::span(
 						'',
 						'',
 						'dashicons dashicons-marker ee-icon-size-16 orange-text'
 					)
-					. EEH_HTML::span( $registration->event()->name(), '', 'orange-text' )
+					. EEH_HTML::span($registration->event()->name(), '', 'orange-text')
 				);
 			}
 		}
@@ -509,7 +509,7 @@ 
 						'template_args'        => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___sold_out_events__template_args',
 							array(
-								'events_requiring_pre_approval'     => implode( '', $events_requiring_pre_approval ),
+								'events_requiring_pre_approval'     => implode('', $events_requiring_pre_approval),
 								'events_requiring_pre_approval_msg' => apply_filters(
 									'FHEE__EE_SPCO_Reg_Step_Payment_Options___events_requiring_pre_approval__events_requiring_pre_approval_msg',
 									__(
@@ -534,7 +534,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _no_payment_required( $registrations_for_free_events = array() ) {
+	private function _no_payment_required($registrations_for_free_events = array()) {
 		// set some defaults
 		$this->checkout->selected_method_of_payment = 'no_payment_required';
 		// generate no_payment_required form
@@ -558,7 +558,7 @@ 
 								'ticket_count'                  => array(),
 								'registrations_for_free_events' => $registrations_for_free_events,
 								'no_payment_required_msg'       => EEH_HTML::p(
-									__( 'This is a free event, so no billing will occur.', 'event_espresso' )
+									__('This is a free event, so no billing will occur.', 'event_espresso')
 								)
 							)
 						),
@@ -577,7 +577,7 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _display_payment_options( $transaction_details = '' ) {
+	private function _display_payment_options($transaction_details = '') {
 		// has method_of_payment been set by no-js user?
 		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment();
 		// build payment options form
@@ -589,18 +589,18 @@ 
 						'before_payment_options' => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__before_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy' => new EE_Div_Per_Section_Layout() )
+								array('layout_strategy' => new EE_Div_Per_Section_Layout())
 							)
 						),
 						'payment_options'        => $this->_setup_payment_options(),
 						'after_payment_options'  => apply_filters(
 							'FHEE__EE_SPCO_Reg_Step_Payment_Options___display_payment_options__after_payment_options',
 							new EE_Form_Section_Proper(
-								array( 'layout_strategy' => new EE_Div_Per_Section_Layout() )
+								array('layout_strategy' => new EE_Div_Per_Section_Layout())
 							)
 						),
 						'default_hidden_inputs'  => $this->reg_step_hidden_inputs(),
-						'extra_hidden_inputs'    => $this->_extra_hidden_inputs( false )
+						'extra_hidden_inputs'    => $this->_extra_hidden_inputs(false)
 					),
 					'layout_strategy' => new EE_Template_Layout(
 						array(
@@ -629,10 +629,10 @@ 
 	 * @return \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _extra_hidden_inputs( $no_payment_required = true ) {
+	private function _extra_hidden_inputs($no_payment_required = true) {
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id'         => 'ee-' . $this->slug() . '-extra-hidden-inputs',
+				'html_id'         => 'ee-'.$this->slug().'-extra-hidden-inputs',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
 					'spco_no_payment_required' => new EE_Hidden_Input(
@@ -664,16 +664,16 @@ 
 	 * @access protected
 	 * @param array $registrations
 	 */
-	protected function _apply_registration_payments_to_amount_owing( array $registrations ) {
+	protected function _apply_registration_payments_to_amount_owing(array $registrations) {
 		$payments = array();
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration && $registration->owes_monies_and_can_pay() ) {
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration && $registration->owes_monies_and_can_pay()) {
 				$payments += $registration->registration_payments();
 			}
 		}
-		if ( ! empty( $payments ) ) {
-			foreach ( $payments as $payment ) {
-				if ( $payment instanceof EE_Registration_Payment ) {
+		if ( ! empty($payments)) {
+			foreach ($payments as $payment) {
+				if ($payment instanceof EE_Registration_Payment) {
 					$this->checkout->amount_owing -= $payment->amount();
 				}
 			}
@@ -689,11 +689,11 @@ 
 	 * @param    bool $force_reset
 	 * @return    void
 	 */
-	private function _reset_selected_method_of_payment( $force_reset = false ) {
+	private function _reset_selected_method_of_payment($force_reset = false) {
 		$reset_payment_method = $force_reset
 			? true
-			: sanitize_text_field( EE_Registry::instance()->REQ->get( 'reset_payment_method', false ) );
-		if ( $reset_payment_method ) {
+			: sanitize_text_field(EE_Registry::instance()->REQ->get('reset_payment_method', false));
+		if ($reset_payment_method) {
 			$this->checkout->selected_method_of_payment = null;
 			$this->checkout->payment_method = null;
 			$this->checkout->billing_form = null;
@@ -712,12 +712,12 @@ 
 	 * @param string $selected_method_of_payment
 	 * @return        EE_Billing_Info_Form
 	 */
-	private function _save_selected_method_of_payment( $selected_method_of_payment = '' ) {
-		$selected_method_of_payment = ! empty( $selected_method_of_payment )
+	private function _save_selected_method_of_payment($selected_method_of_payment = '') {
+		$selected_method_of_payment = ! empty($selected_method_of_payment)
 			? $selected_method_of_payment
 			: $this->checkout->selected_method_of_payment;
 		EE_Registry::instance()->SSN->set_session_data(
-			array( 'selected_method_of_payment' => $selected_method_of_payment )
+			array('selected_method_of_payment' => $selected_method_of_payment)
 		);
 	}
 
@@ -733,19 +733,19 @@ 
 		// load payment method classes
 		$this->checkout->available_payment_methods = $this->_get_available_payment_methods();
 		// switch up header depending on number of available payment methods
-		$payment_method_header = count( $this->checkout->available_payment_methods ) > 1
+		$payment_method_header = count($this->checkout->available_payment_methods) > 1
 			? apply_filters(
 				'FHEE__registration_page_payment_options__method_of_payment_hdr',
-				__( 'Please Select Your Method of Payment', 'event_espresso' )
+				__('Please Select Your Method of Payment', 'event_espresso')
 			)
 			: apply_filters(
 				'FHEE__registration_page_payment_options__method_of_payment_hdr',
-				__( 'Method of Payment', 'event_espresso' )
+				__('Method of Payment', 'event_espresso')
 			);
 		$available_payment_methods = array(
 			// display the "Payment Method" header
 			'payment_method_header' => new EE_Form_Section_HTML(
-				EEH_HTML::h4( $payment_method_header, 'method-of-payment-hdr' )
+				EEH_HTML::h4($payment_method_header, 'method-of-payment-hdr')
 			)
 		);
 		// the list of actual payment methods ( invoice, paypal, etc ) in a  ( slug => HTML )  format
@@ -754,32 +754,32 @@ 
 		// additional instructions to be displayed and hidden below payment methods (adding a clearing div to start)
 		$payment_methods_billing_info = array(
 			new EE_Form_Section_HTML(
-				EEH_HTML::div( '<br />', '', '', 'clear:both;' )
+				EEH_HTML::div('<br />', '', '', 'clear:both;')
 			)
 		);
 		// loop through payment methods
-		foreach ( $this->checkout->available_payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
+		foreach ($this->checkout->available_payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				$payment_method_button = EEH_HTML::img(
 					$payment_method->button_url(),
 					$payment_method->name(),
-					'spco-payment-method-' . $payment_method->slug() . '-btn-img',
+					'spco-payment-method-'.$payment_method->slug().'-btn-img',
 					'spco-payment-method-btn-img'
 				);
 				// check if any payment methods are set as default
 				// if payment method is already selected OR nothing is selected and this payment method should be open_by_default
 				if (
-					( $this->checkout->selected_method_of_payment === $payment_method->slug() )
-					|| ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default() )
+					($this->checkout->selected_method_of_payment === $payment_method->slug())
+					|| ( ! $this->checkout->selected_method_of_payment && $payment_method->open_by_default())
 				) {
 					$this->checkout->selected_method_of_payment = $payment_method->slug();
 					$this->_save_selected_method_of_payment();
-					$default_payment_method_option[ $payment_method->slug() ] = $payment_method_button;
+					$default_payment_method_option[$payment_method->slug()] = $payment_method_button;
 				} else {
-					$available_payment_method_options[ $payment_method->slug() ] = $payment_method_button;
+					$available_payment_method_options[$payment_method->slug()] = $payment_method_button;
 				}
-				$payment_methods_billing_info[ $payment_method->slug()
-				                               . '-info' ] = $this->_payment_method_billing_info(
+				$payment_methods_billing_info[$payment_method->slug()
+				                               . '-info'] = $this->_payment_method_billing_info(
 					$payment_method
 				);
 			}
@@ -809,12 +809,12 @@ 
 	 * @return EE_Payment_Method[]
 	 */
 	protected function _get_available_payment_methods() {
-		if ( ! empty( $this->checkout->available_payment_methods ) ) {
+		if ( ! empty($this->checkout->available_payment_methods)) {
 			return $this->checkout->available_payment_methods;
 		}
 		$available_payment_methods = array();
 		// load EEM_Payment_Method
-		EE_Registry::instance()->load_model( 'Payment_Method' );
+		EE_Registry::instance()->load_model('Payment_Method');
 		/** @type EEM_Payment_Method $EEM_Payment_Method */
 		$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
 		// get all active payment methods
@@ -822,9 +822,9 @@ 
 			$this->checkout->transaction,
 			EEM_Payment_Method::scope_cart
 		);
-		foreach ( $payment_methods as $payment_method ) {
-			if ( $payment_method instanceof EE_Payment_Method ) {
-				$available_payment_methods[ $payment_method->slug() ] = $payment_method;
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$available_payment_methods[$payment_method->slug()] = $payment_method;
 			}
 		}
 		return $available_payment_methods;
@@ -839,14 +839,14 @@ 
 	 * @param    array $available_payment_method_options
 	 * @return    \EE_Form_Section_Proper
 	 */
-	private function _available_payment_method_inputs( $available_payment_method_options = array() ) {
+	private function _available_payment_method_inputs($available_payment_method_options = array()) {
 		// generate inputs
 		return new EE_Form_Section_Proper(
 			array(
 				'html_id'         => 'ee-available-payment-method-inputs',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
-					'' => new EE_Radio_Button_Input (
+					'' => new EE_Radio_Button_Input(
 						$available_payment_method_options,
 						array(
 							'html_name'          => 'selected_method_of_payment',
@@ -871,28 +871,28 @@ 
 	 * @return    \EE_Form_Section_Proper
 	 * @throws \EE_Error
 	 */
-	private function _payment_method_billing_info( EE_Payment_Method $payment_method ) {
+	private function _payment_method_billing_info(EE_Payment_Method $payment_method) {
 		$currently_selected = $this->checkout->selected_method_of_payment === $payment_method->slug()
 			? true
 			: false;
 		// generate the billing form for payment method
 		$billing_form = $currently_selected
-			? $this->_get_billing_form_for_payment_method( $payment_method )
+			? $this->_get_billing_form_for_payment_method($payment_method)
 			: new EE_Form_Section_HTML();
 		$this->checkout->billing_form = $currently_selected
 			? $billing_form
 			: $this->checkout->billing_form;
 		// it's all in the details
 		$info_html = EEH_HTML::h3(
-			__( 'Important information regarding your payment', 'event_espresso' ),
+			__('Important information regarding your payment', 'event_espresso'),
 			'',
 			'spco-payment-method-hdr'
 		);
 		// add some info regarding the step, either from what's saved in the admin,
 		// or a default string depending on whether the PM has a billing form or not
-		if ( $payment_method->description() ) {
+		if ($payment_method->description()) {
 			$payment_method_info = $payment_method->description();
-		} elseif ( $billing_form instanceof EE_Billing_Info_Form ) {
+		} elseif ($billing_form instanceof EE_Billing_Info_Form) {
 			$payment_method_info = sprintf(
 				__(
 					'Please provide the following billing information, then click the "%1$s" button below in order to proceed.',
@@ -902,7 +902,7 @@ 
 			);
 		} else {
 			$payment_method_info = sprintf(
-				__( 'Please click the "%1$s" button below in order to proceed.', 'event_espresso' ),
+				__('Please click the "%1$s" button below in order to proceed.', 'event_espresso'),
 				$this->submit_button_text()
 			);
 		}
@@ -916,13 +916,13 @@ 
 		);
 		return new EE_Form_Section_Proper(
 			array(
-				'html_id'         => 'spco-payment-method-info-' . $payment_method->slug(),
+				'html_id'         => 'spco-payment-method-info-'.$payment_method->slug(),
 				'html_class'      => 'spco-payment-method-info-dv',
 				// only display the selected or default PM
 				'html_style'      => $currently_selected ? '' : 'display:none;',
 				'layout_strategy' => new EE_Div_Per_Section_Layout(),
 				'subsections'     => array(
-					'info'         => new EE_Form_Section_HTML( $info_html ),
+					'info'         => new EE_Form_Section_HTML($info_html),
 					'billing_form' => $currently_selected ? $billing_form : new EE_Form_Section_HTML()
 				)
 			)
@@ -940,15 +940,15 @@ 
 	 */
 	public function get_billing_form_html_for_payment_method() {
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			return false;
 		}
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 			false
-		) ) {
+		)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -963,7 +963,7 @@ 
 			);
 		}
 		// now generate billing form for selected method of payment
-		$payment_method_billing_form = $this->_get_billing_form_for_payment_method( $this->checkout->payment_method );
+		$payment_method_billing_form = $this->_get_billing_form_for_payment_method($this->checkout->payment_method);
 		// fill form with attendee info if applicable
 		if (
 			$payment_method_billing_form instanceof EE_Billing_Attendee_Info_Form
@@ -985,10 +985,10 @@ 
 		$billing_info = $payment_method_billing_form instanceof EE_Form_Section_Proper
 			? $payment_method_billing_form->get_html()
 			: '';
-		$this->checkout->json_response->set_return_data( array( 'payment_method_info' => $billing_info ) );
+		$this->checkout->json_response->set_return_data(array('payment_method_info' => $billing_info));
 		// localize validation rules for main form
 		$this->checkout->current_step->reg_form->localize_validation_rules();
-		$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+		$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		return true;
 	}
 
@@ -1002,18 +1002,18 @@ 
 	 * @return \EE_Billing_Info_Form
 	 * @throws \EE_Error
 	 */
-	private function _get_billing_form_for_payment_method( EE_Payment_Method $payment_method ) {
+	private function _get_billing_form_for_payment_method(EE_Payment_Method $payment_method) {
 		$billing_form = $payment_method->type_obj()->billing_form(
 			$this->checkout->transaction,
-			array( 'amount_owing' => $this->checkout->amount_owing )
+			array('amount_owing' => $this->checkout->amount_owing)
 		);
-		if ( $billing_form instanceof EE_Billing_Info_Form ) {
+		if ($billing_form instanceof EE_Billing_Info_Form) {
 			if (
 				apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 					false
 				)
-				&& EE_Registry::instance()->REQ->is_set( 'payment_method' )
+				&& EE_Registry::instance()->REQ->is_set('payment_method')
 			) {
 				EE_Error::add_success(
 					apply_filters(
@@ -1055,15 +1055,15 @@ 
 		$request_param = 'selected_method_of_payment'
 	) {
 		// is selected_method_of_payment set in the request ?
-		$selected_method_of_payment = EE_Registry::instance()->REQ->get( $request_param, false );
-		if ( $selected_method_of_payment ) {
+		$selected_method_of_payment = EE_Registry::instance()->REQ->get($request_param, false);
+		if ($selected_method_of_payment) {
 			// sanitize it
-			$selected_method_of_payment = is_array( $selected_method_of_payment )
-				? array_shift( $selected_method_of_payment )
+			$selected_method_of_payment = is_array($selected_method_of_payment)
+				? array_shift($selected_method_of_payment)
 				: $selected_method_of_payment;
-			$selected_method_of_payment = sanitize_text_field( $selected_method_of_payment );
+			$selected_method_of_payment = sanitize_text_field($selected_method_of_payment);
 			// store it in the session so that it's available for all subsequent requests including AJAX
-			$this->_save_selected_method_of_payment( $selected_method_of_payment );
+			$this->_save_selected_method_of_payment($selected_method_of_payment);
 		} else {
 			// or is is set in the session ?
 			$selected_method_of_payment = EE_Registry::instance()->SSN->get_session_data(
@@ -1071,7 +1071,7 @@ 
 			);
 		}
 		// do ya really really gotta have it?
-		if ( empty( $selected_method_of_payment ) && $required ) {
+		if (empty($selected_method_of_payment) && $required) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1080,7 +1080,7 @@ 
 					),
 					'<br/>',
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1107,13 +1107,13 @@ 
 	 * @throws \EE_Error
 	 */
 	public function switch_payment_method() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return false;
 		}
-		if ( apply_filters(
+		if (apply_filters(
 			'FHEE__EE_SPCO_Reg_Step_Payment_Options__registration_checkout__selected_payment_method__display_success',
 			false
-		) ) {
+		)) {
 			EE_Error::add_success(
 				apply_filters(
 					'FHEE__Single_Page_Checkout__registration_checkout__selected_payment_method',
@@ -1128,13 +1128,13 @@ 
 			);
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 		}
 		// fill form with attendee info if applicable
-		if ( $this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form
+		if ($this->checkout->billing_form instanceof EE_Billing_Attendee_Info_Form
 		     && $this->checkout->transaction_has_primary_registrant()
 		) {
 			$this->checkout->billing_form->populate_from_attendee(
@@ -1142,7 +1142,7 @@ 
 			);
 		}
 		// and debug content
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form
 		     && $this->checkout->payment_method->type_obj() instanceof EE_PMT_Base
 		) {
 			$this->checkout->billing_form = $this->checkout->payment_method->type_obj()->apply_billing_form_debug_settings(
@@ -1150,15 +1150,15 @@ 
 			);
 		}
 		// get html and validation rules for form
-		if ( $this->checkout->billing_form instanceof EE_Form_Section_Proper ) {
+		if ($this->checkout->billing_form instanceof EE_Form_Section_Proper) {
 			$this->checkout->json_response->set_return_data(
-				array( 'payment_method_info' => $this->checkout->billing_form->get_html() )
+				array('payment_method_info' => $this->checkout->billing_form->get_html())
 			);
 			// localize validation rules for main form
-			$this->checkout->billing_form->localize_validation_rules( true );
-			$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+			$this->checkout->billing_form->localize_validation_rules(true);
+			$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 		} else {
-			$this->checkout->json_response->set_return_data( array( 'payment_method_info' => '' ) );
+			$this->checkout->json_response->set_return_data(array('payment_method_info' => ''));
 		}
 		//prevents advancement to next step
 		$this->checkout->continue_reg = false;
@@ -1175,12 +1175,12 @@ 
 	 */
 	protected function _verify_payment_method_is_set() {
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			// how have they chosen to pay?
-			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+			$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		}
 		// verify payment method
-		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method ) {
+		if ( ! $this->checkout->payment_method instanceof EE_Payment_Method) {
 			// get payment method for selected method of payment
 			$this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment();
 		}
@@ -1199,25 +1199,25 @@ 
 	 * @throws \EE_Error
 	 */
 	public function save_payer_details_via_ajax() {
-		if ( ! $this->_verify_payment_method_is_set() ) {
+		if ( ! $this->_verify_payment_method_is_set()) {
 			return;
 		}
 		// generate billing form for selected method of payment if it hasn't been done already
-		if ( $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ($this->checkout->payment_method->type_obj()->has_billing_form()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 		}
 		// generate primary attendee from payer info if applicable
-		if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			$attendee = $this->_create_attendee_from_request_data();
-			if ( $attendee instanceof EE_Attendee ) {
-				foreach ( $this->checkout->transaction->registrations() as $registration ) {
-					if ( $registration->is_primary_registrant() ) {
+			if ($attendee instanceof EE_Attendee) {
+				foreach ($this->checkout->transaction->registrations() as $registration) {
+					if ($registration->is_primary_registrant()) {
 						$this->checkout->primary_attendee_obj = $attendee;
-						$registration->_add_relation_to( $attendee, 'Attendee' );
-						$registration->set_attendee_id( $attendee->ID() );
-						$registration->update_cache_after_object_save( 'Attendee', $attendee );
+						$registration->_add_relation_to($attendee, 'Attendee');
+						$registration->set_attendee_id($attendee->ID());
+						$registration->update_cache_after_object_save('Attendee', $attendee);
 					}
 				}
 			}
@@ -1234,50 +1234,50 @@ 
 	 */
 	protected function _create_attendee_from_request_data() {
 		// get State ID
-		$STA_ID = ! empty( $_REQUEST['state'] ) ? sanitize_text_field( $_REQUEST['state'] ) : '';
-		if ( ! empty( $STA_ID ) ) {
+		$STA_ID = ! empty($_REQUEST['state']) ? sanitize_text_field($_REQUEST['state']) : '';
+		if ( ! empty($STA_ID)) {
 			// can we get state object from name ?
-			EE_Registry::instance()->load_model( 'State' );
-			$state = EEM_State::instance()->get_col( array( array( 'STA_name' => $STA_ID ), 'limit' => 1 ), 'STA_ID' );
-			$STA_ID = is_array( $state ) && ! empty( $state ) ? reset( $state ) : $STA_ID;
+			EE_Registry::instance()->load_model('State');
+			$state = EEM_State::instance()->get_col(array(array('STA_name' => $STA_ID), 'limit' => 1), 'STA_ID');
+			$STA_ID = is_array($state) && ! empty($state) ? reset($state) : $STA_ID;
 		}
 		// get Country ISO
-		$CNT_ISO = ! empty( $_REQUEST['country'] ) ? sanitize_text_field( $_REQUEST['country'] ) : '';
-		if ( ! empty( $CNT_ISO ) ) {
+		$CNT_ISO = ! empty($_REQUEST['country']) ? sanitize_text_field($_REQUEST['country']) : '';
+		if ( ! empty($CNT_ISO)) {
 			// can we get country object from name ?
-			EE_Registry::instance()->load_model( 'Country' );
+			EE_Registry::instance()->load_model('Country');
 			$country = EEM_Country::instance()->get_col(
-				array( array( 'CNT_name' => $CNT_ISO ), 'limit' => 1 ),
+				array(array('CNT_name' => $CNT_ISO), 'limit' => 1),
 				'CNT_ISO'
 			);
-			$CNT_ISO = is_array( $country ) && ! empty( $country ) ? reset( $country ) : $CNT_ISO;
+			$CNT_ISO = is_array($country) && ! empty($country) ? reset($country) : $CNT_ISO;
 		}
 		// grab attendee data
 		$attendee_data = array(
-			'ATT_fname'    => ! empty( $_REQUEST['first_name'] ) ? sanitize_text_field( $_REQUEST['first_name'] ) : '',
-			'ATT_lname'    => ! empty( $_REQUEST['last_name'] ) ? sanitize_text_field( $_REQUEST['last_name'] ) : '',
-			'ATT_email'    => ! empty( $_REQUEST['email'] ) ? sanitize_email( $_REQUEST['email'] ) : '',
-			'ATT_address'  => ! empty( $_REQUEST['address'] ) ? sanitize_text_field( $_REQUEST['address'] ) : '',
-			'ATT_address2' => ! empty( $_REQUEST['address2'] ) ? sanitize_text_field( $_REQUEST['address2'] ) : '',
-			'ATT_city'     => ! empty( $_REQUEST['city'] ) ? sanitize_text_field( $_REQUEST['city'] ) : '',
+			'ATT_fname'    => ! empty($_REQUEST['first_name']) ? sanitize_text_field($_REQUEST['first_name']) : '',
+			'ATT_lname'    => ! empty($_REQUEST['last_name']) ? sanitize_text_field($_REQUEST['last_name']) : '',
+			'ATT_email'    => ! empty($_REQUEST['email']) ? sanitize_email($_REQUEST['email']) : '',
+			'ATT_address'  => ! empty($_REQUEST['address']) ? sanitize_text_field($_REQUEST['address']) : '',
+			'ATT_address2' => ! empty($_REQUEST['address2']) ? sanitize_text_field($_REQUEST['address2']) : '',
+			'ATT_city'     => ! empty($_REQUEST['city']) ? sanitize_text_field($_REQUEST['city']) : '',
 			'STA_ID'       => $STA_ID,
 			'CNT_ISO'      => $CNT_ISO,
-			'ATT_zip'      => ! empty( $_REQUEST['zip'] ) ? sanitize_text_field( $_REQUEST['zip'] ) : '',
-			'ATT_phone'    => ! empty( $_REQUEST['phone'] ) ? sanitize_text_field( $_REQUEST['phone'] ) : '',
+			'ATT_zip'      => ! empty($_REQUEST['zip']) ? sanitize_text_field($_REQUEST['zip']) : '',
+			'ATT_phone'    => ! empty($_REQUEST['phone']) ? sanitize_text_field($_REQUEST['phone']) : '',
 		);
 		// validate the email address since it is the most important piece of info
-		if ( empty( $attendee_data['ATT_email'] ) || $attendee_data['ATT_email'] !== $_REQUEST['email'] ) {
+		if (empty($attendee_data['ATT_email']) || $attendee_data['ATT_email'] !== $_REQUEST['email']) {
 			EE_Error::add_error(
-				__( 'An invalid email address was submitted.', 'event_espresso' ),
+				__('An invalid email address was submitted.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
 			);
 		}
 		// does this attendee already exist in the db ? we're searching using a combination of first name, last name, AND email address
-		if ( ! empty( $attendee_data['ATT_fname'] )
-		     && ! empty( $attendee_data['ATT_lname'] )
-		     && ! empty( $attendee_data['ATT_email'] )
+		if ( ! empty($attendee_data['ATT_fname'])
+		     && ! empty($attendee_data['ATT_lname'])
+		     && ! empty($attendee_data['ATT_email'])
 		) {
 			$existing_attendee = EE_Registry::instance()->LIB->EEM_Attendee->find_existing_attendee(
 				array(
@@ -1286,19 +1286,19 @@ 
 					'ATT_email' => $attendee_data['ATT_email']
 				)
 			);
-			if ( $existing_attendee instanceof EE_Attendee ) {
+			if ($existing_attendee instanceof EE_Attendee) {
 				return $existing_attendee;
 			}
 		}
 		// no existing attendee? kk let's create a new one
 		// kinda lame, but we need a first and last name to create an attendee, so use the email address if those don't exist
-		$attendee_data['ATT_fname'] = ! empty( $attendee_data['ATT_fname'] )
+		$attendee_data['ATT_fname'] = ! empty($attendee_data['ATT_fname'])
 			? $attendee_data['ATT_fname']
 			: $attendee_data['ATT_email'];
-		$attendee_data['ATT_lname'] = ! empty( $attendee_data['ATT_lname'] )
+		$attendee_data['ATT_lname'] = ! empty($attendee_data['ATT_lname'])
 			? $attendee_data['ATT_lname']
 			: $attendee_data['ATT_email'];
-		return EE_Attendee::new_instance( $attendee_data );
+		return EE_Attendee::new_instance($attendee_data);
 	}
 
 
@@ -1316,26 +1316,26 @@ 
 		// how have they chosen to pay?
 		$this->checkout->selected_method_of_payment = $this->checkout->transaction->is_free()
 			? 'no_payment_required'
-			: $this->_get_selected_method_of_payment( true );
+			: $this->_get_selected_method_of_payment(true);
 		// choose your own adventure based on method_of_payment
-		switch ( $this->checkout->selected_method_of_payment ) {
+		switch ($this->checkout->selected_method_of_payment) {
 
 			case 'events_sold_out' :
 				$this->checkout->redirect = true;
 				$this->checkout->redirect_url = $this->checkout->cancel_page_url;
-				$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+				$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 				// mark this reg step as completed
 				$this->set_completed();
 				return false;
 				break;
 
 			case 'payments_closed' :
-				if ( apply_filters(
+				if (apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__payments_closed__display_success',
 					false
-				) ) {
+				)) {
 					EE_Error::add_success(
-						__( 'no payment required at this time.', 'event_espresso' ),
+						__('no payment required at this time.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1347,12 +1347,12 @@ 
 				break;
 
 			case 'no_payment_required' :
-				if ( apply_filters(
+				if (apply_filters(
 					'FHEE__EE_SPCO_Reg_Step_Payment_Options__process_reg_step__no_payment_required__display_success',
 					false
-				) ) {
+				)) {
 					EE_Error::add_success(
-						__( 'no payment required.', 'event_espresso' ),
+						__('no payment required.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -1365,9 +1365,9 @@ 
 
 			default:
 				$payment_successful = $this->_process_payment();
-				if ( $payment_successful ) {
+				if ($payment_successful) {
 					$this->checkout->continue_reg = true;
-					$this->_maybe_set_completed( $this->checkout->payment_method );
+					$this->_maybe_set_completed($this->checkout->payment_method);
 				} else {
 					$this->checkout->continue_reg = false;
 				}
@@ -1386,8 +1386,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _maybe_set_completed( EE_Payment_Method $payment_method ) {
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+	protected function _maybe_set_completed(EE_Payment_Method $payment_method) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				break;
 			case EE_PMT_Base::onsite :
@@ -1410,7 +1410,7 @@ 
 	public function update_reg_step() {
 		$success = true;
 		// if payment required
-		if ( $this->checkout->transaction->total() > 0 ) {
+		if ($this->checkout->transaction->total() > 0) {
 			do_action(
 				'AHEE__EE_Single_Page_Checkout__process_finalize_registration__before_gateway',
 				$this->checkout->transaction
@@ -1418,13 +1418,13 @@ 
 			// attempt payment via payment method
 			$success = $this->process_reg_step();
 		}
-		if ( $success && ! $this->checkout->redirect ) {
+		if ($success && ! $this->checkout->redirect) {
 			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
 				$this->checkout->transaction->ID()
 			);
 			// set return URL
 			$this->checkout->redirect_url = add_query_arg(
-				array( 'e_reg_url_link' => $this->checkout->reg_url_link ),
+				array('e_reg_url_link' => $this->checkout->reg_url_link),
 				$this->checkout->thank_you_page_url
 			);
 		}
@@ -1444,28 +1444,28 @@ 
 		// clear any previous errors related to not selecting a payment method
 //		EE_Error::overwrite_errors();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$this->checkout->json_response->set_plz_select_method_of_payment(
-				__( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				__('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 			return false;
 		}
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			return false;
 		}
 		// setup billing form
-		if ( $this->checkout->payment_method->is_on_site() ) {
+		if ($this->checkout->payment_method->is_on_site()) {
 			$this->checkout->billing_form = $this->_get_billing_form_for_payment_method(
 				$this->checkout->payment_method
 			);
 			// bad billing form ?
-			if ( ! $this->_billing_form_is_valid() ) {
+			if ( ! $this->_billing_form_is_valid()) {
 				return false;
 			}
 		}
 		// ensure primary registrant has been fully processed
-		if ( ! $this->_setup_primary_registrant_prior_to_payment() ) {
+		if ( ! $this->_setup_primary_registrant_prior_to_payment()) {
 			return false;
 		}
 		/** @type EE_Transaction_Processor $transaction_processor */
@@ -1473,18 +1473,18 @@ 
 		// in case a registrant leaves to an Off-Site Gateway and never returns, we want to approve any registrations for events with a default reg status of Approved
 		//$transaction_processor->toggle_registration_statuses_for_default_approved_events( $this->checkout->transaction, $this->checkout->reg_cache_where_params );
 		// attempt payment
-		$payment = $this->_attempt_payment( $this->checkout->payment_method );
+		$payment = $this->_attempt_payment($this->checkout->payment_method);
 		// process results
-		$payment = $this->_validate_payment( $payment );
-		$payment = $this->_post_payment_processing( $payment );
+		$payment = $this->_validate_payment($payment);
+		$payment = $this->_post_payment_processing($payment);
 		// verify payment
-		if ( $payment instanceof EE_Payment ) {
+		if ($payment instanceof EE_Payment) {
 			// store that for later
 			$this->checkout->payment = $payment;
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to abandoned
-			$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+			$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 			$payment_status = $payment->status();
 			if (
 				$payment_status === EEM_Payment::status_id_approved
@@ -1494,7 +1494,7 @@ 
 			} else {
 				return false;
 			}
-		} else if ( $payment === true ) {
+		} else if ($payment === true) {
 			// please note that offline payment methods will NOT make a payment,
 			// but instead just mark themselves as the PMD_ID on the transaction, and return true
 			$this->checkout->payment = $payment;
@@ -1519,7 +1519,7 @@ 
 		);
 		$html = $payment_method_billing_info->get_html_and_js();
 		$html .= $this->checkout->redirect_form;
-		EE_Registry::instance()->REQ->add_output( $html );
+		EE_Registry::instance()->REQ->add_output($html);
 		return true;
 	}
 
@@ -1533,28 +1533,28 @@ 
 	 * @throws \EE_Error
 	 */
 	private function _billing_form_is_valid() {
-		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form() ) {
+		if ( ! $this->checkout->payment_method->type_obj()->has_billing_form()) {
 			return true;
 		}
-		if ( $this->checkout->billing_form instanceof EE_Billing_Info_Form ) {
-			if ( $this->checkout->billing_form->was_submitted() ) {
+		if ($this->checkout->billing_form instanceof EE_Billing_Info_Form) {
+			if ($this->checkout->billing_form->was_submitted()) {
 				$this->checkout->billing_form->receive_form_submission();
-				if ( $this->checkout->billing_form->is_valid() ) {
+				if ($this->checkout->billing_form->is_valid()) {
 					return true;
 				}
 				$validation_errors = $this->checkout->billing_form->get_validation_errors_accumulated();
 				$error_strings = array();
-				foreach ( $validation_errors as $validation_error ) {
-					if ( $validation_error instanceof EE_Validation_Error ) {
+				foreach ($validation_errors as $validation_error) {
+					if ($validation_error instanceof EE_Validation_Error) {
 						$form_section = $validation_error->get_form_section();
-						if ( $form_section instanceof EE_Form_Input_Base ) {
+						if ($form_section instanceof EE_Form_Input_Base) {
 							$label = $form_section->html_label_text();
-						} elseif ( $form_section instanceof EE_Form_Section_Base ) {
+						} elseif ($form_section instanceof EE_Form_Section_Base) {
 							$label = $form_section->name();
 						} else {
-							$label = __( 'Validation Error', 'event_espresso' );
+							$label = __('Validation Error', 'event_espresso');
 						}
-						$error_strings[] = sprintf( '%1$s: %2$s', $label, $validation_error->getMessage() );
+						$error_strings[] = sprintf('%1$s: %2$s', $label, $validation_error->getMessage());
 					}
 				}
 				EE_Error::add_error(
@@ -1564,7 +1564,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						implode( '<br/>', $error_strings )
+						implode('<br/>', $error_strings)
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -1583,7 +1583,7 @@ 
 			}
 		} else {
 			EE_Error::add_error(
-				__( 'The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso' ),
+				__('The submitted billing form is invalid possibly due to a technical reason.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -1618,13 +1618,13 @@ 
 		// grab the primary_registration object
 		$primary_registration = $this->checkout->transaction->primary_registration();
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// at this point we'll consider a TXN to not have been failed
-		$transaction_processor->toggle_failed_transaction_status( $this->checkout->transaction );
+		$transaction_processor->toggle_failed_transaction_status($this->checkout->transaction);
 		// save the TXN ( which clears cached copy of primary_registration)
 		$this->checkout->transaction->save();
 		// grab TXN ID and save it to the primary_registration
-		$primary_registration->set_transaction_id( $this->checkout->transaction->ID() );
+		$primary_registration->set_transaction_id($this->checkout->transaction->ID());
 		// save what we have so far
 		$primary_registration->save();
 		return true;
@@ -1642,7 +1642,7 @@ 
 	private function _capture_primary_registration_data_from_billing_form() {
 		// convert billing form data into an attendee
 		$this->checkout->primary_attendee_obj = $this->checkout->billing_form->create_attendee_from_billing_form_data();
-		if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee ) {
+		if ( ! $this->checkout->primary_attendee_obj instanceof EE_Attendee) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1650,7 +1650,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1659,7 +1659,7 @@ 
 			return false;
 		}
 		$primary_registration = $this->checkout->transaction->primary_registration();
-		if ( ! $primary_registration instanceof EE_Registration ) {
+		if ( ! $primary_registration instanceof EE_Registration) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1667,7 +1667,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1675,7 +1675,7 @@ 
 			);
 			return false;
 		}
-		if ( ! $primary_registration->_add_relation_to( $this->checkout->primary_attendee_obj, 'Attendee' )
+		if ( ! $primary_registration->_add_relation_to($this->checkout->primary_attendee_obj, 'Attendee')
 		       instanceof
 		       EE_Attendee
 		) {
@@ -1686,7 +1686,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1695,9 +1695,9 @@ 
 			return false;
 		}
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		// at this point, we should have enough details about the registrant to consider the registration NOT incomplete
-		$registration_processor->toggle_incomplete_registration_status_to_default( $primary_registration );
+		$registration_processor->toggle_incomplete_registration_status_to_default($primary_registration);
 		return true;
 	}
 
@@ -1713,17 +1713,17 @@ 
 	 */
 	private function _get_payment_method_for_selected_method_of_payment() {
 		// get EE_Payment_Method object
-		if ( isset( $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ] ) ) {
-			$payment_method = $this->checkout->available_payment_methods[ $this->checkout->selected_method_of_payment ];
+		if (isset($this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment])) {
+			$payment_method = $this->checkout->available_payment_methods[$this->checkout->selected_method_of_payment];
 		} else {
 			// load EEM_Payment_Method
-			EE_Registry::instance()->load_model( 'Payment_Method' );
+			EE_Registry::instance()->load_model('Payment_Method');
 			/** @type EEM_Payment_Method $EEM_Payment_Method */
 			$EEM_Payment_Method = EE_Registry::instance()->LIB->EEM_Payment_Method;
-			$payment_method = $EEM_Payment_Method->get_one_by_slug( $this->checkout->selected_method_of_payment );
+			$payment_method = $EEM_Payment_Method->get_one_by_slug($this->checkout->selected_method_of_payment);
 		}
 		// verify $payment_method
-		if ( ! $payment_method instanceof EE_Payment_Method ) {
+		if ( ! $payment_method instanceof EE_Payment_Method) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1732,7 +1732,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1741,7 +1741,7 @@ 
 			return null;
 		}
 		// and verify it has a valid Payment_Method Type object
-		if ( ! $payment_method->type_obj() instanceof EE_PMT_Base ) {
+		if ( ! $payment_method->type_obj() instanceof EE_PMT_Base) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1750,7 +1750,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1771,29 +1771,29 @@ 
 	 * @return    mixed    EE_Payment | boolean
 	 * @throws \EE_Error
 	 */
-	private function _attempt_payment( EE_Payment_Method $payment_method ) {
+	private function _attempt_payment(EE_Payment_Method $payment_method) {
 		$payment = null;
 		$this->checkout->transaction->save();
-		$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
-		if ( ! $payment_processor instanceof EE_Payment_Processor ) {
+		$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
+		if ( ! $payment_processor instanceof EE_Payment_Processor) {
 			return false;
 		}
 		try {
-			$payment_processor->set_revisit( $this->checkout->revisit );
+			$payment_processor->set_revisit($this->checkout->revisit);
 			// generate payment object
 			$payment = $payment_processor->process_payment(
 				$payment_method,
 				$this->checkout->transaction,
 				$this->checkout->amount_owing,
 				$this->checkout->billing_form,
-				$this->_get_return_url( $payment_method ),
+				$this->_get_return_url($payment_method),
 				'CART',
 				$this->checkout->admin_request,
 				true,
 				$this->reg_step_url()
 			);
-		} catch ( Exception $e ) {
-			$this->_handle_payment_processor_exception( $e );
+		} catch (Exception $e) {
+			$this->_handle_payment_processor_exception($e);
 		}
 		return $payment;
 	}
@@ -1808,7 +1808,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _handle_payment_processor_exception( Exception $e ) {
+	protected function _handle_payment_processor_exception(Exception $e) {
 		EE_Error::add_error(
 			sprintf(
 				__(
@@ -1816,7 +1816,7 @@ 
 					'event_espresso'
 				),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' ),
+				EE_Registry::instance()->CFG->organization->get_pretty('email'),
 				$e->getMessage(),
 				$e->getFile(),
 				$e->getLine()
@@ -1837,9 +1837,9 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	protected function _get_return_url( EE_Payment_Method $payment_method ) {
+	protected function _get_return_url(EE_Payment_Method $payment_method) {
 		$return_url = '';
-		switch ( $payment_method->type_obj()->payment_occurs() ) {
+		switch ($payment_method->type_obj()->payment_occurs()) {
 			case EE_PMT_Base::offsite :
 				$return_url = add_query_arg(
 					array(
@@ -1868,12 +1868,12 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	private function _validate_payment( $payment = null ) {
-		if ( $this->checkout->payment_method->is_off_line() ) {
+	private function _validate_payment($payment = null) {
+		if ($this->checkout->payment_method->is_off_line()) {
 			return true;
 		}
 		// verify payment object
-		if ( ! $payment instanceof EE_Payment ) {
+		if ( ! $payment instanceof EE_Payment) {
 			// not a payment
 			EE_Error::add_error(
 				sprintf(
@@ -1882,7 +1882,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -1903,27 +1903,27 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _post_payment_processing( $payment = null ) {
+	private function _post_payment_processing($payment = null) {
 		// Off-Line payment?
-		if ( $payment === true ) {
+		if ($payment === true) {
 			//$this->_setup_redirect_for_next_step();
 			return true;
 		// On-Site payment?
-		} else if ( $this->checkout->payment_method->is_on_site() ) {
-			if ( ! $this->_process_payment_status( $payment, EE_PMT_Base::onsite ) ) {
+		} else if ($this->checkout->payment_method->is_on_site()) {
+			if ( ! $this->_process_payment_status($payment, EE_PMT_Base::onsite)) {
 				//$this->_setup_redirect_for_next_step();
 				$this->checkout->continue_reg = false;
 			}
 		// Off-Site payment?
-		} else if ( $this->checkout->payment_method->is_off_site() ) {
+		} else if ($this->checkout->payment_method->is_off_site()) {
 			// if a payment object was made and it specifies a redirect url, then we'll setup that redirect info
-			if ( $payment instanceof EE_Payment && $payment->redirect_url() ) {
-				do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()' );
+			if ($payment instanceof EE_Payment && $payment->redirect_url()) {
+				do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->redirect_url(), '$payment->redirect_url()');
 				$this->checkout->redirect = true;
 				$this->checkout->redirect_form = $payment->redirect_form();
-				$this->checkout->redirect_url = $this->reg_step_url( 'redirect_form' );
+				$this->checkout->redirect_url = $this->reg_step_url('redirect_form');
 				// set JSON response
-				$this->checkout->json_response->set_redirect_form( $this->checkout->redirect_form );
+				$this->checkout->json_response->set_redirect_form($this->checkout->redirect_form);
 				// set cron job for finalizing the TXN
 				// in case the user does not return from the off-site gateway
 				EE_Cron_Tasks::schedule_finalize_abandoned_transactions_check(
@@ -1931,7 +1931,7 @@ 
 					$this->checkout->transaction->ID()
 				);
 				// and lastly, let's bump the payment status to pending
-				$payment->set_status( EEM_Payment::status_id_pending );
+				$payment->set_status(EEM_Payment::status_id_pending);
 				$payment->save();
 			} else {
 				// not a payment
@@ -1943,7 +1943,7 @@ 
 							'event_espresso'
 						),
 						'<br/>',
-						EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+						EE_Registry::instance()->CFG->organization->get_pretty('email')
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -1981,21 +1981,21 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _process_payment_status( $payment, $payment_occurs = EE_PMT_Base::offline ) {
+	private function _process_payment_status($payment, $payment_occurs = EE_PMT_Base::offline) {
 		// off-line payment? carry on
-		if ( $payment_occurs === EE_PMT_Base::offline ) {
+		if ($payment_occurs === EE_PMT_Base::offline) {
 			return true;
 		}
 		// verify payment validity
-		if ( $payment instanceof EE_Payment ) {
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()' );
+		if ($payment instanceof EE_Payment) {
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $payment->status(), '$payment->status()');
 			$msg = $payment->gateway_response();
 			// check results
-			switch ( $payment->status() ) {
+			switch ($payment->status()) {
 				// good payment
 				case EEM_Payment::status_id_approved :
 					EE_Error::add_success(
-						__( 'Your payment was processed successfully.', 'event_espresso' ),
+						__('Your payment was processed successfully.', 'event_espresso'),
 						__FILE__,
 						__FUNCTION__,
 						__LINE__
@@ -2004,45 +2004,45 @@ 
 					break;
 				// slow payment
 				case EEM_Payment::status_id_pending :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = __(
 							'Your payment appears to have been processed successfully, but the Instant Payment Notification has not yet been received. It should arrive shortly.',
 							'event_espresso'
 						);
 					}
-					EE_Error::add_success( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_success($msg, __FILE__, __FUNCTION__, __LINE__);
 					return true;
 					break;
 				// don't wanna payment
 				case EEM_Payment::status_id_cancelled :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = _n(
 							'Payment cancelled. Please try again.',
 							'Payment cancelled. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return false;
 					break;
 				// not enough payment
 				case EEM_Payment::status_id_declined :
-					if ( empty( $msg ) ) {
+					if (empty($msg)) {
 						$msg = _n(
 							'We\'re sorry but your payment was declined. Please try again.',
 							'We\'re sorry but your payment was declined. Please try again or select another method of payment.',
-							count( $this->checkout->available_payment_methods ),
+							count($this->checkout->available_payment_methods),
 							'event_espresso'
 						);
 					}
-					EE_Error::add_attention( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					EE_Error::add_attention($msg, __FILE__, __FUNCTION__, __LINE__);
 					return false;
 					break;
 				// bad payment
 				case EEM_Payment::status_id_failed :
-					if ( ! empty( $msg ) ) {
-						EE_Error::add_error( $msg, __FILE__, __FUNCTION__, __LINE__ );
+					if ( ! empty($msg)) {
+						EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
 						return false;
 					}
 					// default to error below
@@ -2051,7 +2051,7 @@ 
 		}
 		// off-site payment gateway responses are too unreliable, so let's just assume that
 		// the payment processing is just running slower than the registrant's request
-		if ( $payment_occurs === EE_PMT_Base::offsite ) {
+		if ($payment_occurs === EE_PMT_Base::offsite) {
 			return true;
 		}
 		EE_Error::add_error(
@@ -2061,7 +2061,7 @@ 
 					'event_espresso'
 				),
 				'<br/>',
-				EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+				EE_Registry::instance()->CFG->organization->get_pretty('email')
 			),
 			__FILE__,
 			__FUNCTION__,
@@ -2094,13 +2094,13 @@ 
 	public function process_gateway_response() {
 		$payment = null;
 		// how have they chosen to pay?
-		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment( true );
+		$this->checkout->selected_method_of_payment = $this->_get_selected_method_of_payment(true);
 		// get EE_Payment_Method object
-		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment() ) {
+		if ( ! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()) {
 			$this->checkout->continue_reg = false;
 			return false;
 		}
-		if ( ! $this->checkout->payment_method->is_off_site() ) {
+		if ( ! $this->checkout->payment_method->is_off_site()) {
 			return false;
 		}
 		$this->_validate_offsite_return();
@@ -2114,23 +2114,23 @@ 
 		//	true
 		//);
 		// verify TXN
-		if ( $this->checkout->transaction instanceof EE_Transaction ) {
+		if ($this->checkout->transaction instanceof EE_Transaction) {
 			$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
-			if ( ! $gateway instanceof EE_Offsite_Gateway ) {
+			if ( ! $gateway instanceof EE_Offsite_Gateway) {
 				$this->checkout->continue_reg = false;
 				return false;
 			}
-			$payment = $this->_process_off_site_payment( $gateway );
-			$payment = $this->_process_cancelled_payments( $payment );
-			$payment = $this->_validate_payment( $payment );
+			$payment = $this->_process_off_site_payment($gateway);
+			$payment = $this->_process_cancelled_payments($payment);
+			$payment = $this->_validate_payment($payment);
 			// if payment was not declined by the payment gateway or cancelled by the registrant
-			if ( $this->_process_payment_status( $payment, EE_PMT_Base::offsite ) ) {
+			if ($this->_process_payment_status($payment, EE_PMT_Base::offsite)) {
 				//$this->_setup_redirect_for_next_step();
 				// store that for later
 				$this->checkout->payment = $payment;
 				// mark this reg step as completed, as long as gateway doesn't use a separate IPN request,
 				// because we will complete this step during the IPN processing then
-				if ( $gateway instanceof EE_Offsite_Gateway && ! $this->handle_IPN_in_this_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && ! $this->handle_IPN_in_this_request()) {
 					$this->set_completed();
 				}
 				return true;
@@ -2154,21 +2154,21 @@ 
 	 * @throws \EE_Error
 	 */
 	private function _validate_offsite_return() {
-		$TXN_ID = (int)EE_Registry::instance()->REQ->get( 'spco_txn', 0 );
-		if ( $TXN_ID !== $this->checkout->transaction->ID() ) {
+		$TXN_ID = (int) EE_Registry::instance()->REQ->get('spco_txn', 0);
+		if ($TXN_ID !== $this->checkout->transaction->ID()) {
 			// Houston... we might have a problem
 			$invalid_TXN = false;
 			// first gather some info
-			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID( $TXN_ID );
+			$valid_TXN = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
 			$primary_registrant = $valid_TXN instanceof EE_Transaction
 				? $valid_TXN->primary_registration()
 				: null;
 			// let's start by retrieving the cart for this TXN
-			$cart = $this->checkout->get_cart_for_transaction( $this->checkout->transaction );
-			if ( $cart instanceof EE_Cart ) {
+			$cart = $this->checkout->get_cart_for_transaction($this->checkout->transaction);
+			if ($cart instanceof EE_Cart) {
 				// verify that the current cart has tickets
 				$tickets = $cart->get_tickets();
-				if ( empty( $tickets ) ) {
+				if (empty($tickets)) {
 					$invalid_TXN = true;
 				}
 			} else {
@@ -2178,39 +2178,39 @@ 
 				? $primary_registrant->session_ID()
 				: null;
 			// validate current Session ID and compare against valid TXN session ID
-			if ( EE_Session::instance()->id() === null ) {
+			if (EE_Session::instance()->id() === null) {
 				$invalid_TXN = true;
-			} else if ( EE_Session::instance()->id() === $valid_TXN_SID ) {
+			} else if (EE_Session::instance()->id() === $valid_TXN_SID) {
 				// WARNING !!!
 				// this could be PayPal sending back duplicate requests (ya they do that)
 				// or it **could** mean someone is simply registering AGAIN after having just done so
 				// so now we need to determine if this current TXN looks valid or not
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 				// has this step even been started ?
-				if ( $transaction_processor->reg_step_completed( $this->checkout->transaction, $this->slug() === false )
+				if ($transaction_processor->reg_step_completed($this->checkout->transaction, $this->slug() === false)
 				) {
 					// really? you're half way through this reg step, but you never started it ?
 					$invalid_TXN = true;
 				}
 			}
-			if ( $invalid_TXN ) {
+			if ($invalid_TXN) {
 				// is the valid TXN completed ?
-				if ( $valid_TXN instanceof EE_Transaction ) {
+				if ($valid_TXN instanceof EE_Transaction) {
 					/** @type EE_Transaction_Processor $transaction_processor */
-					$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+					$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 					// has this step even been started ?
-					$reg_step_completed = $transaction_processor->reg_step_completed( $valid_TXN, $this->slug() );
-					if ( $reg_step_completed !== false && $reg_step_completed !== true ) {
+					$reg_step_completed = $transaction_processor->reg_step_completed($valid_TXN, $this->slug());
+					if ($reg_step_completed !== false && $reg_step_completed !== true) {
 						// so it **looks** like this is a double request from PayPal
 						// so let's try to pick up where we left off
 						$this->checkout->transaction = $valid_TXN;
-						$this->checkout->refresh_all_entities( true );
+						$this->checkout->refresh_all_entities(true);
 						return;
 					}
 				}
 				// you appear to be lost?
-				$this->_redirect_wayward_request( $primary_registrant );
+				$this->_redirect_wayward_request($primary_registrant);
 			}
 		}
 	}
@@ -2225,14 +2225,14 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	private function _redirect_wayward_request( EE_Registration $primary_registrant ) {
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+	private function _redirect_wayward_request(EE_Registration $primary_registrant) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			// try redirecting based on the current TXN
 			$primary_registrant = $this->checkout->transaction instanceof EE_Transaction
 				? $this->checkout->transaction->primary_registration()
 				: null;
 		}
-		if ( ! $primary_registrant instanceof EE_Registration ) {
+		if ( ! $primary_registrant instanceof EE_Registration) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -2240,7 +2240,7 @@ 
 						'event_espresso'
 					),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				),
 				__FILE__,
 				__FUNCTION__,
@@ -2271,17 +2271,17 @@ 
 	 * @return \EE_Payment
 	 * @throws \EE_Error
 	 */
-	private function _process_off_site_payment( EE_Offsite_Gateway $gateway ) {
+	private function _process_off_site_payment(EE_Offsite_Gateway $gateway) {
 		try {
 			$request_data = \EE_Registry::instance()->REQ->params();
 			// if gateway uses_separate_IPN_request, then we don't have to process the IPN manually
 			$this->set_handle_IPN_in_this_request(
-				$gateway->handle_IPN_in_this_request( $request_data, false )
+				$gateway->handle_IPN_in_this_request($request_data, false)
 			);
-			if ( $this->handle_IPN_in_this_request() ) {
+			if ($this->handle_IPN_in_this_request()) {
 				// get payment details and process results
 				/** @type EE_Payment_Processor $payment_processor */
-				$payment_processor = EE_Registry::instance()->load_core( 'Payment_Processor' );
+				$payment_processor = EE_Registry::instance()->load_core('Payment_Processor');
 				$payment = $payment_processor->process_ipn(
 					$request_data,
 					$this->checkout->transaction,
@@ -2294,14 +2294,14 @@ 
 				$payment = $this->checkout->transaction->last_payment();
 				//$payment_source = 'last_payment';
 			}
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			// let's just eat the exception and try to move on using any previously set payment info
 			$payment = $this->checkout->transaction->last_payment();
 			//$payment_source = 'last_payment after Exception';
 			// but if we STILL don't have a payment object
-			if ( ! $payment instanceof EE_Payment ) {
+			if ( ! $payment instanceof EE_Payment) {
 				// then we'll object ! ( not object like a thing... but object like what a lawyer says ! )
-				$this->_handle_payment_processor_exception( $e );
+				$this->_handle_payment_processor_exception($e);
 			}
 		}
 		// DEBUG LOG
@@ -2326,13 +2326,13 @@ 
 	 * @return EE_Payment | FALSE
 	 * @throws \EE_Error
 	 */
-	private function _process_cancelled_payments( $payment = null ) {
+	private function _process_cancelled_payments($payment = null) {
 		if (
 			$payment instanceof EE_Payment
-			&& isset( $_REQUEST['ee_cancel_payment'] )
+			&& isset($_REQUEST['ee_cancel_payment'])
 			&& $payment->status() === EEM_Payment::status_id_failed
 		) {
-			$payment->set_status( EEM_Payment::status_id_cancelled );
+			$payment->set_status(EEM_Payment::status_id_cancelled);
 		}
 		return $payment;
 	}
@@ -2349,14 +2349,14 @@ 
 	public function get_transaction_details_for_gateways() {
 		$txn_details = array();
 		// ya gotta make a choice man
-		if ( empty( $this->checkout->selected_method_of_payment ) ) {
+		if (empty($this->checkout->selected_method_of_payment)) {
 			$txn_details = array(
-				'error' => __( 'Please select a method of payment before proceeding.', 'event_espresso' )
+				'error' => __('Please select a method of payment before proceeding.', 'event_espresso')
 			);
 		}
 		// get EE_Payment_Method object
 		if (
-			empty( $txn_details )
+			empty($txn_details)
 			&&
 			! $this->checkout->payment_method = $this->_get_payment_method_for_selected_method_of_payment()
 		) {
@@ -2368,8 +2368,8 @@ 
 				)
 			);
 		}
-		if ( empty( $txn_details ) && $this->checkout->transaction instanceof EE_Transaction ) {
-			$return_url = $this->_get_return_url( $this->checkout->payment_method );
+		if (empty($txn_details) && $this->checkout->transaction instanceof EE_Transaction) {
+			$return_url = $this->_get_return_url($this->checkout->payment_method);
 			$txn_details = array(
 				'TXN_ID'         => $this->checkout->transaction->ID(),
 				'TXN_timestamp'  => $this->checkout->transaction->datetime(),
@@ -2380,7 +2380,7 @@ 
 				'PMD_ID'         => $this->checkout->transaction->payment_method_ID(),
 				'payment_amount' => $this->checkout->amount_owing,
 				'return_url'     => $return_url,
-				'cancel_url'     => add_query_arg( array( 'ee_cancel_payment' => true ), $return_url ),
+				'cancel_url'     => add_query_arg(array('ee_cancel_payment' => true), $return_url),
 				'notify_url'     => EE_Config::instance()->core->txn_page_url(
 					array(
 						'e_reg_url_link'    => $this->checkout->transaction->primary_registration()->reg_url_link(),
@@ -2389,7 +2389,7 @@ 
 				)
 			);
 		}
-		echo json_encode( $txn_details );
+		echo json_encode($txn_details);
 		exit();
 	}
 

core/EE_Error.core.php

Spacing +244 added lines, -244 removed lines

@@ -1,8 +1,8 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
 // if you're a dev and want to receive all errors via email add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-if ( defined( 'WP_DEBUG' ) && WP_DEBUG === TRUE && defined( 'EE_ERROR_EMAILS' ) && EE_ERROR_EMAILS === TRUE ) {
-	set_error_handler( array( 'EE_Error', 'error_handler' ));
-	register_shutdown_function( array( 'EE_Error', 'fatal_error_handler' ));
+if (defined('WP_DEBUG') && WP_DEBUG === TRUE && defined('EE_ERROR_EMAILS') && EE_ERROR_EMAILS === TRUE) {
+	set_error_handler(array('EE_Error', 'error_handler'));
+	register_shutdown_function(array('EE_Error', 'fatal_error_handler'));
 }
 /**
  *
@@ -64,7 +64,7 @@ 
 	* 	@access	private
     *	@var boolean
 	*/
-	private static $_espresso_notices = array( 'success' => FALSE, 'errors' => FALSE, 'attention' => FALSE );
+	private static $_espresso_notices = array('success' => FALSE, 'errors' => FALSE, 'attention' => FALSE);
 
 
 
@@ -75,11 +75,11 @@ 
 	*	@access public
 	*	@echo string
 	*/
-	function __construct( $message, $code = 0, Exception $previous = NULL ) {
-		if ( version_compare( phpversion(), '5.3.0', '<' )) {
-			parent::__construct( $message, $code );
+	function __construct($message, $code = 0, Exception $previous = NULL) {
+		if (version_compare(phpversion(), '5.3.0', '<')) {
+			parent::__construct($message, $code);
 		} else {
-			parent::__construct( $message, $code, $previous );
+			parent::__construct($message, $code, $previous);
 		}
 	}
 
@@ -94,10 +94,10 @@ 
 	 * @param $line
 	 * @return void
 	 */
-	public static function error_handler( $code, $message, $file, $line ) {
-		$type = EE_Error::error_type( $code );
+	public static function error_handler($code, $message, $file, $line) {
+		$type = EE_Error::error_type($code);
 		$site = site_url();
-		switch ( $site ) {
+		switch ($site) {
 			case 'http://ee4.eventespresso.com/' :
 			case 'http://ee4decaf.eventespresso.com/' :
 			case 'http://ee4hf.eventespresso.com/' :
@@ -110,16 +110,16 @@ 
 				$to = 'developers@eventespresso.com';
 				break;
 			default :
-				$to = get_option( 'admin_email' );
+				$to = get_option('admin_email');
 		}
-		$subject = $type . ' ' . $message . ' in ' . EVENT_ESPRESSO_VERSION . ' on ' . site_url();
-		$msg = EE_Error::_format_error( $type, $message, $file, $line );
-		if ( function_exists( 'wp_mail' )) {
-			add_filter( 'wp_mail_content_type', array( 'EE_Error', 'set_content_type' ));
-			wp_mail( $to, $subject, $msg );
+		$subject = $type.' '.$message.' in '.EVENT_ESPRESSO_VERSION.' on '.site_url();
+		$msg = EE_Error::_format_error($type, $message, $file, $line);
+		if (function_exists('wp_mail')) {
+			add_filter('wp_mail_content_type', array('EE_Error', 'set_content_type'));
+			wp_mail($to, $subject, $msg);
 		}
 		echo '<div id="message" class="espresso-notices error"><p>';
-		echo $type . ': ' . $message . '<br />' . $file . ' line ' . $line;
+		echo $type.': '.$message.'<br />'.$file.' line '.$line;
 		echo '<br /></p></div>';
 	}
 
@@ -132,8 +132,8 @@ 
 	 * @param $code
 	 * @return string
 	 */
-	public static function error_type( $code ) {
-		switch( $code ) {
+	public static function error_type($code) {
+		switch ($code) {
 			case E_ERROR: // 1 //
 			return 'E_ERROR';
 			case E_WARNING: // 2 //
@@ -179,8 +179,8 @@ 
 	*/
 	public static function fatal_error_handler() {
 		$last_error = error_get_last();
-		if ( $last_error['type'] === E_ERROR ) {
-			EE_Error::error_handler( E_ERROR, $last_error['message'], $last_error['file'], $last_error['line'] );
+		if ($last_error['type'] === E_ERROR) {
+			EE_Error::error_handler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
 		}
 	}
 
@@ -195,7 +195,7 @@ 
 	 * @param $line
 	 * @return string
 	 */
-	private static function _format_error( $code, $message, $file, $line ) {
+	private static function _format_error($code, $message, $file, $line) {
 		$html  = "<table cellpadding='5'><thead bgcolor='#f8f8f8'><th>Item</th><th align='left'>Details</th></thead><tbody>";
 		$html .= "<tr valign='top'><td><b>Code</b></td><td>$code</td></tr>";
 		$html .= "<tr valign='top'><td><b>Error</b></td><td>$message</td></tr>";
@@ -213,7 +213,7 @@ 
 	 * @param $content_type
 	 * @return string
 	 */
-	public static function set_content_type( $content_type ) {
+	public static function set_content_type($content_type) {
 		return 'text/html';
 	}
 
@@ -227,24 +227,24 @@ 
 	*/
     public function get_error() {
 
-		if( apply_filters( 'FHEE__EE_Error__get_error__show_normal_exceptions', FALSE ) ){
+		if (apply_filters('FHEE__EE_Error__get_error__show_normal_exceptions', FALSE)) {
 			throw $this;
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $this->getMessage() );
+		$msg = explode('||', $this->getMessage());
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 
 		// add details to _all_exceptions array
 		$x_time = time();
-		self::$_all_exceptions[ $x_time ]['name'] 	= get_class( $this );
-		self::$_all_exceptions[ $x_time ]['file'] 		= $this->getFile();
-		self::$_all_exceptions[ $x_time ]['line'] 		= $this->getLine();
-		self::$_all_exceptions[ $x_time ]['msg'] 	= $msg;
-		self::$_all_exceptions[ $x_time ]['code'] 	= $this->getCode();
-		self::$_all_exceptions[ $x_time ]['trace'] 	= $this->getTrace();
-		self::$_all_exceptions[ $x_time ]['string'] 	= $this->getTraceAsString();
+		self::$_all_exceptions[$x_time]['name'] = get_class($this);
+		self::$_all_exceptions[$x_time]['file'] 		= $this->getFile();
+		self::$_all_exceptions[$x_time]['line'] 		= $this->getLine();
+		self::$_all_exceptions[$x_time]['msg'] = $msg;
+		self::$_all_exceptions[$x_time]['code'] = $this->getCode();
+		self::$_all_exceptions[$x_time]['trace'] 	= $this->getTrace();
+		self::$_all_exceptions[$x_time]['string'] = $this->getTraceAsString();
 		self::$_error_count++;
 
 		//add_action( 'shutdown', array( $this, 'display_errors' ));
@@ -259,7 +259,7 @@ 
 	*	@access public
 	*	@return boolean
 	*/
-    public static function has_error(){
+    public static function has_error() {
 		return self::$_error_count ? TRUE : FALSE;
 	}
 
@@ -270,7 +270,7 @@ 
 	*	@access public
 	*	@echo string
 	*/
-    public function display_errors(){
+    public function display_errors() {
 
 		$trace_details = '';
 
@@ -331,18 +331,18 @@ 
 </style>
 <div id="ee-error-message" class="error">';
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	<p>';
 		}
 
 		// cycle thru errors
-		foreach ( self::$_all_exceptions as $time => $ex ) {
+		foreach (self::$_all_exceptions as $time => $ex) {
 
 			// process trace info
-			if ( empty( $ex['trace'] )) {
+			if (empty($ex['trace'])) {
 
-	            $trace_details .= __( 'Sorry, but no trace information was available for this exception.', 'event_espresso' );
+	            $trace_details .= __('Sorry, but no trace information was available for this exception.', 'event_espresso');
 
 			} else {
 
@@ -357,50 +357,50 @@ 
 					<th scope="col" align="left">Method( arguments )</th>
 				</tr>';
 
-				$last_on_stack = count( $ex['trace'] ) - 1;
+				$last_on_stack = count($ex['trace']) - 1;
 				// reverse array so that stack is in proper chronological order
-				$sorted_trace = array_reverse( $ex['trace'] );
+				$sorted_trace = array_reverse($ex['trace']);
 
-				foreach ( $sorted_trace as $nmbr => $trace ) {
+				foreach ($sorted_trace as $nmbr => $trace) {
 
-					$file = isset( $trace['file'] ) ? $trace['file'] : '' ;
-					$class = isset( $trace['class'] ) ? $trace['class'] : '';
-					$type = isset( $trace['type'] ) ? $trace['type'] : '';
-					$function = isset( $trace['function'] ) ? $trace['function'] : '';
-					$args = isset( $trace['args'] ) ? $this->_convert_args_to_string( $trace['args'] ) : '';
-					$line = isset( $trace['line'] ) ? $trace['line'] : '';
+					$file = isset($trace['file']) ? $trace['file'] : '';
+					$class = isset($trace['class']) ? $trace['class'] : '';
+					$type = isset($trace['type']) ? $trace['type'] : '';
+					$function = isset($trace['function']) ? $trace['function'] : '';
+					$args = isset($trace['args']) ? $this->_convert_args_to_string($trace['args']) : '';
+					$line = isset($trace['line']) ? $trace['line'] : '';
 					$zebra = $nmbr % 2 ? ' odd' : '';
 
-					if ( empty( $file ) && ! empty( $class )) {
-						$a = new ReflectionClass( $class );
+					if (empty($file) && ! empty($class)) {
+						$a = new ReflectionClass($class);
 						$file = $a->getFileName();
-						if ( empty( $line ) && ! empty( $function )) {
-							$b = new ReflectionMethod( $class, $function );
+						if (empty($line) && ! empty($function)) {
+							$b = new ReflectionMethod($class, $function);
 							$line = $b->getStartLine();
 						}
 					}
 
-					if ( $nmbr == $last_on_stack ) {
+					if ($nmbr == $last_on_stack) {
 						$file = $ex['file'] != '' ? $ex['file'] : $file;
 						$line = $ex['line'] != '' ? $ex['line'] : $line;
-						$error_code = self::generate_error_code ( $file, $trace['function'], $line );
+						$error_code = self::generate_error_code($file, $trace['function'], $line);
 					}
 
-					$nmbr_dsply = ! empty( $nmbr ) ? $nmbr : '&nbsp;';
-					$line_dsply = ! empty( $line ) ? $line : '&nbsp;';
-					$file_dsply = ! empty( $file ) ? $file : '&nbsp;';
-					$class_dsply = ! empty( $class ) ? $class : '&nbsp;';
-					$type_dsply = ! empty( $type ) ? $type : '&nbsp;';
-					$function_dsply = ! empty( $function ) ? $function : '&nbsp;';
-					$args_dsply = ! empty( $args ) ? '( ' . $args . ' )' : '';
+					$nmbr_dsply = ! empty($nmbr) ? $nmbr : '&nbsp;';
+					$line_dsply = ! empty($line) ? $line : '&nbsp;';
+					$file_dsply = ! empty($file) ? $file : '&nbsp;';
+					$class_dsply = ! empty($class) ? $class : '&nbsp;';
+					$type_dsply = ! empty($type) ? $type : '&nbsp;';
+					$function_dsply = ! empty($function) ? $function : '&nbsp;';
+					$args_dsply = ! empty($args) ? '( '.$args.' )' : '';
 
 		              $trace_details .= '
 					<tr>
-						<td align="right" class="' . $zebra . '">' . $nmbr_dsply . '</td>
-						<td align="right" class="' . $zebra . '">' . $line_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $file_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $class_dsply . '</td>
-						<td align="left" class="' . $zebra . '">' . $type_dsply . $function_dsply . $args_dsply . '</td>
+						<td align="right" class="' . $zebra.'">'.$nmbr_dsply.'</td>
+						<td align="right" class="' . $zebra.'">'.$line_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$file_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$class_dsply.'</td>
+						<td align="left" class="' . $zebra.'">'.$type_dsply.$function_dsply.$args_dsply.'</td>
 					</tr>';
 
 
@@ -415,9 +415,9 @@ 
 			$ex['code'] = $ex['code'] ? $ex['code'] : $error_code;
 
 			// add generic non-identifying messages for non-privileged uesrs
-			if ( ! WP_DEBUG ) {
+			if ( ! WP_DEBUG) {
 
-				$output .= '<span class="ee-error-user-msg-spn">' . trim( $ex['msg'] )  . '</span> &nbsp; <sup>' . $ex['code'] . '</sup><br />';
+				$output .= '<span class="ee-error-user-msg-spn">'.trim($ex['msg']).'</span> &nbsp; <sup>'.$ex['code'].'</sup><br />';
 
 			} else {
 
@@ -425,24 +425,24 @@ 
 				$output .= '
 		<div class="ee-error-dev-msg-dv">
 			<p class="ee-error-dev-msg-pg">
-				<strong class="ee-error-dev-msg-str">An ' . $ex['name'] . ' exception was thrown!</strong>  &nbsp; <span>code: ' . $ex['code'] . '</span><br />
-				<span class="big-text">"' . trim( $ex['msg'] ) . '"</span><br/>
-				<a id="display-ee-error-trace-' . self::$_error_count . $time . '" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-' . self::$_error_count . $time . '">
-					' . __( 'click to view backtrace and class/method details', 'event_espresso' ) . '
+				<strong class="ee-error-dev-msg-str">An ' . $ex['name'].' exception was thrown!</strong>  &nbsp; <span>code: '.$ex['code'].'</span><br />
+				<span class="big-text">"' . trim($ex['msg']).'"</span><br/>
+				<a id="display-ee-error-trace-' . self::$_error_count.$time.'" class="display-ee-error-trace-lnk small-text" rel="ee-error-trace-'.self::$_error_count.$time.'">
+					' . __('click to view backtrace and class/method details', 'event_espresso').'
 				</a><br />
 				<span class="small-text lt-grey-text">'.$ex['file'].' &nbsp; ( line no: '.$ex['line'].' )</span>
 			</p>
-			<div id="ee-error-trace-' . self::$_error_count . $time . '-dv" class="ee-error-trace-dv" style="display: none;">
+			<div id="ee-error-trace-' . self::$_error_count.$time.'-dv" class="ee-error-trace-dv" style="display: none;">
 				' . $trace_details;
 
-				if ( ! empty( $class )) {
+				if ( ! empty($class)) {
 					$output .= '
 				<div style="padding:3px; margin:0 0 1em; border:1px solid #666; background:#fff; border-radius:3px;">
 					<div style="padding:1em 2em; border:1px solid #666; background:#f9f9f9;">
 						<h3>Class Details</h3>';
-						$a = new ReflectionClass( $class );
+						$a = new ReflectionClass($class);
 						$output .= '
-						<pre>' . $a . '</pre>
+						<pre>' . $a.'</pre>
 					</div>
 				</div>';
 				}
@@ -454,14 +454,14 @@ 
 
 			}
 
-			$this->write_to_error_log( $time, $ex );
+			$this->write_to_error_log($time, $ex);
 
 		}
 
 		// remove last linebreak
-		$output = substr( $output, 0, ( count( $output ) - 7 ));
+		$output = substr($output, 0, (count($output) - 7));
 
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			$output .= '
 	</p>';
 		}
@@ -469,10 +469,10 @@ 
 		$output .= '
 </div>';
 
-		$output .= self::_print_scripts( TRUE );
+		$output .= self::_print_scripts(TRUE);
 
-		if ( defined( 'DOING_AJAX' )) {
-			echo json_encode( array( 'error' => $output ));
+		if (defined('DOING_AJAX')) {
+			echo json_encode(array('error' => $output));
 			exit();
 		}
 
@@ -492,29 +492,29 @@ 
 	*	@ param array $arguments
 	*	@ return string
 	*/
-	private function _convert_args_to_string ( $arguments = array(), $array = FALSE ) {
+	private function _convert_args_to_string($arguments = array(), $array = FALSE) {
 
 		$arg_string = '';
-		if ( ! empty( $arguments )) {
+		if ( ! empty($arguments)) {
 
 			$args = array();
 
-			foreach ( $arguments as $arg ) {
+			foreach ($arguments as $arg) {
 
-				if ( ! empty( $arg )) {
+				if ( ! empty($arg)) {
 
-					if ( is_string( $arg )) {
-						$args[] = " '" . $arg . "'";
-					} elseif ( is_array( $arg )) {
-						$args[] = 'ARRAY(' . $this->_convert_args_to_string( $arg, TRUE );
-					} elseif ( is_null( $arg )) {
+					if (is_string($arg)) {
+						$args[] = " '".$arg."'";
+					} elseif (is_array($arg)) {
+						$args[] = 'ARRAY('.$this->_convert_args_to_string($arg, TRUE);
+					} elseif (is_null($arg)) {
 						$args[] = ' NULL';
-					} elseif ( is_bool( $arg )) {
-						$args[] = ( $arg ) ? ' TRUE' : ' FALSE';
-					} elseif ( is_object( $arg )) {
-						$args[] = ' OBJECT ' . get_class( $arg );
-					} elseif ( is_resource( $arg )) {
-						$args[] = get_resource_type( $arg );
+					} elseif (is_bool($arg)) {
+						$args[] = ($arg) ? ' TRUE' : ' FALSE';
+					} elseif (is_object($arg)) {
+						$args[] = ' OBJECT '.get_class($arg);
+					} elseif (is_resource($arg)) {
+						$args[] = get_resource_type($arg);
 					} else {
 						$args[] = $arg;
 					}
@@ -522,9 +522,9 @@ 
 				}
 
 			}
-			$arg_string = implode( ', ', $args );
+			$arg_string = implode(', ', $args);
 		}
-		if ( $array ) {
+		if ($array) {
 			$arg_string .= ' )';
 		}
 		return $arg_string;
@@ -544,8 +544,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_error( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'errors', $msg, $file, $func, $line );
+	public static function add_error($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('errors', $msg, $file, $func, $line);
 		self::$_error_count++;
 	}
 	
@@ -558,11 +558,11 @@ 
 	 * @param string $line
 	 * @throws EE_Error
 	 */
-	public static function throw_exception_if_debugging( $msg = null, $file = null, $func = null, $line = null ) {
-		if( WP_DEBUG ) {
-			throw new EE_Error( $msg );
-		} else  {
-			EE_Error::add_error( $msg, $file, $func, $line );
+	public static function throw_exception_if_debugging($msg = null, $file = null, $func = null, $line = null) {
+		if (WP_DEBUG) {
+			throw new EE_Error($msg);
+		} else {
+			EE_Error::add_error($msg, $file, $func, $line);
 		}
 	}
 
@@ -580,8 +580,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_success( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'success', $msg, $file, $func, $line );
+	public static function add_success($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('success', $msg, $file, $func, $line);
 	}
 
 
@@ -598,8 +598,8 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	public static function add_attention( $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		self::_add_notice ( 'attention', $msg, $file, $func, $line );
+	public static function add_attention($msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		self::_add_notice('attention', $msg, $file, $func, $line);
 	}
 
 
@@ -617,12 +617,12 @@ 
 	* 	@param		string		$line	the line number where the error occurred - just use __LINE__
 	* 	@return 		void
 	*/
-	private static function _add_notice( $type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL ) {
-		if ( empty( $msg )) {
+	private static function _add_notice($type = 'success', $msg = NULL, $file = NULL, $func = NULL, $line = NULL) {
+		if (empty($msg)) {
 			EE_Error::doing_it_wrong(
-				'EE_Error::add_' . $type . '()',
+				'EE_Error::add_'.$type.'()',
 				sprintf(
-					__( 'Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso' ),
+					__('Notifications are not much use without a message! Please add a message to the EE_Error::add_%s() call made in %s on line %d', 'event_espresso'),
 					$type,
 					$file,
 					$line
@@ -630,17 +630,17 @@ 
 				EVENT_ESPRESSO_VERSION
 			);
 		}
-		if ( $type == 'errors' && ( empty( $file ) || empty( $func ) || empty( $line ))) {
+		if ($type == 'errors' && (empty($file) || empty($func) || empty($line))) {
 			EE_Error::doing_it_wrong(
 				'EE_Error::add_error()',
-				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso' ),
+				__('You need to provide the file name, function name, and line number that the error occurred on in order to better assist with debugging.', 'event_espresso'),
 				EVENT_ESPRESSO_VERSION
 			);
 		}
 		// get separate user and developer messages if they exist
-		$msg = explode( '||', $msg );
+		$msg = explode('||', $msg);
 		$user_msg = $msg[0];
-		$dev_msg = isset( $msg[1] ) ? $msg[1] : $msg[0];
+		$dev_msg = isset($msg[1]) ? $msg[1] : $msg[0];
 		/**
 		 * Do an action so other code can be triggered when a notice is created
 		 * @param string $type can be 'errors', 'attention', or 'success'
@@ -650,22 +650,22 @@ 
 		 * @param string $func function where error was generated
 		 * @param string $line line where error was generated
 		 */
-		do_action( 'AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line );
+		do_action('AHEE__EE_Error___add_notice', $type, $user_msg, $dev_msg, $file, $func, $line);
 		$msg = WP_DEBUG ? $dev_msg : $user_msg;
 		// add notice if message exists
-		if ( ! empty( $msg )) {
+		if ( ! empty($msg)) {
 			// get error code
-			$notice_code = EE_Error::generate_error_code( $file, $func, $line );
-			if ( WP_DEBUG && $type == 'errors' ) {
-				$msg .= '<br/><span class="tiny-text">' . $notice_code . '</span>';
+			$notice_code = EE_Error::generate_error_code($file, $func, $line);
+			if (WP_DEBUG && $type == 'errors') {
+				$msg .= '<br/><span class="tiny-text">'.$notice_code.'</span>';
 			}
 			// add notice. Index by code if it's not blank
-			if( $notice_code ) {
-				self::$_espresso_notices[ $type ][ $notice_code ] = $msg;
+			if ($notice_code) {
+				self::$_espresso_notices[$type][$notice_code] = $msg;
 			} else {
-				self::$_espresso_notices[ $type ][] = $msg;
+				self::$_espresso_notices[$type][] = $msg;
 			}
-			add_action( 'wp_footer', array( 'EE_Error', 'enqueue_error_scripts' ), 1 );
+			add_action('wp_footer', array('EE_Error', 'enqueue_error_scripts'), 1);
 		}
 
 	}
@@ -719,7 +719,7 @@ 
 	*	@access private
 	*	@return void
 	*/
-	public static function reset_notices(){
+	public static function reset_notices() {
     	self::$_espresso_notices['success'] = FALSE;
     	self::$_espresso_notices['attention'] = FALSE;
     	self::$_espresso_notices['errors'] = FALSE;
@@ -732,14 +732,14 @@ 
 	*	@access public
 	*	@return int
 	*/
-    public static function has_notices(){
+    public static function has_notices() {
 		$has_notices = 0;
 		// check for success messages
-		$has_notices = self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] ) ? 3 : $has_notices;
+		$has_notices = self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success']) ? 3 : $has_notices;
 		// check for attention messages
-		$has_notices = self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ? 2 : $has_notices;
+		$has_notices = self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention']) ? 2 : $has_notices;
 		// check for error messages
-		$has_notices = self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ? 1 : $has_notices;
+		$has_notices = self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors']) ? 1 : $has_notices;
 		return $has_notices;
 	}
 
@@ -754,9 +754,9 @@ 
 	 */
 	public static function get_vanilla_notices() {
 		return array(
-			'success' => isset( self::$_espresso_notices['success'] ) ? self::$_espresso_notices['success'] : array(),
-			'attention' => isset( self::$_espresso_notices['attention'] )  ? self::$_espresso_notices['attention'] : array(),
-			'errors' => isset( self::$_espresso_notices['errors'] ) ? self::$_espresso_notices['errors'] : array(),
+			'success' => isset(self::$_espresso_notices['success']) ? self::$_espresso_notices['success'] : array(),
+			'attention' => isset(self::$_espresso_notices['attention']) ? self::$_espresso_notices['attention'] : array(),
+			'errors' => isset(self::$_espresso_notices['errors']) ? self::$_espresso_notices['errors'] : array(),
 		);
 	}
 
@@ -772,8 +772,8 @@ 
 	* 	@param		boolean		$remove_empty		whether or not to unset empty messages
 	* 	@return 		array
 	*/
-	public static function get_notices( $format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE ) {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+	public static function get_notices($format_output = TRUE, $save_to_transient = FALSE, $remove_empty = TRUE) {
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		$success_messages = '';
 		$attention_messages = '';
@@ -783,44 +783,44 @@ 
 		// EEH_Debug_Tools::printr( self::$_espresso_notices, 'espresso_notices  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 
 		// either save notices to the db
-		if ( $save_to_transient ) {
-			update_option( 'ee_notices', self::$_espresso_notices );
+		if ($save_to_transient) {
+			update_option('ee_notices', self::$_espresso_notices);
 			return;
 		}
 		// grab any notices that have been previously saved
-		if ( $notices = get_option( 'ee_notices', FALSE )) {
-			foreach ( $notices as $type => $notice ) {
-				if ( is_array( $notice ) && ! empty( $notice )) {
+		if ($notices = get_option('ee_notices', FALSE)) {
+			foreach ($notices as $type => $notice) {
+				if (is_array($notice) && ! empty($notice)) {
 					// make sure that existsing notice type is an array
-					self::$_espresso_notices[ $type ] =  is_array( self::$_espresso_notices[ $type ] ) && ! empty( self::$_espresso_notices[ $type ] ) ? self::$_espresso_notices[ $type ] : array();
+					self::$_espresso_notices[$type] = is_array(self::$_espresso_notices[$type]) && ! empty(self::$_espresso_notices[$type]) ? self::$_espresso_notices[$type] : array();
 					// merge stored notices with any newly created ones
-					self::$_espresso_notices[ $type ] = array_merge( self::$_espresso_notices[ $type ], $notice );
+					self::$_espresso_notices[$type] = array_merge(self::$_espresso_notices[$type], $notice);
 					$print_scripts = TRUE;
 				}
 			}
 			// now clear any stored notices
-			update_option( 'ee_notices', FALSE );
+			update_option('ee_notices', FALSE);
 		}
 
 		// check for success messages
-		if ( self::$_espresso_notices['success'] && ! empty(  self::$_espresso_notices['success'] )) {
+		if (self::$_espresso_notices['success'] && ! empty(self::$_espresso_notices['success'])) {
 			// combine messages
-			$success_messages .= implode( self::$_espresso_notices['success'], '<br />' );
+			$success_messages .= implode(self::$_espresso_notices['success'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for attention messages
-		if ( self::$_espresso_notices['attention'] && ! empty(  self::$_espresso_notices['attention'] ) ) {
+		if (self::$_espresso_notices['attention'] && ! empty(self::$_espresso_notices['attention'])) {
 			// combine messages
-			$attention_messages .= implode( self::$_espresso_notices['attention'], '<br />' );
+			$attention_messages .= implode(self::$_espresso_notices['attention'], '<br />');
 			$print_scripts = TRUE;
 		}
 
 		// check for error messages
-		if ( self::$_espresso_notices['errors'] && ! empty(  self::$_espresso_notices['errors'] ) ) {
-			$error_messages .= count( self::$_espresso_notices['errors'] ) > 1 ? __( 'The following errors have occurred:<br />', 'event_espresso' ) : __( 'An error has occurred:<br />', 'event_espresso' );
+		if (self::$_espresso_notices['errors'] && ! empty(self::$_espresso_notices['errors'])) {
+			$error_messages .= count(self::$_espresso_notices['errors']) > 1 ? __('The following errors have occurred:<br />', 'event_espresso') : __('An error has occurred:<br />', 'event_espresso');
 			// combine messages
-			$error_messages .= implode( self::$_espresso_notices['errors'], '<br />' );
+			$error_messages .= implode(self::$_espresso_notices['errors'], '<br />');
 			$print_scripts = TRUE;
 		}
 
@@ -834,21 +834,21 @@ 
 				$css_id = is_admin() ? 'message' : 'espresso-notices-success';
 				$css_class = is_admin() ? 'updated fade' : 'success fade-away';
 				//showMessage( $success_messages );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $success_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$success_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($attention_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-attention';
 				$css_class = is_admin() ? 'updated ee-notices-attention' : 'attention fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $attention_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$attention_messages.'</p>'.$close.'</div>';
 			}
 
 			if ($error_messages != '') {
 				$css_id = is_admin() ? 'message' : 'espresso-notices-error';
 				$css_class = is_admin() ? 'error' : 'error fade-away';
 				//showMessage( $error_messages, TRUE );
-				$notices .= '<div id="' . $css_id . '" class="espresso-notices ' . $css_class . '" style="display:none;"><p>' . $error_messages . '</p>' . $close . '</div>';
+				$notices .= '<div id="'.$css_id.'" class="espresso-notices '.$css_class.'" style="display:none;"><p>'.$error_messages.'</p>'.$close.'</div>';
 			}
 
 			$notices .= '</div>';
@@ -861,7 +861,7 @@ 
 					'errors' => $error_messages
 			);
 
-			if ( $remove_empty ) {
+			if ($remove_empty) {
 				// remove empty notices
 				foreach ($notices as $type => $notice) {
 					if (empty($notice)) {
@@ -871,7 +871,7 @@ 
 			}
 		}
 
-		if ( $print_scripts ) {
+		if ($print_scripts) {
 			self::_print_scripts();
 		}
 
@@ -891,17 +891,17 @@ 
 	* 	@param bool $force_update allows one to enforce the reappearance of a persistent message.
 	* 	@return 		void
 	*/
-	public static function add_persistent_admin_notice( $pan_name = '', $pan_message, $force_update = FALSE ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function add_persistent_admin_notice($pan_name = '', $pan_message, $force_update = FALSE) {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			//maybe initialize persistent_admin_notices
-			if ( empty( $persistent_admin_notices )) {
-				add_option( 'ee_pers_admin_notices', array(), '', 'no' );
+			if (empty($persistent_admin_notices)) {
+				add_option('ee_pers_admin_notices', array(), '', 'no');
 			}
-			$pan_name = sanitize_key( $pan_name );
-			if ( ! array_key_exists( $pan_name, $persistent_admin_notices ) || $force_update ) {
-				$persistent_admin_notices[ $pan_name ] = $pan_message;
-				update_option( 'ee_pers_admin_notices', $persistent_admin_notices );
+			$pan_name = sanitize_key($pan_name);
+			if ( ! array_key_exists($pan_name, $persistent_admin_notices) || $force_update) {
+				$persistent_admin_notices[$pan_name] = $pan_message;
+				update_option('ee_pers_admin_notices', $persistent_admin_notices);
 			}
 		}
 	}
@@ -917,34 +917,34 @@ 
 	 * @param bool          $return_immediately
 	 * @return        void
 	 */
-	public static function dismiss_persistent_admin_notice( $pan_name = '', $purge = FALSE, $return_immediately = FALSE ) {
-		$pan_name = EE_Registry::instance()->REQ->is_set( 'ee_nag_notice' ) ? EE_Registry::instance()->REQ->get( 'ee_nag_notice' ) : $pan_name;
-		if ( ! empty( $pan_name )) {
-			$persistent_admin_notices = get_option( 'ee_pers_admin_notices', array() );
+	public static function dismiss_persistent_admin_notice($pan_name = '', $purge = FALSE, $return_immediately = FALSE) {
+		$pan_name = EE_Registry::instance()->REQ->is_set('ee_nag_notice') ? EE_Registry::instance()->REQ->get('ee_nag_notice') : $pan_name;
+		if ( ! empty($pan_name)) {
+			$persistent_admin_notices = get_option('ee_pers_admin_notices', array());
 			// check if notice we wish to dismiss is actually in the $persistent_admin_notices array
-			if ( is_array( $persistent_admin_notices ) && isset( $persistent_admin_notices[ $pan_name ] )) {
+			if (is_array($persistent_admin_notices) && isset($persistent_admin_notices[$pan_name])) {
 				// completely delete nag notice, or just NULL message so that it can NOT be added again ?
-				if ( $purge ) {
-					unset( $persistent_admin_notices[ $pan_name ] );
+				if ($purge) {
+					unset($persistent_admin_notices[$pan_name]);
 				} else {
-					$persistent_admin_notices[ $pan_name ] = NULL;
+					$persistent_admin_notices[$pan_name] = NULL;
 				}
-				if ( update_option( 'ee_pers_admin_notices', $persistent_admin_notices ) === FALSE ) {
-					EE_Error::add_error( sprintf( __( 'The persistent admin notice for "%s" could not be deleted.', 'event_espresso' ), $pan_name ), __FILE__, __FUNCTION__, __LINE__ );
+				if (update_option('ee_pers_admin_notices', $persistent_admin_notices) === FALSE) {
+					EE_Error::add_error(sprintf(__('The persistent admin notice for "%s" could not be deleted.', 'event_espresso'), $pan_name), __FILE__, __FUNCTION__, __LINE__);
 				}
 			}
 		}
-		if ( $return_immediately ) {
+		if ($return_immediately) {
 			return;
-		} else if ( EE_Registry::instance()->REQ->ajax ) {
+		} else if (EE_Registry::instance()->REQ->ajax) {
 			// grab any notices and concatenate into string
-			echo json_encode( array( 'errors' => implode( '<br />', EE_Error::get_notices( FALSE ))));
+			echo json_encode(array('errors' => implode('<br />', EE_Error::get_notices(FALSE))));
 			exit();
 		} else {
 			// save errors to a transient to be displayed on next request (after redirect)
-			EE_Error::get_notices( FALSE, TRUE );
-			$return_url = EE_Registry::instance()->REQ->is_set( 'return_url' ) ? EE_Registry::instance()->REQ->get( 'return_url' ) : '';
-			wp_safe_redirect( urldecode( $return_url ));
+			EE_Error::get_notices(FALSE, TRUE);
+			$return_url = EE_Registry::instance()->REQ->is_set('return_url') ? EE_Registry::instance()->REQ->get('return_url') : '';
+			wp_safe_redirect(urldecode($return_url));
 		}
 	}
 
@@ -959,20 +959,20 @@ 
 	* 	@param		string	$return_url	URL to go back to aftger nag notice is dismissed
 	 *  	@return 		string
 	 */
-	public static function display_persistent_admin_notices( $pan_name = '', $pan_message = '', $return_url = '' ) {
-		if ( ! empty( $pan_name ) && ! empty( $pan_message )) {
+	public static function display_persistent_admin_notices($pan_name = '', $pan_message = '', $return_url = '') {
+		if ( ! empty($pan_name) && ! empty($pan_message)) {
 			$args = array(
 				'nag_notice' => $pan_name,
-				'return_url' => urlencode( $return_url ),
+				'return_url' => urlencode($return_url),
 				'ajax_url' => WP_AJAX_URL,
-				'unknown_error' => __( 'An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso' )
+				'unknown_error' => __('An unknown error has occurred on the server while attempting to dismiss this notice.', 'event_espresso')
 			);
-			wp_localize_script( 'espresso_core', 'ee_dismiss', $args );
+			wp_localize_script('espresso_core', 'ee_dismiss', $args);
 			return '
-			<div id="' . $pan_name . '" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
-				<p>' . $pan_message . '</p>
-				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name . '">
-					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__( 'Dismiss', 'event_espresso' ) .'
+			<div id="' . $pan_name.'" class="espresso-notices updated ee-nag-notice clearfix" style="border-left: 4px solid #fcb93c;">
+				<p>' . $pan_message.'</p>
+				<a class="dismiss-ee-nag-notice hide-if-no-js" style="float: right; cursor: pointer; text-decoration:none;" rel="' . $pan_name.'">
+					<span class="dashicons dashicons-dismiss" style="position:relative; top:-1px; margin-right:.25em;"></span>'.__('Dismiss', 'event_espresso').'
 				</a>
 				<div style="clear:both;"></div>
 			</div>';
@@ -988,24 +988,24 @@ 
 	 * @param string $return_url
 	 * @return    array
 	 */
-	public static function get_persistent_admin_notices( $return_url = '' ) {
+	public static function get_persistent_admin_notices($return_url = '') {
 		$notices = '';
 		// check for persistent admin notices
 		//filter the list though so plugins can notify the admin in a different way if they want
 		$persistent_admin_notices = apply_filters( 
 			'FHEE__EE_Error__get_persistent_admin_notices',
-			get_option( 'ee_pers_admin_notices', FALSE ),
+			get_option('ee_pers_admin_notices', FALSE),
 			'ee_pers_admin_notices',
 			$return_url
 		);
-		if ( $persistent_admin_notices ) {
+		if ($persistent_admin_notices) {
 			// load scripts
-			wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE );
-			wp_enqueue_script( 'ee_error_js' );
+			wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, TRUE);
+			wp_enqueue_script('ee_error_js');
 			// and display notices
-			foreach( $persistent_admin_notices as $pan_name => $pan_message ) {
-				$notices .= self::display_persistent_admin_notices( $pan_name, $pan_message, $return_url );
+			foreach ($persistent_admin_notices as $pan_name => $pan_message) {
+				$notices .= self::display_persistent_admin_notices($pan_name, $pan_message, $return_url);
 			}
 		}
 		return $notices;
@@ -1020,26 +1020,26 @@ 
 	 * @param 	bool $force_print
 	 * @return 	void
 	 */
-	private static function _print_scripts( $force_print = FALSE ) {
-		if (( did_action( 'admin_enqueue_scripts' ) || did_action( 'wp_enqueue_scripts' )) && ! $force_print ) {
-			if ( wp_script_is( 'ee_error_js', 'enqueued' )) {
+	private static function _print_scripts($force_print = FALSE) {
+		if ((did_action('admin_enqueue_scripts') || did_action('wp_enqueue_scripts')) && ! $force_print) {
+			if (wp_script_is('ee_error_js', 'enqueued')) {
 				return;
-			} else if ( wp_script_is( 'ee_error_js', 'registered' )) {
-				add_filter( 'FHEE_load_css', '__return_true' );
-				add_filter( 'FHEE_load_js', '__return_true' );
-				wp_enqueue_script( 'ee_error_js' );
-				wp_localize_script( 'ee_error_js','ee_settings', array( 'wp_debug'=>WP_DEBUG ));
+			} else if (wp_script_is('ee_error_js', 'registered')) {
+				add_filter('FHEE_load_css', '__return_true');
+				add_filter('FHEE_load_js', '__return_true');
+				wp_enqueue_script('ee_error_js');
+				wp_localize_script('ee_error_js', 'ee_settings', array('wp_debug'=>WP_DEBUG));
 			}
 		} else {
 			return '
 <script>
 /* <![CDATA[ */
-var ee_settings = {"wp_debug":"' . WP_DEBUG . '"};
+var ee_settings = {"wp_debug":"' . WP_DEBUG.'"};
 /* ]]> */
 </script>
-<script src="' . includes_url() . 'js/jquery/jquery.js" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
-<script src="' . EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js' . '?ver=' . espresso_version() . '" type="text/javascript"></script>
+<script src="' . includes_url().'js/jquery/jquery.js" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
+<script src="' . EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js'.'?ver='.espresso_version().'" type="text/javascript"></script>
 ';
 
 		}
@@ -1073,11 +1073,11 @@ 
 	*	@ param string $line
 	*	@ return string
 	*/
-	public static function generate_error_code ( $file = '', $func = '', $line = '' ) {
-		$file = explode( '.', basename( $file ));
-		$error_code = ! empty( $file[0] ) ? $file[0] : '';
-		$error_code .= ! empty( $func ) ? ' - ' . $func : '';
-		$error_code .= ! empty( $line ) ? ' - ' . $line : '';
+	public static function generate_error_code($file = '', $func = '', $line = '') {
+		$file = explode('.', basename($file));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($func) ? ' - '.$func : '';
+		$error_code .= ! empty($line) ? ' - '.$line : '';
 		return $error_code;
 	}
 
@@ -1093,36 +1093,36 @@ 
 	*	@ param object $ex
 	*	@ return void
 	*/
-	public function write_to_error_log ( $time = FALSE, $ex = FALSE, $clear = FALSE ) {
+	public function write_to_error_log($time = FALSE, $ex = FALSE, $clear = FALSE) {
 
-		if ( ! $ex ) {
+		if ( ! $ex) {
 			return;
 		}
 
-		if ( ! $time ) {
+		if ( ! $time) {
 			$time = time();
 		}
 
-		$exception_log = '----------------------------------------------------------------------------------------' . PHP_EOL;
-		$exception_log .= '[' . date( 'Y-m-d H:i:s', $time ) . ']  Exception Details' . PHP_EOL;
-		$exception_log .= 'Message: ' . $ex['msg'] . PHP_EOL;
-		$exception_log .= 'Code: '. $ex['code'] . PHP_EOL;
-		$exception_log .= 'File: '. $ex['file'] . PHP_EOL;
-		$exception_log .= 'Line No: ' . $ex['line'] . PHP_EOL;
-		$exception_log .= 'Stack trace: ' . PHP_EOL;
-		$exception_log .= $ex['string'] . PHP_EOL;
-		$exception_log .= '----------------------------------------------------------------------------------------' . PHP_EOL;
+		$exception_log = '----------------------------------------------------------------------------------------'.PHP_EOL;
+		$exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+		$exception_log .= 'Message: '.$ex['msg'].PHP_EOL;
+		$exception_log .= 'Code: '.$ex['code'].PHP_EOL;
+		$exception_log .= 'File: '.$ex['file'].PHP_EOL;
+		$exception_log .= 'Line No: '.$ex['line'].PHP_EOL;
+		$exception_log .= 'Stack trace: '.PHP_EOL;
+		$exception_log .= $ex['string'].PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------'.PHP_EOL;
 
 		try {
-			EEH_File::ensure_file_exists_and_is_writable( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file );
-			EEH_File::add_htaccess_deny_from_all( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' ); 
-			if ( ! $clear ) {
+			EEH_File::ensure_file_exists_and_is_writable(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file);
+			EEH_File::add_htaccess_deny_from_all(EVENT_ESPRESSO_UPLOAD_DIR.'logs'); 
+			if ( ! $clear) {
 				//get existing log file and append new log info
-				$exception_log = EEH_File::get_file_contents( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file ) . $exception_log;
+				$exception_log = EEH_File::get_file_contents(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file).$exception_log;
 			}
-			EEH_File::write_to_file( EVENT_ESPRESSO_UPLOAD_DIR . 'logs' . DS . self::$_exception_log_file, $exception_log );
-		} catch( EE_Error $e ){
-			EE_Error::add_error( sprintf( __(  'Event Espresso error logging could not be setup because: %s', 'event_espresso' ), $e->getMessage() ));
+			EEH_File::write_to_file(EVENT_ESPRESSO_UPLOAD_DIR.'logs'.DS.self::$_exception_log_file, $exception_log);
+		} catch (EE_Error $e) {
+			EE_Error::add_error(sprintf(__('Event Espresso error logging could not be setup because: %s', 'event_espresso'), $e->getMessage()));
 			return;
 		}
 
@@ -1146,9 +1146,9 @@ 
 	 * @param int     $error_type
 	 * @return void
 	 */
-	public static function doing_it_wrong( $function, $message, $version, $error_type = E_USER_NOTICE ) {
-		if ( defined('WP_DEBUG') && WP_DEBUG ) {
-			EEH_Debug_Tools::instance()->doing_it_wrong( $function, $message, $version, $error_type );
+	public static function doing_it_wrong($function, $message, $version, $error_type = E_USER_NOTICE) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
+			EEH_Debug_Tools::instance()->doing_it_wrong($function, $message, $version, $error_type);
 		}
 	}
 	
@@ -1180,13 +1180,13 @@ 
  */
 function espresso_error_enqueue_scripts() {
 	// js for error handling
-	wp_register_script( 'espresso_core', EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE );
-	wp_register_script( 'ee_error_js', EE_GLOBAL_ASSETS_URL . 'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE );
+	wp_register_script('espresso_core', EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js', array('jquery'), EVENT_ESPRESSO_VERSION, FALSE);
+	wp_register_script('ee_error_js', EE_GLOBAL_ASSETS_URL.'scripts/EE_Error.js', array('espresso_core'), EVENT_ESPRESSO_VERSION, FALSE);
 }
-if ( is_admin() ) {
-	add_action( 'admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+if (is_admin()) {
+	add_action('admin_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 } else {
-	add_action( 'wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2 );
+	add_action('wp_enqueue_scripts', 'espresso_error_enqueue_scripts', 2);
 }
 
 

core/db_models/EEM_Base.model.php

Spacing +968 added lines, -968 removed lines

@@ -23,7 +23,7 @@ 
  * @since 				EE4
  *
  */
-abstract class EEM_Base extends EE_Base{
+abstract class EEM_Base extends EE_Base {
 
 	//admin posty
 	//basic -> grants access to mine -> if they don't have it, select none
@@ -243,7 +243,7 @@ 
 	 * Flag indicating whether this model has a primary key or not
 	 * @var boolean
 	 */
-	protected $_has_primary_key_field=null;
+	protected $_has_primary_key_field = null;
 
 	/**
 	 * Whether or not this model is based off a table in WP core only (CPTs should set
@@ -305,19 +305,19 @@ 
 	 * operators that work like 'BETWEEN'.  Typically used for datetime calculations, i.e. "BETWEEN '12-1-2011' AND '12-31-2012'"
 	 * @var array
 	 */
-	protected $_between_style_operators = array( 'BETWEEN' );
+	protected $_between_style_operators = array('BETWEEN');
 
 	/**
 	 * operators that are used for handling NUll and !NULL queries.  Typically used for when checking if a row exists on a join table.
 	 * @var array
 	 */
-	protected $_null_style_operators = array( 'IS NOT NULL', 'IS NULL');
+	protected $_null_style_operators = array('IS NOT NULL', 'IS NULL');
 
 	/**
 	 * Allowed values for $query_params['order'] for ordering in queries
 	 * @var array
 	 */
-	protected $_allowed_order_values = array('asc','desc','ASC','DESC');
+	protected $_allowed_order_values = array('asc', 'desc', 'ASC', 'DESC');
 
 	/**
 	 * When these are keys in a WHERE or HAVING clause, they are handled much differently
@@ -331,13 +331,13 @@ 
 	 * 'where', but 'where' clauses are so common that we thought we'd omit it
 	 * @var array
 	 */
-	private $_allowed_query_params = array(0, 'limit','order_by','group_by','having','force_join','order','on_join_limit','default_where_conditions', 'caps');
+	private $_allowed_query_params = array(0, 'limit', 'order_by', 'group_by', 'having', 'force_join', 'order', 'on_join_limit', 'default_where_conditions', 'caps');
 
 	/**
 	 * All the data types that can be used in $wpdb->prepare statements.
 	 * @var array
 	 */
-	private $_valid_wpdb_data_types = array('%d','%s','%f');
+	private $_valid_wpdb_data_types = array('%d', '%s', '%f');
 
 	/**
 	 * 	EE_Registry Object
@@ -370,17 +370,17 @@ 
 	/**
 	 * constant used to show EEM_Base has not yet verified the db on this http request
 	 */
-	const db_verified_none 		= 0;
+	const db_verified_none = 0;
 	/**
 	 * constant used to show EEM_Base has verified the EE core db on this http request,
 	 * but not the addons' dbs
 	 */
-	const db_verified_core 		= 1;
+	const db_verified_core = 1;
 	/**
 	 * constant used to show EEM_Base has verified the addons' dbs (and implicitly
 	 * the EE core db too)
 	 */
-	const db_verified_addons 	= 2;
+	const db_verified_addons = 2;
 
 	/**
 	 * indicates whether an EEM_Base child has already re-verified the DB
@@ -411,13 +411,13 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 		// check that the model has not been loaded too soon
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' )) {
-			throw new EE_Error (
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons')) {
+			throw new EE_Error(
 				sprintf(
-					__( 'The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso' ),
-					get_class( $this )
+					__('The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -425,7 +425,7 @@ 
 		/**
 		 * Set blogid for models to current blog. However we ONLY do this if $_model_query_blog_id is not already set.
 		 */
-		if ( empty( EEM_Base::$_model_query_blog_id ) ) {
+		if (empty(EEM_Base::$_model_query_blog_id)) {
 			EEM_Base::set_model_query_blog_id();
 		}
 
@@ -434,11 +434,11 @@ 
 		 * just use EE_Register_Model_Extension
 		 * @var EE_Table_Base[] $_tables
 		 */
-		$this->_tables = apply_filters( 'FHEE__'.get_class($this).'__construct__tables', $this->_tables );
-		foreach($this->_tables as $table_alias => $table_obj){
+		$this->_tables = apply_filters('FHEE__'.get_class($this).'__construct__tables', $this->_tables);
+		foreach ($this->_tables as $table_alias => $table_obj) {
 			/** @var $table_obj EE_Table_Base */
 			$table_obj->_construct_finalize_with_alias($table_alias);
-			if( $table_obj instanceof EE_Secondary_Table ){
+			if ($table_obj instanceof EE_Secondary_Table) {
 				/** @var $table_obj EE_Secondary_Table */
 				$table_obj->_construct_finalize_set_table_to_join_with($this->_get_main_table());
 			}
@@ -448,54 +448,54 @@ 
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Field_Base[] $_fields
 		 */
-		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields',$this->_fields);
+		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields', $this->_fields);
 		$this->_invalidate_field_caches();
-		foreach($this->_fields as $table_alias => $fields_for_table){
-			if ( ! array_key_exists( $table_alias, $this->_tables )){
-				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s",'event_espresso'),$table_alias,implode(",",$this->_fields)));
+		foreach ($this->_fields as $table_alias => $fields_for_table) {
+			if ( ! array_key_exists($table_alias, $this->_tables)) {
+				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s", 'event_espresso'), $table_alias, implode(",", $this->_fields)));
 			}
-			foreach($fields_for_table as $field_name => $field_obj){
+			foreach ($fields_for_table as $field_name => $field_obj) {
 				/** @var $field_obj EE_Model_Field_Base | EE_Primary_Key_Field_Base */
 				//primary key field base has a slightly different _construct_finalize
 				/** @var $field_obj EE_Model_Field_Base */
-				$field_obj->_construct_finalize( $table_alias, $field_name, $this->get_this_model_name() );
+				$field_obj->_construct_finalize($table_alias, $field_name, $this->get_this_model_name());
 			}
 		}
 
 		// everything is related to Extra_Meta
-		if( get_class($this) !== 'EEM_Extra_Meta'){
+		if (get_class($this) !== 'EEM_Extra_Meta') {
 			//make extra meta related to everything, but don't block deleting things just
 			//because they have related extra meta info. For now just orphan those extra meta
 			//in the future we should automatically delete them
-			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation( FALSE );
+			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		//and change logs
-		if( get_class( $this) !==  'EEM_Change_Log' ) {
-			$this->_model_relations[ 'Change_Log' ] = new EE_Has_Many_Any_Relation( FALSE );
+		if (get_class($this) !== 'EEM_Change_Log') {
+			$this->_model_relations['Change_Log'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		/**
 		 * Filters the list of relations on a model. It is best to NOT use this directly and instead just use
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Relation_Base[] $_model_relations
 		 */
-		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations',$this->_model_relations);
-		foreach($this->_model_relations as $model_name => $relation_obj){
+		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations', $this->_model_relations);
+		foreach ($this->_model_relations as $model_name => $relation_obj) {
 			/** @var $relation_obj EE_Model_Relation_Base */
 			$relation_obj->_construct_finalize_set_models($this->get_this_model_name(), $model_name);
 		}
-		foreach($this->_indexes as $index_name => $index_obj){
+		foreach ($this->_indexes as $index_name => $index_obj) {
 			/** @var $index_obj EE_Index */
 			$index_obj->_construct_finalize($index_name, $this->get_this_model_name());
 		}
 
 		$this->set_timezone($timezone);
 		//finalize default where condition strategy, or set default
-		if( ! $this->_default_where_conditions_strategy){
+		if ( ! $this->_default_where_conditions_strategy) {
 			//nothing was set during child constructor, so set default
 			$this->_default_where_conditions_strategy = new EE_Default_Where_Conditions();
 		}
 		$this->_default_where_conditions_strategy->_finalize_construct($this);
-		if( ! $this->_minimum_where_conditions_strategy){
+		if ( ! $this->_minimum_where_conditions_strategy) {
 			//nothing was set during child constructor, so set default
 			$this->_minimum_where_conditions_strategy = new EE_Default_Where_Conditions();
 		}
@@ -503,14 +503,14 @@ 
 
 		//if the cap slug hasn't been set, and we haven't set it to false on purpose
 		//to indicate to NOT set it, set it to the logical default
-		if( $this->_caps_slug === null ) {
-			$this->_caps_slug = EEH_Inflector::pluralize_and_lower( $this->get_this_model_name() );
+		if ($this->_caps_slug === null) {
+			$this->_caps_slug = EEH_Inflector::pluralize_and_lower($this->get_this_model_name());
 		}
 		//initialize the standard cap restriction generators if none were specified by the child constructor
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ){
-				if( ! isset( $this->_cap_restriction_generators[ $cap_context ] ) ) {
-					$this->_cap_restriction_generators[ $cap_context ] = apply_filters(
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+				if ( ! isset($this->_cap_restriction_generators[$cap_context])) {
+					$this->_cap_restriction_generators[$cap_context] = apply_filters(
 						'FHEE__EEM_Base___construct__standard_cap_restriction_generator',
 						new EE_Restriction_Generator_Protected(),
 						$cap_context,
@@ -520,23 +520,23 @@ 
 			}
 		}
 		//if there are cap restriction generators, use them to make the default cap restrictions
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->_cap_restriction_generators as $context => $generator_object ) {
-				if( ! $generator_object ){
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->_cap_restriction_generators as $context => $generator_object) {
+				if ( ! $generator_object) {
 					continue;
 				}
-				if( ! $generator_object instanceof EE_Restriction_Generator_Base ){
+				if ( ! $generator_object instanceof EE_Restriction_Generator_Base) {
 					throw new EE_Error(
 						sprintf(
-							__( 'Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso' ),
+							__('Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso'),
 							$context,
 							$this->get_this_model_name()
 						)
 					);
 				}
-				$action = $this->cap_action_for_context( $context );
-				if( ! $generator_object->construction_finalized() ){
-					$generator_object->_construct_finalize( $this, $action );
+				$action = $this->cap_action_for_context($context);
+				if ( ! $generator_object->construction_finalized()) {
+					$generator_object->_construct_finalize($this, $action);
 				}
 
 			}
@@ -550,11 +550,11 @@ 
 	 * @param string $context one of EEM_Base::valid_cap_contexts()
 	 * @return EE_Default_Where_Conditions[]
 	 */
-	protected function _generate_cap_restrictions( $context ){
-		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
-				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base ) {
-			return $this->_cap_restriction_generators[ $context ]->generate_restrictions();
-		}else{
+	protected function _generate_cap_restrictions($context) {
+		if (isset($this->_cap_restriction_generators[$context]) &&
+				$this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base) {
+			return $this->_cap_restriction_generators[$context]->generate_restrictions();
+		} else {
 			return array();
 		}
 	}
@@ -566,7 +566,7 @@ 
 	 * @param int $blog_id  If provided then will set the blog_id for the models to this id.  If not provided then the
 	 *                      value for get_current_blog_id() will be used.
 	 */
-	public static function set_model_query_blog_id( $blog_id = 0 ) {
+	public static function set_model_query_blog_id($blog_id = 0) {
 		EEM_Base::$_model_query_blog_id = $blog_id > 0 ? (int) $blog_id : get_current_blog_id();
 	}
 
@@ -591,16 +591,16 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return static (as in the concrete child class)
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of Espresso_model already exists
 		if ( ! static::$_instance instanceof static) {
 			// instantiate Espresso_model
-			static::$_instance = new static( $timezone );
+			static::$_instance = new static($timezone);
 		}
 
 		//we might have a timezone set, let set_timezone decide what to do with it
-		static::$_instance->set_timezone( $timezone );
+		static::$_instance->set_timezone($timezone);
 
 		// Espresso_model object
 		return static::$_instance;
@@ -613,11 +613,11 @@ 
 	 * @param null | string $timezone
 	 * @return static
 	 */
-	public static function reset(  $timezone = NULL ){
-		if ( ! is_null( static::$_instance ) ) {
+	public static function reset($timezone = NULL) {
+		if ( ! is_null(static::$_instance)) {
 			static::$_instance = null;
 
-			return self::instance( $timezone );
+			return self::instance($timezone);
 		}
 		return null;
 	}
@@ -631,19 +631,19 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	 public function status_array( $translated = FALSE ) {
-		 if ( ! array_key_exists( 'Status', $this->_model_relations ) ) {
+	 public function status_array($translated = FALSE) {
+		 if ( ! array_key_exists('Status', $this->_model_relations)) {
 			 return array();
 		 }
 		 $model_name = $this->get_this_model_name();
-		 $status_type = str_replace( ' ', '_', strtolower( str_replace( '_', ' ', $model_name ) ) );
-		 $stati = EEM_Status::instance()->get_all( array( array( 'STS_type' => $status_type ) ) );
+		 $status_type = str_replace(' ', '_', strtolower(str_replace('_', ' ', $model_name)));
+		 $stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type)));
 		 $status_array = array();
-		 foreach ( $stati as $status ) {
-			 $status_array[ $status->ID() ] = $status->get( 'STS_code' );
+		 foreach ($stati as $status) {
+			 $status_array[$status->ID()] = $status->get('STS_code');
 		 }
 		 return $translated
-			 ? EEM_Status::instance()->localized_status( $status_array, false, 'sentence' )
+			 ? EEM_Status::instance()->localized_status($status_array, false, 'sentence')
 			 : $status_array;
 	 }
 
@@ -776,10 +776,10 @@ 
 	 *		));
 	 * @throws \EE_Error
 	 */
-	public function get_all($query_params = array()){
-		if( isset( $query_params[ 'limit' ] )
-			&& ! isset( $query_params[ 'group_by' ] ) ) {
-			$query_params[ 'group_by' ] = array_keys( $this->get_combined_primary_key_fields() );
+	public function get_all($query_params = array()) {
+		if (isset($query_params['limit'])
+			&& ! isset($query_params['group_by'])) {
+			$query_params['group_by'] = array_keys($this->get_combined_primary_key_fields());
 		}
 		return $this->_create_objects($this->_get_all_wpdb_results($query_params, ARRAY_A, NULL));
 	}
@@ -790,10 +790,10 @@ 
 	 * @param array $query_params @see EEM_Base::get_all()
 	 * @return array like EEM_Base::get_all
 	 */
-	public function alter_query_params_to_only_include_mine( $query_params = array() ) {
+	public function alter_query_params_to_only_include_mine($query_params = array()) {
 		$wp_user_field_name = $this->wp_user_field_name();
-		if( $wp_user_field_name ){
-			$query_params[0][ $wp_user_field_name ] = get_current_user_id();
+		if ($wp_user_field_name) {
+			$query_params[0][$wp_user_field_name] = get_current_user_id();
 		}
 		return $query_params;
 	}
@@ -806,19 +806,19 @@ 
 	 * foreign key to the WP_User table
 	 */
 	public function wp_user_field_name() {
-		try{
-			if( ! empty( $this->_model_chain_to_wp_user ) ) {
-				$models_to_follow_to_wp_users = explode( '.', $this->_model_chain_to_wp_user );
-				$last_model_name = end( $models_to_follow_to_wp_users );
-				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model( $last_model_name );
-				$model_chain_to_wp_user = $this->_model_chain_to_wp_user . '.';
-			}else{
+		try {
+			if ( ! empty($this->_model_chain_to_wp_user)) {
+				$models_to_follow_to_wp_users = explode('.', $this->_model_chain_to_wp_user);
+				$last_model_name = end($models_to_follow_to_wp_users);
+				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model($last_model_name);
+				$model_chain_to_wp_user = $this->_model_chain_to_wp_user.'.';
+			} else {
 				$model_with_fk_to_wp_users = $this;
 				$model_chain_to_wp_user = '';
 			}
-			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to( 'WP_User' );
-			return $model_chain_to_wp_user . $wp_user_field->get_name();
-		}catch( EE_Error $e ) {
+			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to('WP_User');
+			return $model_chain_to_wp_user.$wp_user_field->get_name();
+		} catch (EE_Error $e) {
 			return false;
 		}
 	}
@@ -832,7 +832,7 @@ 
 	 * (or transiently-related model)
 	 * @return string
 	 */
-	public function model_chain_to_wp_user(){
+	public function model_chain_to_wp_user() {
 		return $this->_model_chain_to_wp_user;
 	}
 
@@ -844,13 +844,13 @@ 
 	 * @return boolean
 	 */
 	public function is_owned() {
-		if( $this->model_chain_to_wp_user() ){
+		if ($this->model_chain_to_wp_user()) {
 			return true;
-		}else{
-			try{
-				$this->get_foreign_key_to( 'WP_User' );
+		} else {
+			try {
+				$this->get_foreign_key_to('WP_User');
 				return true;
-			}catch( EE_Error $e ){
+			} catch (EE_Error $e) {
 				return false;
 			}
 		}
@@ -872,17 +872,17 @@ 
 	 * @return array | stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 * @throws \EE_Error
 	 */
-	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		// remember the custom selections, if any, and type cast as array
 		// (unless $columns_to_select is an object, then just set as an empty array)
 		// Note: (array) 'some string' === array( 'some string' )
-		$this->_custom_selections = ! is_object( $columns_to_select ) ? (array) $columns_to_select : array();
-		$model_query_info = $this->_create_model_query_info_carrier( $query_params );
+		$this->_custom_selections = ! is_object($columns_to_select) ? (array) $columns_to_select : array();
+		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $columns_to_select !== null
-			? $this->_construct_select_from_input( $columns_to_select )
-			: $this->_construct_default_select_sql( $model_query_info );
-		$SQL = "SELECT $select_expressions " . $this->_construct_2nd_half_of_select_query( $model_query_info );
-		return $this->_do_wpdb_query( 'get_results', array( $SQL, $output ) );
+			? $this->_construct_select_from_input($columns_to_select)
+			: $this->_construct_default_select_sql($model_query_info);
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		return $this->_do_wpdb_query('get_results', array($SQL, $output));
 	}
 
 	/**
@@ -900,7 +900,7 @@ 
 	 * @return array|stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 * @throws \EE_Error
 	 */
-	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		return $this->_get_all_wpdb_results($query_params, $output, $columns_to_select);
 	}
 
@@ -912,12 +912,12 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_select_from_input($columns_to_select){
-		if(is_array($columns_to_select)){
+	private function _construct_select_from_input($columns_to_select) {
+		if (is_array($columns_to_select)) {
 			$select_sql_array = array();
 
-			foreach($columns_to_select as $alias => $selection_and_datatype){
-				if( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])){
+			foreach ($columns_to_select as $alias => $selection_and_datatype) {
+				if ( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])) {
 					throw new EE_Error(
 						sprintf(
 							__(
@@ -929,24 +929,24 @@ 
 						)
 					);
 				}
-				if( ! in_array( $selection_and_datatype[1],$this->_valid_wpdb_data_types)){
+				if ( ! in_array($selection_and_datatype[1], $this->_valid_wpdb_data_types)) {
 					throw new EE_Error(
 						sprintf(
 							__(
 								"Datatype %s (for selection '%s' and alias '%s') is not a valid wpdb datatype (eg %%s)",
 								"event_espresso"
 							),
-							$selection_and_datatype[ 1 ],
-							$selection_and_datatype[ 0 ],
+							$selection_and_datatype[1],
+							$selection_and_datatype[0],
 							$alias,
-							implode( ",", $this->_valid_wpdb_data_types )
+							implode(",", $this->_valid_wpdb_data_types)
 						)
 					);
 				}
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
-			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+			$columns_to_select_string = implode(", ", $select_sql_array);
+		} else {
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -961,7 +961,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function primary_key_name(){
+	public function primary_key_name() {
 		return $this->get_primary_key_field()->get_name();
 	}
 
@@ -973,14 +973,14 @@ 
 	 * @param mixed $id int or string, depending on the type of the model's primary key
 	 * @return EE_Base_Class
 	 */
-	public function get_one_by_ID($id){
-		if( $this->get_from_entity_map( $id ) ){
-			return $this->get_from_entity_map( $id );
+	public function get_one_by_ID($id) {
+		if ($this->get_from_entity_map($id)) {
+			return $this->get_from_entity_map($id);
 		}
 		return $this->get_one(
 			$this->alter_query_params_to_restrict_by_ID(
 				$id,
-				array( 'default_where_conditions' => 'minimum' )
+				array('default_where_conditions' => 'minimum')
 			)
 		);
 	}
@@ -996,15 +996,15 @@ 
 	 * @return array of normal query params, @see EEM_Base::get_all
 	 * @throws \EE_Error
 	 */
-	public function alter_query_params_to_restrict_by_ID( $id, $query_params = array() ) {
-		if( ! isset( $query_params[ 0 ] ) ) {
-			$query_params[ 0 ] = array();
+	public function alter_query_params_to_restrict_by_ID($id, $query_params = array()) {
+		if ( ! isset($query_params[0])) {
+			$query_params[0] = array();
 		}
-		if( $this->has_primary_key_field ( ) ) {
-			$query_params[ 0 ][ $this->primary_key_name() ] = $id ;
-		}else{
+		if ($this->has_primary_key_field( )) {
+			$query_params[0][$this->primary_key_name()] = $id;
+		} else {
 			//no primary key, so the $id must be from the get_index_primary_key_string()
-			$query_params[0] = array_replace_recursive( $query_params[ 0 ], $this->parse_index_primary_key_string( $id ) );
+			$query_params[0] = array_replace_recursive($query_params[0], $this->parse_index_primary_key_string($id));
 		}
 		return $query_params;
 	}
@@ -1019,16 +1019,16 @@ 
 	 * @return EE_Base_Class | NULL
 	 * @throws \EE_Error
 	 */
-	public function get_one($query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	public function get_one($query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
 		$items = $this->get_all($query_params);
-		if(empty($items)){
+		if (empty($items)) {
 			return null;
-		}else{
+		} else {
 			return array_shift($items);
 		}
 	}
@@ -1051,8 +1051,8 @@ 
 	 * @return EE_Base_Class[]|array
 	 * @throws \EE_Error
 	 */
-	public function next_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function next_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -1073,8 +1073,8 @@ 
 	 * @return EE_Base_Class[]|array
 	 * @throws \EE_Error
 	 */
-	public function previous_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function previous_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -1095,9 +1095,9 @@ 
 	 * @return EE_Base_Class|null|array()
 	 * @throws \EE_Error
 	 */
-	public function next( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function next($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1119,9 +1119,9 @@ 
  * @return EE_Base_Class|null|array()
 	 * @throws EE_Error
 	 */
-	public function previous( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function previous($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1142,42 +1142,42 @@ 
 	 * @return EE_Base_Class[]|array
 	 * @throws EE_Error
 	 */
-	protected function _get_consecutive( $current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
+	protected function _get_consecutive($current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
 		//if $field_to_order_by is empty then let's assume we're ordering by the primary key.
-		if ( empty( $field_to_order_by ) ) {
-			if ( $this->has_primary_key_field() ) {
+		if (empty($field_to_order_by)) {
+			if ($this->has_primary_key_field()) {
 				$field_to_order_by = $this->get_primary_key_field()->get_name();
 			} else {
 
-				if ( WP_DEBUG ) {
-					throw new EE_Error( __( 'EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso' ) );
+				if (WP_DEBUG) {
+					throw new EE_Error(__('EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso'));
 				}
-				EE_Error::add_error( __('There was an error with the query.', 'event_espresso') );
+				EE_Error::add_error(__('There was an error with the query.', 'event_espresso'));
 				return array();
 			}
 		}
 
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 
 		//let's add the where query param for consecutive look up.
-		$query_params[0][ $field_to_order_by ] = array( $operand, $current_field_value );
+		$query_params[0][$field_to_order_by] = array($operand, $current_field_value);
 		$query_params['limit'] = $limit;
 
 		//set direction
-		$incoming_orderby = isset( $query_params['order_by'] ) ? (array)$query_params['order_by'] : array();
+		$incoming_orderby = isset($query_params['order_by']) ? (array) $query_params['order_by'] : array();
 		$query_params['order_by'] = $operand === '>'
-			? array( $field_to_order_by => 'ASC' ) + $incoming_orderby
-			: array( $field_to_order_by => 'DESC') + $incoming_orderby;
+			? array($field_to_order_by => 'ASC') + $incoming_orderby
+			: array($field_to_order_by => 'DESC') + $incoming_orderby;
 
 		//if $columns_to_select is empty then that means we're returning EE_Base_Class objects
-		if ( empty( $columns_to_select ) ) {
-			return $this->get_all( $query_params );
+		if (empty($columns_to_select)) {
+			return $this->get_all($query_params);
 		} else {
 			//getting just the fields
-			return $this->_get_all_wpdb_results( $query_params, ARRAY_A, $columns_to_select );
+			return $this->_get_all_wpdb_results($query_params, ARRAY_A, $columns_to_select);
 		}
 	}
 
@@ -1188,18 +1188,18 @@ 
 	 * This sets the _timezone property after model object has been instantiated.
 	 * @param null | string $timezone valid PHP DateTimeZone timezone string
 	 */
-	public function set_timezone( $timezone ) {
-		if ( $timezone !== null ) {
+	public function set_timezone($timezone) {
+		if ($timezone !== null) {
 			$this->_timezone = $timezone;
 		}
 		//note we need to loop through relations and set the timezone on those objects as well.
-		foreach ( $this->_model_relations as $relation ) {
-			$relation->set_timezone( $timezone );
+		foreach ($this->_model_relations as $relation) {
+			$relation->set_timezone($timezone);
 		}
 		//and finally we do the same for any datetime fields
-		foreach ( $this->_fields as $field ) {
-			if ( $field instanceof EE_Datetime_Field ) {
-				$field->set_timezone( $timezone );
+		foreach ($this->_fields as $field) {
+			if ($field instanceof EE_Datetime_Field) {
+				$field->set_timezone($timezone);
 			}
 		}
 	}
@@ -1214,9 +1214,9 @@ 
 	 */
 	public function get_timezone() {
 		//first validate if timezone is set.  If not, then let's set it be whatever is set on the model fields.
-		if ( empty( $this->_timezone ) ) {
-			foreach( $this->_fields as $field ) {
-				if ( $field instanceof EE_Datetime_Field ) {
+		if (empty($this->_timezone)) {
+			foreach ($this->_fields as $field) {
+				if ($field instanceof EE_Datetime_Field) {
 					$this->set_timezone($field->get_timezone());
 					break;
 				}
@@ -1224,8 +1224,8 @@ 
 		}
 
 		//if timezone STILL empty then return the default timezone for the site.
-		if ( empty( $this->_timezone ) ) {
-			$this->set_timezone( EEH_DTT_Helper::get_timezone() );
+		if (empty($this->_timezone)) {
+			$this->set_timezone(EEH_DTT_Helper::get_timezone());
 		}
 		return $this->_timezone;
 	}
@@ -1243,19 +1243,19 @@ 
 	 *
 	 * @return array formats in an array with the date format first, and the time format last.
 	 */
-	public function get_formats_for( $field_name, $pretty = false ) {
-		$field_settings = $this->field_settings_for( $field_name );
+	public function get_formats_for($field_name, $pretty = false) {
+		$field_settings = $this->field_settings_for($field_name);
 
 		//if not a valid EE_Datetime_Field then throw error
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
-			throw new EE_Error( sprintf( __('The field sent into EEM_Base::get_formats_for (%s) is not registered as a EE_Datetime_Field. Please check the spelling and make sure you are submitting the right field name to retrieve date_formats for.', 'event_espresso' ), $field_name ) );
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
+			throw new EE_Error(sprintf(__('The field sent into EEM_Base::get_formats_for (%s) is not registered as a EE_Datetime_Field. Please check the spelling and make sure you are submitting the right field name to retrieve date_formats for.', 'event_espresso'), $field_name));
 		}
 
 		//while we are here, let's make sure the timezone internally in EEM_Base matches what is stored on
 		//the field.
 		$this->_timezone = $field_settings->get_timezone();
 
-		return array( $field_settings->get_date_format( $pretty ), $field_settings->get_time_format( $pretty ) );
+		return array($field_settings->get_date_format($pretty), $field_settings->get_time_format($pretty));
 	}
 
 
@@ -1279,25 +1279,25 @@ 
 	 * @return int|string  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
 	 *                    	     exception is triggered.
 	 */
-	public function current_time_for_query( $field_name, $timestamp = false, $what = 'both' ) {
-		$formats = $this->get_formats_for( $field_name );
+	public function current_time_for_query($field_name, $timestamp = false, $what = 'both') {
+		$formats = $this->get_formats_for($field_name);
 
-		$DateTime = new DateTime( "now", new DateTimeZone( $this->_timezone ) );
+		$DateTime = new DateTime("now", new DateTimeZone($this->_timezone));
 
-		if ( $timestamp ) {
-			return $DateTime->format( 'U' );
+		if ($timestamp) {
+			return $DateTime->format('U');
 		}
 
 		//not returning timestamp, so return formatted string in timezone.
-		switch( $what ) {
+		switch ($what) {
 			case 'time' :
-				return $DateTime->format( $formats[1] );
+				return $DateTime->format($formats[1]);
 				break;
 			case 'date' :
-				return $DateTime->format( $formats[0] );
+				return $DateTime->format($formats[0]);
 				break;
 			default :
-				return $DateTime->format( implode( ' ', $formats ) );
+				return $DateTime->format(implode(' ', $formats));
 				break;
 		}
 	}
@@ -1319,17 +1319,17 @@ 
 	 * @return DateTime
 	 * @throws \EE_Error
 	 */
-	public function convert_datetime_for_query( $field_name, $timestring, $incoming_format, $timezone = '' ) {
+	public function convert_datetime_for_query($field_name, $timestring, $incoming_format, $timezone = '') {
 
 		//just using this to ensure the timezone is set correctly internally
-		$this->get_formats_for( $field_name );
+		$this->get_formats_for($field_name);
 
 		//load EEH_DTT_Helper
-		$set_timezone = empty( $timezone ) ? EEH_DTT_Helper::get_timezone() : $timezone;
+		$set_timezone = empty($timezone) ? EEH_DTT_Helper::get_timezone() : $timezone;
 
-		$incomingDateTime = date_create_from_format( $incoming_format, $timestring, new DateTimeZone( $set_timezone ) );
+		$incomingDateTime = date_create_from_format($incoming_format, $timestring, new DateTimeZone($set_timezone));
 
-		return $incomingDateTime->setTimezone( new DateTimeZone( $this->_timezone ) );
+		return $incomingDateTime->setTimezone(new DateTimeZone($this->_timezone));
 	}
 
 
@@ -1339,7 +1339,7 @@ 
 	 * Gets all the tables comprising this model. Array keys are the table aliases, and values are EE_Table objects
 	 * @return EE_Table_Base[]
 	 */
-	public function get_tables(){
+	public function get_tables() {
 		return $this->_tables;
 	}
 
@@ -1375,9 +1375,9 @@ 
 	 * @return int how many rows got updated or FALSE if something went wrong with the query (wp returns FALSE or num rows affected which *could* include 0 which DOES NOT mean the query was bad)
 	 * @throws \EE_Error
 	 */
-	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::update', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::update', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		/**
@@ -1387,7 +1387,7 @@ 
 		 * @param array $fields_n_values the updated fields and their new values
 		 * @param array $query_params @see EEM_Base::get_all()
 		 */
-		do_action( 'AHEE__EEM_Base__update__begin',$this, $fields_n_values, $query_params );
+		do_action('AHEE__EEM_Base__update__begin', $this, $fields_n_values, $query_params);
 		/**
 		 * Filters the fields about to be updated given the query parameters. You can provide the
 		 * $query_params to $this->get_all() to find exactly which records will be updated
@@ -1395,10 +1395,10 @@ 
 		 * @param EEM_Base $model the model being queried
 		 * @param array $query_params see EEM_Base::get_all()
 		 */
-		$fields_n_values = (array)apply_filters( 'FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params );
+		$fields_n_values = (array) apply_filters('FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params);
 		//need to verify that, for any entry we want to update, there are entries in each secondary table.
 		//to do that, for each table, verify that it's PK isn't null.
-		$tables= $this->get_tables();
+		$tables = $this->get_tables();
 
 		//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
 		//NOTE: we should make this code more efficient by NOT querying twice
@@ -1408,29 +1408,29 @@ 
 			//we want to make sure the default_where strategy is ignored
 			$this->_ignore_where_strategy = TRUE;
 			$wpdb_select_results = $this->_get_all_wpdb_results($query_params);
-			foreach( $wpdb_select_results as $wpdb_result ){
+			foreach ($wpdb_select_results as $wpdb_result) {
 				// type cast stdClass as array
-				$wpdb_result = (array)$wpdb_result;
+				$wpdb_result = (array) $wpdb_result;
 				//get the model object's PK, as we'll want this if we need to insert a row into secondary tables
-				if( $this->has_primary_key_field() ){
-					$main_table_pk_value = $wpdb_result[ $this->get_primary_key_field()->get_qualified_column() ];
-				}else{
+				if ($this->has_primary_key_field()) {
+					$main_table_pk_value = $wpdb_result[$this->get_primary_key_field()->get_qualified_column()];
+				} else {
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it would be lots of work)
 					$main_table_pk_value = null;
 				}
 				//if there are more than 1 tables, we'll want to verify that each table for this model has an entry in the other tables
 				//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
-				if(count($tables) > 1){
+				if (count($tables) > 1) {
 					//foreach matching row in the DB, ensure that each table's PK isn't null. If so, there must not be an entry
 					//in that table, and so we'll want to insert one
-					foreach($tables as $table_obj){
+					foreach ($tables as $table_obj) {
 						$this_table_pk_column = $table_obj->get_fully_qualified_pk_column();
 						//if there is no private key for this table on the results, it means there's no entry
 						//in this table, right? so insert a row in the current table, using any fields available
-						if( ! ( array_key_exists( $this_table_pk_column, $wpdb_result) && $wpdb_result[ $this_table_pk_column ] )){
+						if ( ! (array_key_exists($this_table_pk_column, $wpdb_result) && $wpdb_result[$this_table_pk_column])) {
 							$success = $this->_insert_into_specific_table($table_obj, $fields_n_values, $main_table_pk_value);
 							//if we died here, report the error
-							if( ! $success ) {
+							if ( ! $success) {
 								return false;
 							}
 						}
@@ -1450,44 +1450,44 @@ 
 		//if this wasn't called from a model object (to update itself)
 		//then we want to make sure we keep all the existing
 		//model objects in sync with the db
-		if( $keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object ){
-			if( $this->has_primary_key_field() ){
-				$model_objs_affected_ids = $this->get_col( $query_params );
-			}else{
+		if ($keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object) {
+			if ($this->has_primary_key_field()) {
+				$model_objs_affected_ids = $this->get_col($query_params);
+			} else {
 				//we need to select a bunch of columns and then combine them into the the "index primary key string"s
-				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A );
+				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A);
 				$model_objs_affected_ids = array();
-				foreach( $models_affected_key_columns as $row ){
-					$combined_index_key = $this->get_index_primary_key_string( $row );
-					$model_objs_affected_ids[ $combined_index_key ] = $combined_index_key;
+				foreach ($models_affected_key_columns as $row) {
+					$combined_index_key = $this->get_index_primary_key_string($row);
+					$model_objs_affected_ids[$combined_index_key] = $combined_index_key;
 				}
 
 			}
 
-			if( ! $model_objs_affected_ids ){
+			if ( ! $model_objs_affected_ids) {
 				//wait wait wait- if nothing was affected let's stop here
 				return 0;
 			}
-			foreach( $model_objs_affected_ids as $id ){
-				$model_obj_in_entity_map = $this->get_from_entity_map( $id );
-				if( $model_obj_in_entity_map ){
-					foreach( $fields_n_values as $field => $new_value ){
-						$model_obj_in_entity_map->set( $field, $new_value );
+			foreach ($model_objs_affected_ids as $id) {
+				$model_obj_in_entity_map = $this->get_from_entity_map($id);
+				if ($model_obj_in_entity_map) {
+					foreach ($fields_n_values as $field => $new_value) {
+						$model_obj_in_entity_map->set($field, $new_value);
 					}
 				}
 			}
 			//if there is a primary key on this model, we can now do a slight optimization
-			if( $this->has_primary_key_field() ){
+			if ($this->has_primary_key_field()) {
 				//we already know what we want to update. So let's make the query simpler so it's a little more efficient
 				$query_params = array(
-					array( $this->primary_key_name() => array( 'IN', $model_objs_affected_ids ) ),
-					'limit' => count( $model_objs_affected_ids ), 'default_where_conditions' => 'none' );
+					array($this->primary_key_name() => array('IN', $model_objs_affected_ids)),
+					'limit' => count($model_objs_affected_ids), 'default_where_conditions' => 'none' );
 			}
 		}
 
-		$model_query_info = $this->_create_model_query_info_carrier( $query_params );
-		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql();//note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
-		$rows_affected = $this->_do_wpdb_query('query', array( $SQL ) );
+		$model_query_info = $this->_create_model_query_info_carrier($query_params);
+		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql(); //note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
+		$rows_affected = $this->_do_wpdb_query('query', array($SQL));
 		/**
 		 * Action called after a model update call has been made.
 		 *
@@ -1496,8 +1496,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_affected
 		 */
-		do_action( 'AHEE__EEM_Base__update__end',$this, $fields_n_values, $query_params, $rows_affected );
-		return $rows_affected;//how many supposedly got updated
+		do_action('AHEE__EEM_Base__update__end', $this, $fields_n_values, $query_params, $rows_affected);
+		return $rows_affected; //how many supposedly got updated
 	}
 
 
@@ -1513,22 +1513,22 @@ 
 	 * @return array just like $wpdb->get_col()
 	 * @throws \EE_Error
 	 */
-	public function get_col( $query_params  = array(), $field_to_select = NULL ){
+	public function get_col($query_params = array(), $field_to_select = NULL) {
 
-		if( $field_to_select ){
-			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		if ($field_to_select) {
+			$field = $this->field_settings_for($field_to_select);
+		}elseif ($this->has_primary_key_field( )) {
 			$field = $this->get_primary_key_field();
-		}else{
+		} else {
 			//no primary key, just grab the first column
-			$field = reset( $this->field_settings());
+			$field = reset($this->field_settings());
 		}
 
 
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $field->get_qualified_column();
-		$SQL ="SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
-		return $this->_do_wpdb_query('get_col', array( $SQL ) );
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		return $this->_do_wpdb_query('get_col', array($SQL));
 	}
 
 
@@ -1541,12 +1541,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_var( $query_params = array(), $field_to_select = NULL ) {
-		$query_params[ 'limit' ] = 1;
-		$col = $this->get_col( $query_params, $field_to_select );
-		if( ! empty( $col ) ) {
-			return reset( $col );
-		}else{
+	public function get_var($query_params = array(), $field_to_select = NULL) {
+		$query_params['limit'] = 1;
+		$col = $this->get_col($query_params, $field_to_select);
+		if ( ! empty($col)) {
+			return reset($col);
+		} else {
 			return NULL;
 		}
 	}
@@ -1562,19 +1562,19 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	public function _construct_update_sql($fields_n_values){
+	public function _construct_update_sql($fields_n_values) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$cols_n_values = array();
-		foreach($fields_n_values as $field_name => $value){
+		foreach ($fields_n_values as $field_name => $value) {
 			$field_obj = $this->field_settings_for($field_name);
 			//if the value is NULL, we want to assign the value to that.
 			//wpdb->prepare doesn't really handle that properly
-			$prepared_value = $this->_prepare_value_or_use_default( $field_obj, $fields_n_values );
-			$value_sql = $prepared_value===NULL ? 'NULL' : $wpdb->prepare( $field_obj->get_wpdb_data_type(), $prepared_value );
+			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
+			$value_sql = $prepared_value === NULL ? 'NULL' : $wpdb->prepare($field_obj->get_wpdb_data_type(), $prepared_value);
 			$cols_n_values[] = $field_obj->get_qualified_column()."=".$value_sql;
 		}
-		return implode(",",$cols_n_values);
+		return implode(",", $cols_n_values);
 
 	}
 
@@ -1590,10 +1590,10 @@ 
 	 * @return boolean whether the row got deleted or not
 	 * @throws \EE_Error
 	 */
-	public function delete_permanently_by_ID( $id ) {
+	public function delete_permanently_by_ID($id) {
 		return $this->delete_permanently(
 			array(
-				array( $this->get_primary_key_field()->get_name() => $id ),
+				array($this->get_primary_key_field()->get_name() => $id),
 				'limit' 	=> 1
 			)
 		);
@@ -1609,10 +1609,10 @@ 
 	 * @return boolean whether the row got deleted or not
 	 * @throws \EE_Error
 	 */
-	public function delete_by_ID( $id ){
+	public function delete_by_ID($id) {
 		return $this->delete(
 			array(
-				array( $this->get_primary_key_field()->get_name() => $id ),
+				array($this->get_primary_key_field()->get_name() => $id),
 				'limit' 	=> 1
 			)
 		);
@@ -1631,7 +1631,7 @@ 
 	 * @return int how many rows got deleted
 	 * @throws \EE_Error
 	 */
-	public function delete($query_params,$allow_blocking = true){
+	public function delete($query_params, $allow_blocking = true) {
 		return $this->delete_permanently($query_params, $allow_blocking);
 	}
 
@@ -1649,7 +1649,7 @@ 
 	 * @return int how many rows got deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_permanently($query_params,$allow_blocking = true){
+	public function delete_permanently($query_params, $allow_blocking = true) {
 		/**
 		 * Action called just before performing a real deletion query. You can use the
 		 * model and its $query_params to find exactly which items will be deleted
@@ -1658,31 +1658,31 @@ 
 		 * @param boolean $allow_blocking whether or not to allow related model objects
 		 * to block (prevent) this deletion
 		 */
-		do_action( 'AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking );
+		do_action('AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking);
 		//some MySQL databases may be running safe mode, which may restrict
 		//deletion if there is no KEY column used in the WHERE statement of a deletion.
 		//to get around this, we first do a SELECT, get all the IDs, and then run another query
 		//to delete them
 		$items_for_deletion = $this->_get_all_wpdb_results($query_params);
-		$deletion_where = $this->_setup_ids_for_delete( $items_for_deletion, $allow_blocking);
-		if($deletion_where){
+		$deletion_where = $this->_setup_ids_for_delete($items_for_deletion, $allow_blocking);
+		if ($deletion_where) {
 			//echo "objects for deletion:";var_dump($objects_for_deletion);
 			$model_query_info = $this->_create_model_query_info_carrier($query_params);
-			$table_aliases = array_keys( $this->_tables );
-			$SQL = "DELETE ".implode(", ",$table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
+			$table_aliases = array_keys($this->_tables);
+			$SQL = "DELETE ".implode(", ", $table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
 
 			//		/echo "delete sql:$SQL";
-			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+			$rows_deleted = $this->_do_wpdb_query('query', array($SQL));
+		} else {
 			$rows_deleted = 0;
 		}
 
 		//and lastly make sure those items are removed from the entity map; if they could be put into it at all
-		if( $this->has_primary_key_field() ){
-			foreach($items_for_deletion as $item_for_deletion_row ){
-				$pk_value = $item_for_deletion_row[ $this->get_primary_key_field()->get_qualified_column() ];
-				if( isset( $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $pk_value ] ) ){
-					unset( $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $pk_value ] );
+		if ($this->has_primary_key_field()) {
+			foreach ($items_for_deletion as $item_for_deletion_row) {
+				$pk_value = $item_for_deletion_row[$this->get_primary_key_field()->get_qualified_column()];
+				if (isset($this->_entity_map[EEM_Base::$_model_query_blog_id][$pk_value])) {
+					unset($this->_entity_map[EEM_Base::$_model_query_blog_id][$pk_value]);
 				}
 			}
 		}
@@ -1694,8 +1694,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_deleted
 		 */
-		do_action( 'AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted );
-		return $rows_deleted;//how many supposedly got deleted
+		do_action('AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted);
+		return $rows_deleted; //how many supposedly got deleted
 	}
 
 
@@ -1713,28 +1713,28 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null){
+	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null) {
 		//first, if $ignore_this_model_obj was supplied, get its model
-		if($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class){
+		if ($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class) {
 			$ignored_model = $ignore_this_model_obj->get_model();
-		}else{
+		} else {
 			$ignored_model = null;
 		}
 		//now check all the relations of $this_model_obj_or_id and see if there
 		//are any related model objects blocking it?
 		$is_blocked = false;
-		foreach($this->_model_relations as $relation_name => $relation_obj){
-			if( $relation_obj->block_delete_if_related_models_exist()){
+		foreach ($this->_model_relations as $relation_name => $relation_obj) {
+			if ($relation_obj->block_delete_if_related_models_exist()) {
 				//if $ignore_this_model_obj was supplied, then for the query
 				//on that model needs to be told to ignore $ignore_this_model_obj
-				if($ignored_model && $relation_name === $ignored_model->get_this_model_name()){
-					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id,array(
-					array($ignored_model->get_primary_key_field()->get_name() => array('!=',$ignore_this_model_obj->ID()))));
-				}else{
+				if ($ignored_model && $relation_name === $ignored_model->get_this_model_name()) {
+					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id, array(
+					array($ignored_model->get_primary_key_field()->get_name() => array('!=', $ignore_this_model_obj->ID()))));
+				} else {
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
-				if($related_model_objects){
+				if ($related_model_objects) {
 					EE_Error::add_error($relation_obj->get_deletion_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					$is_blocked = true;
 				}
@@ -1754,71 +1754,71 @@ 
 	 * @throws EE_Error
 	 * @return string    everything that comes after the WHERE statement.
 	 */
-	protected function _setup_ids_for_delete( $objects_for_deletion, $allow_blocking = true) {
-		if($this->has_primary_key_field()){
+	protected function _setup_ids_for_delete($objects_for_deletion, $allow_blocking = true) {
+		if ($this->has_primary_key_field()) {
 			$primary_table = $this->_get_main_table();
 			$other_tables = $this->_get_other_tables();
 			$deletes = $query = array();
-			foreach ( $objects_for_deletion as $delete_object ) {
+			foreach ($objects_for_deletion as $delete_object) {
 				//before we mark this object for deletion,
 				//make sure there's no related objects blocking its deletion (if we're checking)
 				if (
 					$allow_blocking
 				    && $this->delete_is_blocked_by_related_models(
-						$delete_object[ $primary_table->get_fully_qualified_pk_column() ]
+						$delete_object[$primary_table->get_fully_qualified_pk_column()]
 					)
 				) {
 					continue;
 				}
 				//primary table deletes
-				if ( isset( $delete_object[ $primary_table->get_fully_qualified_pk_column() ] ) ) {
-					$deletes[ $primary_table->get_fully_qualified_pk_column() ][] = $delete_object[ $primary_table->get_fully_qualified_pk_column() ];
+				if (isset($delete_object[$primary_table->get_fully_qualified_pk_column()])) {
+					$deletes[$primary_table->get_fully_qualified_pk_column()][] = $delete_object[$primary_table->get_fully_qualified_pk_column()];
 				}
 				//other tables
-				if ( ! empty( $other_tables ) ) {
-					foreach ( $other_tables as $ot ) {
+				if ( ! empty($other_tables)) {
+					foreach ($other_tables as $ot) {
 						//first check if we've got the foreign key column here.
-						if ( isset( $delete_object[ $ot->get_fully_qualified_fk_column() ] ) ) {
-							$deletes[ $ot->get_fully_qualified_pk_column() ][] = $delete_object[ $ot->get_fully_qualified_fk_column() ];
+						if (isset($delete_object[$ot->get_fully_qualified_fk_column()])) {
+							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_fk_column()];
 						}
 						// wait! it's entirely possible that we'll have a the primary key
 						// for this table in here, if it's a foreign key for one of the other secondary tables
-						if ( isset( $delete_object[ $ot->get_fully_qualified_pk_column() ] ) ) {
-							$deletes[ $ot->get_fully_qualified_pk_column() ][] = $delete_object[ $ot->get_fully_qualified_pk_column() ];
+						if (isset($delete_object[$ot->get_fully_qualified_pk_column()])) {
+							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 						}
 						// finally, it is possible that the fk for this table is found
 						// in the fully qualified pk column for the fk table, so let's see if that's there!
-						if ( isset( $delete_object[ $ot->get_fully_qualified_pk_on_fk_table() ] ) ) {
-							$deletes[ $ot->get_fully_qualified_pk_column() ][] = $delete_object[ $ot->get_fully_qualified_pk_column() ];
+						if (isset($delete_object[$ot->get_fully_qualified_pk_on_fk_table()])) {
+							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 						}
 					}
 				}
 			}
 
 			//we should have deletes now, so let's just go through and setup the where statement
-			foreach ( $deletes as $column => $values ) {
+			foreach ($deletes as $column => $values) {
 				//make sure we have unique $values;
 				$values = array_unique($values);
-				$query[] = $column . ' IN(' . implode(",",$values) . ')';
+				$query[] = $column.' IN('.implode(",", $values).')';
 			}
 
-			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+			return ! empty($query) ? implode(' AND ', $query) : '';
+		}elseif (count($this->get_combined_primary_key_fields()) > 1) {
 			$ways_to_identify_a_row = array();
 			$fields = $this->get_combined_primary_key_fields();
 			//note: because there' sno primary key, that means nothing else  can be pointing to this model, right?
-			foreach($objects_for_deletion as  $delete_object){
+			foreach ($objects_for_deletion as  $delete_object) {
 				$values_for_each_cpk_for_a_row = array();
-				foreach($fields as $cpk_field){
+				foreach ($fields as $cpk_field) {
 					$values_for_each_cpk_for_a_row[] = $cpk_field->get_qualified_column()."=".$delete_object[$cpk_field->get_qualified_column()];
 				}
-				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
+				$ways_to_identify_a_row[] = "(".implode(" AND ", $values_for_each_cpk_for_a_row).")";
 			}
-			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+			return implode(" OR ", $ways_to_identify_a_row);
+		} else {
 			//so there's no primary key and no combined key...
 			//sorry, can't help you
-			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"),get_class($this)));
+			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -1834,21 +1834,21 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public function count($query_params =array(),$field_to_count = NULL, $distinct = FALSE){
+	public function count($query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
-		if($field_to_count){
+		if ($field_to_count) {
 			$field_obj = $this->field_settings_for($field_to_count);
 			$column_to_count = $field_obj->get_qualified_column();
-		}elseif($this->has_primary_key_field ()){
+		}elseif ($this->has_primary_key_field()) {
 			$pk_field_obj = $this->get_primary_key_field();
 			$column_to_count = $pk_field_obj->get_qualified_column();
-		}else{//there's no primary key
+		} else {//there's no primary key
 			$column_to_count = '*';
 		}
 
-		$column_to_count = $distinct ? "DISTINCT (" . $column_to_count . " )" : $column_to_count;
-		$SQL ="SELECT COUNT(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		return (int)$this->_do_wpdb_query( 'get_var', array( $SQL) );
+		$column_to_count = $distinct ? "DISTINCT (".$column_to_count." )" : $column_to_count;
+		$SQL = "SELECT COUNT(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		return (int) $this->_do_wpdb_query('get_var', array($SQL));
 	}
 
 
@@ -1861,24 +1861,24 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function sum($query_params, $field_to_sum = NULL){
+	public function sum($query_params, $field_to_sum = NULL) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 
-		if($field_to_sum){
+		if ($field_to_sum) {
 			$field_obj = $this->field_settings_for($field_to_sum);
 
-		}else{
+		} else {
 			$field_obj = $this->get_primary_key_field();
 		}
 		$column_to_count = $field_obj->get_qualified_column();
 
-		$SQL ="SELECT SUM(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		$return_value = $this->_do_wpdb_query('get_var',array( $SQL ) );
+		$SQL = "SELECT SUM(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$return_value = $this->_do_wpdb_query('get_var', array($SQL));
 		$data_type = $field_obj->get_wpdb_data_type();
-		if( $data_type === '%d' || $data_type === '%s' ){
-			return (float)$return_value;
-		}else{//must be %f
-			return (float)$return_value;
+		if ($data_type === '%d' || $data_type === '%s') {
+			return (float) $return_value;
+		} else {//must be %f
+			return (float) $return_value;
 		}
 	}
 
@@ -1893,37 +1893,37 @@ 
 	 * @global wpdb $wpdb
 	 * @return mixed
 	 */
-	protected function _do_wpdb_query( $wpdb_method, $arguments_to_provide ){
+	protected function _do_wpdb_query($wpdb_method, $arguments_to_provide) {
 		//if we're in maintenance mode level 2, DON'T run any queries
 		//because level 2 indicates the database needs updating and
 		//is probably out of sync with the code
-		if( ! EE_Maintenance_Mode::instance()->models_can_query()){
+		if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 			throw new EE_Error(sprintf(__("Event Espresso Level 2 Maintenance mode is active. That means EE can not run ANY database queries until the necessary migration scripts have run which will take EE out of maintenance mode level 2. Please inform support of this error.", "event_espresso")));
 		}
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if( ! method_exists( $wpdb, $wpdb_method ) ){
-			throw new EE_Error( sprintf( __( 'There is no method named "%s" on Wordpress\' $wpdb object','event_espresso' ), $wpdb_method ) );
+		if ( ! method_exists($wpdb, $wpdb_method)) {
+			throw new EE_Error(sprintf(__('There is no method named "%s" on Wordpress\' $wpdb object', 'event_espresso'), $wpdb_method));
 		}
-		if( WP_DEBUG ){
+		if (WP_DEBUG) {
 			$old_show_errors_value = $wpdb->show_errors;
-			$wpdb->show_errors( FALSE );
-		}
-		$result = $this->_process_wpdb_query( $wpdb_method, $arguments_to_provide );
-		$this->show_db_query_if_previously_requested( $wpdb->last_query );
-		if( WP_DEBUG ){
-			$wpdb->show_errors( $old_show_errors_value );
-			if( ! empty( $wpdb->last_error ) ){
-				throw new EE_Error( sprintf( __( 'WPDB Error: "%s"', 'event_espresso' ), $wpdb->last_error ) );
-			}elseif( $result === false ){
-				throw new EE_Error( sprintf( __( 'WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso' ), $wpdb_method, var_export( $arguments_to_provide, true ) ) );
+			$wpdb->show_errors(FALSE);
+		}
+		$result = $this->_process_wpdb_query($wpdb_method, $arguments_to_provide);
+		$this->show_db_query_if_previously_requested($wpdb->last_query);
+		if (WP_DEBUG) {
+			$wpdb->show_errors($old_show_errors_value);
+			if ( ! empty($wpdb->last_error)) {
+				throw new EE_Error(sprintf(__('WPDB Error: "%s"', 'event_espresso'), $wpdb->last_error));
+			}elseif ($result === false) {
+				throw new EE_Error(sprintf(__('WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso'), $wpdb_method, var_export($arguments_to_provide, true)));
 			}
-		}elseif( $result === false ) {
+		}elseif ($result === false) {
 			EE_Error::add_error( 
 				sprintf( 
-					__( 'A database error has occurred. Turn on WP_DEBUG for more information.||A database error occurred doing wpdb method "%1$s", with arguments "%2$s". The error was "%3$s"', 'event_espresso' ),
+					__('A database error has occurred. Turn on WP_DEBUG for more information.||A database error occurred doing wpdb method "%1$s", with arguments "%2$s". The error was "%3$s"', 'event_espresso'),
 					$wpdb_method,
-					var_export( $arguments_to_provide, true ),
+					var_export($arguments_to_provide, true),
 					$wpdb->last_error
 				), 
 				__FILE__, 
@@ -1945,26 +1945,26 @@ 
 	 * @param array $arguments_to_provide
 	 * @return mixed
 	 */
-	private function _process_wpdb_query( $wpdb_method, $arguments_to_provide ) {
+	private function _process_wpdb_query($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		$wpdb->last_error = null;
-		$result = call_user_func_array( array( $wpdb, $wpdb_method ), $arguments_to_provide );
+		$result = call_user_func_array(array($wpdb, $wpdb_method), $arguments_to_provide);
 		// was there an error running the query? but we don't care on new activations
 		// (we're going to setup the DB anyway on new activations)
-		if ( ( $result === false || ! empty( $wpdb->last_error ) )
+		if (($result === false || ! empty($wpdb->last_error))
 			&& EE_System::instance()->detect_req_type() !== EE_System::req_type_new_activation
 		) {
-			switch ( EEM_Base::$_db_verification_level ) {
+			switch (EEM_Base::$_db_verification_level) {
 
 				case EEM_Base::db_verified_none :
 					// let's double-check core's DB
-					$error_message = $this->_verify_core_db( $wpdb_method, $arguments_to_provide );
+					$error_message = $this->_verify_core_db($wpdb_method, $arguments_to_provide);
 					break;
 
 				case EEM_Base::db_verified_core :
 					// STILL NO LOVE?? verify all the addons too. Maybe they need to be fixed
-					$error_message = $this->_verify_addons_db( $wpdb_method, $arguments_to_provide );
+					$error_message = $this->_verify_addons_db($wpdb_method, $arguments_to_provide);
 					break;
 
 				case EEM_Base::db_verified_addons :
@@ -1972,11 +1972,11 @@ 
 					return $result;
 					break;
 			}
-			if ( ! empty( $error_message ) ) {
-				EE_Log::instance()->log( __FILE__, __FUNCTION__, $error_message, 'error' );
-				trigger_error( $error_message );
+			if ( ! empty($error_message)) {
+				EE_Log::instance()->log(__FILE__, __FUNCTION__, $error_message, 'error');
+				trigger_error($error_message);
 			}
-			return $this->_process_wpdb_query( $wpdb_method, $arguments_to_provide );
+			return $this->_process_wpdb_query($wpdb_method, $arguments_to_provide);
 
 		}
 
@@ -1992,18 +1992,18 @@ 
 	 * @param array $arguments_to_provide
 	 * @return string
 	 */
-	private function _verify_core_db( $wpdb_method, $arguments_to_provide ){
+	private function _verify_core_db($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		//ok remember that we've already attempted fixing the core db, in case the problem persists
 		EEM_Base::$_db_verification_level = EEM_Base::db_verified_core;
 		$error_message = sprintf(
-			__( 'WPDB Error "%1$s" while running wpdb method "%2$s" with arguments %3$s. Automatically attempting to fix EE Core DB', 'event_espresso' ),
+			__('WPDB Error "%1$s" while running wpdb method "%2$s" with arguments %3$s. Automatically attempting to fix EE Core DB', 'event_espresso'),
 			$wpdb->last_error,
 			$wpdb_method,
-			json_encode( $arguments_to_provide )
+			json_encode($arguments_to_provide)
 		);
-		EE_System::instance()->initialize_db_if_no_migrations_required( false, true );
+		EE_System::instance()->initialize_db_if_no_migrations_required(false, true);
 		return $error_message;
 	}
 
@@ -2016,16 +2016,16 @@ 
 	 * @param $arguments_to_provide
 	 * @return string
 	 */
-	private function _verify_addons_db( $wpdb_method, $arguments_to_provide ) {
+	private function _verify_addons_db($wpdb_method, $arguments_to_provide) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
 		//ok remember that we've already attempted fixing the addons dbs, in case the problem persists
 		EEM_Base::$_db_verification_level = EEM_Base::db_verified_addons;
 		$error_message = sprintf(
-			__( 'WPDB AGAIN: Error "%1$s" while running the same method and arguments as before. Automatically attempting to fix EE Addons DB', 'event_espresso' ),
+			__('WPDB AGAIN: Error "%1$s" while running the same method and arguments as before. Automatically attempting to fix EE Addons DB', 'event_espresso'),
 			$wpdb->last_error,
 			$wpdb_method,
-			json_encode( $arguments_to_provide )
+			json_encode($arguments_to_provide)
 		);
 		EE_System::instance()->initialize_addons();
 		return $error_message;
@@ -2040,7 +2040,7 @@ 
 	 * @param EE_Model_Query_Info_Carrier $model_query_info
 	 * @return string
 	 */
-	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info) {
 		return " FROM ".$model_query_info->get_full_join_sql().
 				$model_query_info->get_where_sql().
 				$model_query_info->get_group_by_sql().
@@ -2053,7 +2053,7 @@ 
 	 * Set to easily debug the next X queries ran from this model.
 	 * @param int $count
 	 */
-	public function show_next_x_db_queries($count = 1){
+	public function show_next_x_db_queries($count = 1) {
 		$this->_show_next_x_db_queries = $count;
 	}
 
@@ -2062,8 +2062,8 @@ 
 	/**
 	 * @param $sql_query
 	 */
-	public function show_db_query_if_previously_requested($sql_query){
-		if($this->_show_next_x_db_queries > 0){
+	public function show_db_query_if_previously_requested($sql_query) {
+		if ($this->_show_next_x_db_queries > 0) {
 			echo $sql_query;
 			$this->_show_next_x_db_queries--;
 		}
@@ -2087,9 +2087,9 @@ 
 	 * @return EE_Base_Class which was added as a relation. Object referred to by $other_model_id_or_obj
 	 * @throws \EE_Error
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $extra_join_model_fields_n_values = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $extra_join_model_fields_n_values = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->add_relation_to( $id_or_obj, $other_model_id_or_obj, $extra_join_model_fields_n_values);
+		return $relation_obj->add_relation_to($id_or_obj, $other_model_id_or_obj, $extra_join_model_fields_n_values);
 	}
 
 
@@ -2108,9 +2108,9 @@ 
 	 * @throws \EE_Error
 	 * @param array  $where_query  This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
 	 */
-	public function remove_relationship_to($id_or_obj,  $other_model_id_or_obj, $relationName, $where_query= array() ){
+	public function remove_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query );
+		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query);
 	}
 
 
@@ -2123,9 +2123,9 @@ 
 	 * @return \EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function remove_relations($id_or_obj,$relationName,$where_query_params = array()){
+	public function remove_relations($id_or_obj, $relationName, $where_query_params = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relations($id_or_obj, $where_query_params );
+		return $relation_obj->remove_relations($id_or_obj, $where_query_params);
 	}
 
 
@@ -2141,10 +2141,10 @@ 
 	 * @return EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function get_all_related($id_or_obj, $model_name, $query_params = null){
+	public function get_all_related($id_or_obj, $model_name, $query_params = null) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->get_all_related($model_obj,$query_params);
+		return $relation_settings->get_all_related($model_obj, $query_params);
 	}
 
 
@@ -2161,10 +2161,10 @@ 
 	 * @return int how many deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_all_related($model_obj,$query_params);
+		return $relation_settings->delete_all_related($model_obj, $query_params);
 	}
 
 
@@ -2181,10 +2181,10 @@ 
 	 * @return int how many deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related_permanently($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related_permanently($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_related_permanently($model_obj,$query_params);
+		return $relation_settings->delete_related_permanently($model_obj, $query_params);
 	}
 
 
@@ -2201,17 +2201,17 @@ 
 	 * @return int
 	 * @throws \EE_Error
 	 */
-	public function count_related($id_or_obj,$model_name,$query_params = array(),$field_to_count = null, $distinct = FALSE){
+	public function count_related($id_or_obj, $model_name, $query_params = array(), $field_to_count = null, $distinct = FALSE) {
 		$related_model = $this->get_related_model_obj($model_name);
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->count($query_params,$field_to_count,$distinct);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->count($query_params, $field_to_count, $distinct);
 	}
 
 
@@ -2227,21 +2227,21 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function sum_related($id_or_obj,$model_name,$query_params,$field_to_sum = null){
+	public function sum_related($id_or_obj, $model_name, $query_params, $field_to_sum = null) {
 		$related_model = $this->get_related_model_obj($model_name);
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->sum($query_params,$field_to_sum);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->sum($query_params, $field_to_sum);
 	}
 
 
@@ -2255,12 +2255,12 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function get_first_related( EE_Base_Class $id_or_obj, $other_model_name, $query_params ){
-		$query_params['limit']=1;
-		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
-		if( $results ){
+	public function get_first_related(EE_Base_Class $id_or_obj, $other_model_name, $query_params) {
+		$query_params['limit'] = 1;
+		$results = $this->get_all_related($id_or_obj, $other_model_name, $query_params);
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return null;
 		}
 
@@ -2270,8 +2270,8 @@ 
 	 * Gets the model's name as it's expected in queries. For example, if this is EEM_Event model, that would be Event
 	 * @return string
 	 */
-	public function get_this_model_name(){
-		return str_replace("EEM_","",get_class($this));
+	public function get_this_model_name() {
+		return str_replace("EEM_", "", get_class($this));
 	}
 
 	/**
@@ -2279,14 +2279,14 @@ 
 	 * @return EE_Any_Foreign_Model_Name_Field
 	 * @throws EE_Error
 	 */
-	public function get_field_containing_related_model_name(){
-		foreach($this->field_settings(true) as $field){
-			if($field instanceof EE_Any_Foreign_Model_Name_Field){
+	public function get_field_containing_related_model_name() {
+		foreach ($this->field_settings(true) as $field) {
+			if ($field instanceof EE_Any_Foreign_Model_Name_Field) {
 				$field_with_model_name = $field;
 			}
 		}
-		if( !isset($field_with_model_name) || !$field_with_model_name ){
-			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name() ));
+		if ( ! isset($field_with_model_name) || ! $field_with_model_name) {
+			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name()));
 		}
 		return $field_with_model_name;
 	}
@@ -2307,19 +2307,19 @@ 
 	 * @return int new primary key on main table that got inserted
 	 * @throws EE_Error
 	 */
-	public function insert($field_n_values){
+	public function insert($field_n_values) {
 		/**
 		 * Filters the fields and their values before inserting an item using the models
 		 * @param array $fields_n_values keys are the fields and values are their new values
 		 * @param EEM_Base $model the model used
 		 */
-		$field_n_values = (array)apply_filters( 'FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this );
-		if($this->_satisfies_unique_indexes($field_n_values)){
+		$field_n_values = (array) apply_filters('FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this);
+		if ($this->_satisfies_unique_indexes($field_n_values)) {
 			$main_table = $this->_get_main_table();
 			$new_id = $this->_insert_into_specific_table($main_table, $field_n_values, false);
-			if( $new_id !== false ) {
-				foreach($this->_get_other_tables() as $other_table){
-					$this->_insert_into_specific_table($other_table, $field_n_values,$new_id);
+			if ($new_id !== false) {
+				foreach ($this->_get_other_tables() as $other_table) {
+					$this->_insert_into_specific_table($other_table, $field_n_values, $new_id);
 				}
 			}
 			/**
@@ -2329,9 +2329,9 @@ 
 			 * @param array $fields_n_values fields and their values
 			 * @param int|string the ID of the newly-inserted model object
 			 */
-			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
+			do_action('AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id);
 			return $new_id;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -2346,10 +2346,10 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	protected function _satisfies_unique_indexes($field_n_values,$action = 'insert'){
-		foreach($this->unique_indexes() as $index_name => $index){
+	protected function _satisfies_unique_indexes($field_n_values, $action = 'insert') {
+		foreach ($this->unique_indexes() as $index_name => $index) {
 			$uniqueness_where_params = array_intersect_key($field_n_values, $index->fields());
-			if($this->exists(array($uniqueness_where_params))){
+			if ($this->exists(array($uniqueness_where_params))) {
 				EE_Error::add_error(
 					sprintf(
 						__(
@@ -2359,8 +2359,8 @@ 
 						$action,
 						$this->_get_class_name(),
 						$index_name,
-						implode( ",", $index->field_names() ),
-						http_build_query( $uniqueness_where_params )
+						implode(",", $index->field_names()),
+						http_build_query($uniqueness_where_params)
 					),
 					__FILE__,
 					__FUNCTION__,
@@ -2386,37 +2386,37 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true ){
-		if($obj_or_fields_array instanceof EE_Base_Class){
+	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true) {
+		if ($obj_or_fields_array instanceof EE_Base_Class) {
 			$fields_n_values = $obj_or_fields_array->model_field_array();
-		}elseif( is_array($obj_or_fields_array)){
+		}elseif (is_array($obj_or_fields_array)) {
 			$fields_n_values = $obj_or_fields_array;
-		}else{
+		} else {
 			throw new EE_Error(
 				sprintf(
 					__(
 						"%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d",
 						"event_espresso"
 					),
-					get_class( $this ),
+					get_class($this),
 					$obj_or_fields_array
 				)
 			);
 		}
 		$query_params = array();
-		if( $this->has_primary_key_field() &&
-				( $include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
-				isset($fields_n_values[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() &&
+				($include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
+				isset($fields_n_values[$this->primary_key_name()])) {
 			$query_params[0]['OR'][$this->primary_key_name()] = $fields_n_values[$this->primary_key_name()];
 		}
-		foreach($this->unique_indexes() as $unique_index_name=>$unique_index){
+		foreach ($this->unique_indexes() as $unique_index_name=>$unique_index) {
 			$uniqueness_where_params = array_intersect_key($fields_n_values, $unique_index->fields());
 			$query_params[0]['OR']['AND*'.$unique_index_name] = $uniqueness_where_params;
 		}
 		//if there is nothing to base this search on, then we shouldn't find anything
-		if( empty( $query_params ) ){
+		if (empty($query_params)) {
 			return array();
-		}else{
+		} else {
 			return $this->get_one($query_params);
 		}
 	}
@@ -2430,7 +2430,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function exists($query_params){
+	public function exists($query_params) {
 		$query_params['limit'] = 1;
 		return $this->count($query_params) > 0;
 	}
@@ -2444,7 +2444,7 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function exists_by_ID($id){
+	public function exists_by_ID($id) {
 		return $this->exists(array('default_where_conditions'=>'none', array($this->primary_key_name() => $id)));
 	}
 
@@ -2464,45 +2464,45 @@ 
 	 * @global WPDB $wpdb only used to get the $wpdb->insert_id after performing an insert
 	 * @return int ID of new row inserted, or FALSE on failure
 	 */
-	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0 ){
+	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0) {
 		global $wpdb;
 		$insertion_col_n_values = array();
 		$format_for_insertion = array();
 		$fields_on_table = $this->_get_fields_for_table($table->get_table_alias());
-		foreach($fields_on_table as $field_name => $field_obj){
+		foreach ($fields_on_table as $field_name => $field_obj) {
 			//check if its an auto-incrementing column, in which case we should just leave it to do its autoincrement thing
-			if($field_obj->is_auto_increment()){
+			if ($field_obj->is_auto_increment()) {
 				continue;
 			}
 			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
 			//if the value we want to assign it to is NULL, just don't mention it for the insertion
-			if( $prepared_value !== NULL ){
-				$insertion_col_n_values[ $field_obj->get_table_column() ] = $prepared_value;
+			if ($prepared_value !== NULL) {
+				$insertion_col_n_values[$field_obj->get_table_column()] = $prepared_value;
 				$format_for_insertion[] = $field_obj->get_wpdb_data_type();
 			}
 		}
 
-		if($table instanceof EE_Secondary_Table && $new_id){
+		if ($table instanceof EE_Secondary_Table && $new_id) {
 			//its not the main table, so we should have already saved the main table's PK which we just inserted
 			//so add the fk to the main table as a column
 			$insertion_col_n_values[$table->get_fk_on_table()] = $new_id;
-			$format_for_insertion[]='%d';//yes right now we're only allowing these foreign keys to be INTs
+			$format_for_insertion[] = '%d'; //yes right now we're only allowing these foreign keys to be INTs
 		}
 		//insert the new entry
-		$result = $this->_do_wpdb_query( 'insert', array( $table->get_table_name(), $insertion_col_n_values, $format_for_insertion ) );
-		if( $result === false ) {
+		$result = $this->_do_wpdb_query('insert', array($table->get_table_name(), $insertion_col_n_values, $format_for_insertion));
+		if ($result === false) {
 			return false;
 		}
 		//ok, now what do we return for the ID of the newly-inserted thing?
-		if($this->has_primary_key_field()){
-			if($this->get_primary_key_field()->is_auto_increment()){
+		if ($this->has_primary_key_field()) {
+			if ($this->get_primary_key_field()->is_auto_increment()) {
 				return $wpdb->insert_id;
-			}else{
+			} else {
 				//it's not an auto-increment primary key, so
 				//it must have been supplied
 				return $fields_n_values[$this->get_primary_key_field()->get_name()];
 			}
-		}else{
+		} else {
 			//we can't return a  primary key because there is none. instead return
 			//a unique string indicating this model
 			return $this->get_index_primary_key_string($fields_n_values);
@@ -2521,15 +2521,15 @@ 
 	 * @return mixed string|int|float depending on what the table column will be expecting
 	 * @throws \EE_Error
 	 */
-	protected function _prepare_value_or_use_default( $field_obj, $fields_n_values ){
+	protected function _prepare_value_or_use_default($field_obj, $fields_n_values) {
 		//if this field doesn't allow nullable, don't allow it
-		if( ! $field_obj->is_nullable() && (
-				! isset( $fields_n_values[ $field_obj->get_name() ] ) ||
-				$fields_n_values[ $field_obj->get_name() ] === NULL ) ){
-			$fields_n_values[ $field_obj->get_name() ] = $field_obj->get_default_value();
+		if ( ! $field_obj->is_nullable() && (
+				! isset($fields_n_values[$field_obj->get_name()]) ||
+				$fields_n_values[$field_obj->get_name()] === NULL )) {
+			$fields_n_values[$field_obj->get_name()] = $field_obj->get_default_value();
 		}
-		$unprepared_value = isset( $fields_n_values[ $field_obj->get_name() ] ) ? $fields_n_values[ $field_obj->get_name() ] : NULL;
-		return $this->_prepare_value_for_use_in_db( $unprepared_value, $field_obj);
+		$unprepared_value = isset($fields_n_values[$field_obj->get_name()]) ? $fields_n_values[$field_obj->get_name()] : NULL;
+		return $this->_prepare_value_for_use_in_db($unprepared_value, $field_obj);
 	}
 
 
@@ -2541,9 +2541,9 @@ 
 	 * @param EE_Model_Field_Base $field field which will be doing the preparing of the value. If null, we assume $value is a custom selection
 	 * @return mixed a value ready for use in the database for insertions, updating, or in a where clause
 	 */
-	private function _prepare_value_for_use_in_db($value, $field){
-		if($field && $field instanceof EE_Model_Field_Base){
-			switch( $this->_values_already_prepared_by_model_object ){
+	private function _prepare_value_for_use_in_db($value, $field) {
+		if ($field && $field instanceof EE_Model_Field_Base) {
+			switch ($this->_values_already_prepared_by_model_object) {
 				/** @noinspection PhpMissingBreakStatementInspection */
 				case self::not_prepared_by_model_object:
 					$value = $field->prepare_for_set($value);
@@ -2554,7 +2554,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else {
 			return $value;
 		}
 	}
@@ -2564,13 +2564,13 @@ 
 	 * @return EE_Primary_Table
 	 * @throws EE_Error
 	 */
-	protected function _get_main_table(){
-		foreach($this->_tables as $table){
-			if($table instanceof EE_Primary_Table){
+	protected function _get_main_table() {
+		foreach ($this->_tables as $table) {
+			if ($table instanceof EE_Primary_Table) {
 				return $table;
 			}
 		}
-		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor','event_espresso'),get_class($this)));
+		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor', 'event_espresso'), get_class($this)));
 	}
 
 
@@ -2593,7 +2593,7 @@ 
 	 */
 	public function second_table() {
 		// grab second table from tables array
-		$second_table = end( $this->_tables );
+		$second_table = end($this->_tables);
 		return $second_table instanceof EE_Secondary_Table ? $second_table->get_table_name() : NULL;
 	}
 
@@ -2606,8 +2606,8 @@ 
 	 * @param string $table_alias
 	 * @return EE_Primary_Table | EE_Secondary_Table
 	 */
-	public function get_table_obj_by_alias( $table_alias = '' ) {
-		return isset( $this->_tables[ $table_alias ] ) ? $this->_tables[ $table_alias ] : NULL;
+	public function get_table_obj_by_alias($table_alias = '') {
+		return isset($this->_tables[$table_alias]) ? $this->_tables[$table_alias] : NULL;
 	}
 
 
@@ -2616,10 +2616,10 @@ 
 	 * Gets all the tables of type EE_Other_Table from EEM_CPT_Basel_Model::_tables
 	 * @return EE_Secondary_Table[]
 	 */
-	protected function _get_other_tables(){
-		$other_tables =array();
-		foreach($this->_tables as $table_alias => $table){
-			if($table instanceof EE_Secondary_Table){
+	protected function _get_other_tables() {
+		$other_tables = array();
+		foreach ($this->_tables as $table_alias => $table) {
+			if ($table instanceof EE_Secondary_Table) {
 				$other_tables[$table_alias] = $table;
 			}
 		}
@@ -2631,7 +2631,7 @@ 
 	 * @param string $table_alias, array key in EEM_Base::_tables
 	 * @return EE_Model_Field_Base[]
 	 */
-	public function _get_fields_for_table($table_alias){
+	public function _get_fields_for_table($table_alias) {
 		return $this->_fields[$table_alias];
 	}
 
@@ -2647,19 +2647,19 @@ 
 	 * @return EE_Model_Query_Info_Carrier
 	 * @throws \EE_Error
 	 */
-	public function _extract_related_models_from_query($query_params){
+	public function _extract_related_models_from_query($query_params) {
 		$query_info_carrier = new EE_Model_Query_Info_Carrier();
-		if ( array_key_exists( 0, $query_params ) ) {
-			$this->_extract_related_models_from_sub_params_array_keys( $query_params[0], $query_info_carrier, 0 );
+		if (array_key_exists(0, $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier, 0);
 		}
-		if ( array_key_exists( 'group_by', $query_params ) ) {
-			if ( is_array( $query_params['group_by'] ) ) {
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
 				$this->_extract_related_models_from_sub_params_array_values(
 					$query_params['group_by'],
 					$query_info_carrier,
 					'group_by'
 				);
-			} elseif ( ! empty ( $query_params['group_by'] ) ) {
+			} elseif ( ! empty ($query_params['group_by'])) {
 				$this->_extract_related_model_info_from_query_param(
 					$query_params['group_by'],
 					$query_info_carrier,
@@ -2667,21 +2667,21 @@ 
 				);
 			}
 		}
-		if ( array_key_exists( 'having', $query_params ) ) {
+		if (array_key_exists('having', $query_params)) {
 			$this->_extract_related_models_from_sub_params_array_keys(
 				$query_params[0],
 				$query_info_carrier,
 				'having'
 			);
 		}
-		if ( array_key_exists( 'order_by', $query_params ) ) {
-			if ( is_array( $query_params['order_by'] ) ) {
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by'])) {
 				$this->_extract_related_models_from_sub_params_array_keys(
 					$query_params['order_by'],
 					$query_info_carrier,
 					'order_by'
 				);
-			} elseif ( ! empty( $query_params['order_by'] ) ) {
+			} elseif ( ! empty($query_params['order_by'])) {
 				$this->_extract_related_model_info_from_query_param(
 					$query_params['order_by'],
 					$query_info_carrier,
@@ -2689,7 +2689,7 @@ 
 				);
 			}
 		}
-		if ( array_key_exists( 'force_join', $query_params ) ) {
+		if (array_key_exists('force_join', $query_params)) {
 			$this->_extract_related_models_from_sub_params_array_values(
 				$query_params['force_join'],
 				$query_info_carrier,
@@ -2707,34 +2707,34 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
+	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
 			$sub_query_params = (array) $sub_query_params;
-			foreach($sub_query_params as $param => $possibly_array_of_params){
+			foreach ($sub_query_params as $param => $possibly_array_of_params) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier,$query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 
 				//if $possibly_array_of_params is an array, try recursing into it, searching for keys which
 				//indicate needed joins. Eg, array('NOT'=>array('Registration.TXN_ID'=>23)). In this case, we tried
 				//extracting models out of the 'NOT', which obviously wasn't successful, and then we recurse into the value
 				//of array('Registration.TXN_ID'=>23)
 				$query_param_sans_stars = $this->_remove_stars_and_anything_after_from_condition_query_param_key($param);
-				if(in_array($query_param_sans_stars, $this->_logic_query_param_keys,true)){
-					if (! is_array($possibly_array_of_params)){
+				if (in_array($query_param_sans_stars, $this->_logic_query_param_keys, true)) {
+					if ( ! is_array($possibly_array_of_params)) {
 						throw new EE_Error(sprintf(__("You used a special where query param %s, but the value isn't an array of where query params, it's just %s'. It should be an array, eg array('EVT_ID'=>23,'OR'=>array('Venue.VNU_ID'=>32,'Venue.VNU_name'=>'monkey_land'))", "event_espresso"),
-							$param,$possibly_array_of_params));
-					}else{
-						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier,$query_param_type);
+							$param, $possibly_array_of_params));
+					} else {
+						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier, $query_param_type);
 					}
-				}elseif($query_param_type === 0 //ie WHERE
+				}elseif ($query_param_type === 0 //ie WHERE
 						&& is_array($possibly_array_of_params)
 						&& isset($possibly_array_of_params[2])
-						&& $possibly_array_of_params[2] == true){
+						&& $possibly_array_of_params[2] == true) {
 					//then $possible_array_of_params looks something like array('<','DTT_sold',true)
 					//indicating that $possible_array_of_params[1] is actually a field name,
 					//from which we should extract query parameters!
-					if( ! isset($possibly_array_of_params[0], $possibly_array_of_params[1] ) ) {
-						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"),$query_param_type,implode(",",$possibly_array_of_params)));
+					if ( ! isset($possibly_array_of_params[0], $possibly_array_of_params[1])) {
+						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"), $query_param_type, implode(",", $possibly_array_of_params)));
 					}
 					$this->_extract_related_model_info_from_query_param($possibly_array_of_params[1], $model_query_info_carrier, $query_param_type);
 				}
@@ -2753,14 +2753,14 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
-			if(!is_array($sub_query_params)){
-				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"),$sub_query_params));
+	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
+			if ( ! is_array($sub_query_params)) {
+				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"), $sub_query_params));
 			}
-			foreach($sub_query_params as $param){
+			foreach ($sub_query_params as $param) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier, $query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 			}
 		}
 		return $model_query_info_carrier;
@@ -2779,8 +2779,8 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Query_Info_Carrier
 	 */
-	public function _create_model_query_info_carrier($query_params){
-		if ( ! is_array( $query_params ) ) {
+	public function _create_model_query_info_carrier($query_params) {
+		if ( ! is_array($query_params)) {
 			EE_Error::doing_it_wrong(
 				'EEM_Base::_create_model_query_info_carrier',
 				sprintf(
@@ -2788,16 +2788,16 @@ 
 						'$query_params should be an array, you passed a variable of type %s',
 						'event_espresso'
 					),
-					gettype( $query_params )
+					gettype($query_params)
 				),
 				'4.6.0'
 			);
 			$query_params = array();
 		}
-		$where_query_params = isset( $query_params[0] ) ? $query_params[0] : array();
+		$where_query_params = isset($query_params[0]) ? $query_params[0] : array();
 		//first check if we should alter the query to account for caps or not
 		//because the caps might require us to do extra joins
-		if ( isset( $query_params['caps'] ) && $query_params['caps'] !== 'none' ) {
+		if (isset($query_params['caps']) && $query_params['caps'] !== 'none') {
 			$query_params[0] = $where_query_params = array_replace_recursive(
 				$where_query_params,
 				$this->caps_where_conditions(
@@ -2805,10 +2805,10 @@ 
 				)
 			);
 		}
-		$query_object = $this->_extract_related_models_from_query( $query_params );
+		$query_object = $this->_extract_related_models_from_query($query_params);
 		//verify where_query_params has NO numeric indexes.... that's simply not how you use it!
-		foreach ( $where_query_params as $key => $value ) {
-			if ( is_int( $key ) ) {
+		foreach ($where_query_params as $key => $value) {
+			if (is_int($key)) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -2816,16 +2816,16 @@ 
 							"event_espresso"
 						),
 						$key,
-						var_export( $value, true ),
-						var_export( $query_params, true ),
-						get_class( $this )
+						var_export($value, true),
+						var_export($query_params, true),
+						get_class($this)
 					)
 				);
 			}
 		}
 		if (
-			array_key_exists( 'default_where_conditions', $query_params )
-			&& ! empty( $query_params['default_where_conditions'] )
+			array_key_exists('default_where_conditions', $query_params)
+			&& ! empty($query_params['default_where_conditions'])
 		) {
 			$use_default_where_conditions = $query_params['default_where_conditions'];
 		} else {
@@ -2839,13 +2839,13 @@ 
 			),
 			$where_query_params
 		);
-		$query_object->set_where_sql( $this->_construct_where_clause( $where_query_params ) );
+		$query_object->set_where_sql($this->_construct_where_clause($where_query_params));
 		// if this is a "on_join_limit" then we are limiting on on a specific table in a multi_table join.
 		// So we need to setup a subquery and use that for the main join.
 		// Note for now this only works on the primary table for the model.
 		// So for instance, you could set the limit array like this:
 		// array( 'on_join_limit' => array('Primary_Table_Alias', array(1,10) ) )
-		if ( array_key_exists( 'on_join_limit', $query_params ) && ! empty( $query_params['on_join_limit'] ) ) {
+		if (array_key_exists('on_join_limit', $query_params) && ! empty($query_params['on_join_limit'])) {
 			$query_object->set_main_model_join_sql(
 				$this->_construct_limit_join_select(
 					$query_params['on_join_limit'][0],
@@ -2854,40 +2854,40 @@ 
 			);
 		}
 		//set limit
-		if ( array_key_exists( 'limit', $query_params ) ) {
-			if ( is_array( $query_params['limit'] ) ) {
-				if ( ! isset( $query_params['limit'][0], $query_params['limit'][1] ) ) {
+		if (array_key_exists('limit', $query_params)) {
+			if (is_array($query_params['limit'])) {
+				if ( ! isset($query_params['limit'][0], $query_params['limit'][1])) {
 					$e = sprintf(
 						__(
 							"Invalid DB query. You passed '%s' for the LIMIT, but only the following are valid: an integer, string representing an integer, a string like 'int,int', or an array like array(int,int)",
 							"event_espresso"
 						),
-						http_build_query( $query_params['limit'] )
+						http_build_query($query_params['limit'])
 					);
-					throw new EE_Error( $e . "|" . $e );
+					throw new EE_Error($e."|".$e);
 				}
 				//they passed us an array for the limit. Assume it's like array(50,25), meaning offset by 50, and get 25
-				$query_object->set_limit_sql( " LIMIT " . $query_params['limit'][0] . "," . $query_params['limit'][1] );
-			} elseif ( ! empty ( $query_params['limit'] ) ) {
-				$query_object->set_limit_sql( " LIMIT " . $query_params['limit'] );
+				$query_object->set_limit_sql(" LIMIT ".$query_params['limit'][0].",".$query_params['limit'][1]);
+			} elseif ( ! empty ($query_params['limit'])) {
+				$query_object->set_limit_sql(" LIMIT ".$query_params['limit']);
 			}
 		}
 		//set order by
-		if ( array_key_exists( 'order_by', $query_params ) ) {
-			if ( is_array( $query_params['order_by'] ) ) {
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by'])) {
 				//if they're using 'order_by' as an array, they can't use 'order' (because 'order_by' must
 				//specify whether to ascend or descend on each field. Eg 'order_by'=>array('EVT_ID'=>'ASC'). So
 				//including 'order' wouldn't make any sense if 'order_by' has already specified which way to order!
-				if ( array_key_exists( 'order', $query_params ) ) {
+				if (array_key_exists('order', $query_params)) {
 					throw new EE_Error(
 						sprintf(
 							__(
 								"In querying %s, we are using query parameter 'order_by' as an array (keys:%s,values:%s), and so we can't use query parameter 'order' (value %s). You should just use the 'order_by' parameter ",
 								"event_espresso"
 							),
-							get_class( $this ),
-							implode( ", ", array_keys( $query_params['order_by'] ) ),
-							implode( ", ", $query_params['order_by'] ),
+							get_class($this),
+							implode(", ", array_keys($query_params['order_by'])),
+							implode(", ", $query_params['order_by']),
 							$query_params['order']
 						)
 					);
@@ -2899,57 +2899,57 @@ 
 				);
 				//assume it's an array of fields to order by
 				$order_array = array();
-				foreach ( $query_params['order_by'] as $field_name_to_order_by => $order ) {
-					$order = $this->_extract_order( $order );
-					$order_array[] = $this->_deduce_column_name_from_query_param( $field_name_to_order_by ) . SP . $order;
+				foreach ($query_params['order_by'] as $field_name_to_order_by => $order) {
+					$order = $this->_extract_order($order);
+					$order_array[] = $this->_deduce_column_name_from_query_param($field_name_to_order_by).SP.$order;
 				}
-				$query_object->set_order_by_sql( " ORDER BY " . implode( ",", $order_array ) );
-			} elseif ( ! empty ( $query_params['order_by'] ) ) {
+				$query_object->set_order_by_sql(" ORDER BY ".implode(",", $order_array));
+			} elseif ( ! empty ($query_params['order_by'])) {
 				$this->_extract_related_model_info_from_query_param(
 					$query_params['order_by'],
 					$query_object,
 					'order',
 					$query_params['order_by']
 				);
-				$order = isset( $query_params['order'] )
-					? $this->_extract_order( $query_params['order'] )
+				$order = isset($query_params['order'])
+					? $this->_extract_order($query_params['order'])
 					: 'DESC';
 				$query_object->set_order_by_sql(
-					" ORDER BY " . $this->_deduce_column_name_from_query_param( $query_params['order_by'] ) . SP . $order
+					" ORDER BY ".$this->_deduce_column_name_from_query_param($query_params['order_by']).SP.$order
 				);
 			}
 		}
 		//if 'order_by' wasn't set, maybe they are just using 'order' on its own?
-		if ( ! array_key_exists( 'order_by', $query_params )
-		     && array_key_exists( 'order', $query_params )
-		     && ! empty( $query_params['order'] )
+		if ( ! array_key_exists('order_by', $query_params)
+		     && array_key_exists('order', $query_params)
+		     && ! empty($query_params['order'])
 		) {
 			$pk_field = $this->get_primary_key_field();
-			$order = $this->_extract_order( $query_params['order'] );
-			$query_object->set_order_by_sql( " ORDER BY " . $pk_field->get_qualified_column() . SP . $order );
+			$order = $this->_extract_order($query_params['order']);
+			$query_object->set_order_by_sql(" ORDER BY ".$pk_field->get_qualified_column().SP.$order);
 		}
 		//set group by
-		if ( array_key_exists( 'group_by', $query_params ) ) {
-			if ( is_array( $query_params['group_by'] ) ) {
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
 				//it's an array, so assume we'll be grouping by a bunch of stuff
 				$group_by_array = array();
-				foreach ( $query_params['group_by'] as $field_name_to_group_by ) {
-					$group_by_array[] = $this->_deduce_column_name_from_query_param( $field_name_to_group_by );
+				foreach ($query_params['group_by'] as $field_name_to_group_by) {
+					$group_by_array[] = $this->_deduce_column_name_from_query_param($field_name_to_group_by);
 				}
-				$query_object->set_group_by_sql( " GROUP BY " . implode( ", ", $group_by_array ) );
-			} elseif ( ! empty ( $query_params['group_by'] ) ) {
+				$query_object->set_group_by_sql(" GROUP BY ".implode(", ", $group_by_array));
+			} elseif ( ! empty ($query_params['group_by'])) {
 				$query_object->set_group_by_sql(
-					" GROUP BY " . $this->_deduce_column_name_from_query_param( $query_params['group_by'] )
+					" GROUP BY ".$this->_deduce_column_name_from_query_param($query_params['group_by'])
 				);
 			}
 		}
 		//set having
-		if ( array_key_exists( 'having', $query_params ) && $query_params['having'] ) {
-			$query_object->set_having_sql( $this->_construct_having_clause( $query_params['having'] ) );
+		if (array_key_exists('having', $query_params) && $query_params['having']) {
+			$query_object->set_having_sql($this->_construct_having_clause($query_params['having']));
 		}
 		//now, just verify they didn't pass anything wack
-		foreach ( $query_params as $query_key => $query_value ) {
-			if ( ! in_array( $query_key, $this->_allowed_query_params, true ) ) {
+		foreach ($query_params as $query_key => $query_value) {
+			if ( ! in_array($query_key, $this->_allowed_query_params, true)) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -2957,16 +2957,16 @@ 
 							'event_espresso'
 						),
 						$query_key,
-						get_class( $this ),
+						get_class($this),
 //						print_r( $this->_allowed_query_params, TRUE )
-						implode( ',', $this->_allowed_query_params )
+						implode(',', $this->_allowed_query_params)
 					)
 				);
 			}
 		}
 		$main_model_join_sql = $query_object->get_main_model_join_sql();
-		if ( empty( $main_model_join_sql ) ) {
-			$query_object->set_main_model_join_sql( $this->_construct_internal_join() );
+		if (empty($main_model_join_sql)) {
+			$query_object->set_main_model_join_sql($this->_construct_internal_join());
 		}
 		return $query_object;
 	}
@@ -2981,17 +2981,17 @@ 
 	 * @return array like EEM_Base::get_all() 's $query_params[0]
 	 * @throws \EE_Error
 	 */
-	public function caps_where_conditions( $context = self::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function caps_where_conditions($context = self::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		$cap_where_conditions = array();
-		$cap_restrictions = $this->caps_missing( $context );
+		$cap_restrictions = $this->caps_missing($context);
 		/**
 		 * @var $cap_restrictions EE_Default_Where_Conditions[]
 		 */
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-				$cap_where_conditions = array_replace_recursive( $cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions() );
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+				$cap_where_conditions = array_replace_recursive($cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions());
 		}
-		return apply_filters( 'FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions );
+		return apply_filters('FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions);
 	}
 
 	/**
@@ -3001,11 +3001,11 @@ 
 	 * @return string either ASC, asc, DESC or desc
 	 * @throws EE_Error
 	 */
-	private function _extract_order($should_be_order_string){
-		if(in_array($should_be_order_string, $this->_allowed_order_values)){
+	private function _extract_order($should_be_order_string) {
+		if (in_array($should_be_order_string, $this->_allowed_order_values)) {
 			return $should_be_order_string;
-		}else{
-			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"),get_class($this),$should_be_order_string));
+		} else {
+			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"), get_class($this), $should_be_order_string));
 		}
 	}
 
@@ -3023,7 +3023,7 @@ 
 	 * @throws EE_Error
 	 * @return array like $query_params[0], see EEM_Base::get_all for documentation
 	 */
-	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier,$use_default_where_conditions = 'all',$where_query_params = array()){
+	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier, $use_default_where_conditions = 'all', $where_query_params = array()) {
 		$allowed_used_default_where_conditions_values = array(
 				'all',
 				'this_model_only',
@@ -3031,17 +3031,17 @@ 
 				'minimum',
 				'none'
 			);
-		if( ! in_array($use_default_where_conditions,$allowed_used_default_where_conditions_values)){
-			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"),$use_default_where_conditions,implode(", ",$allowed_used_default_where_conditions_values)));
+		if ( ! in_array($use_default_where_conditions, $allowed_used_default_where_conditions_values)) {
+			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"), $use_default_where_conditions, implode(", ", $allowed_used_default_where_conditions_values)));
 		}
 		$universal_query_params = array();
-		if( $use_default_where_conditions === 'all' || $use_default_where_conditions === 'this_model_only' ){
+		if ($use_default_where_conditions === 'all' || $use_default_where_conditions === 'this_model_only') {
 			$universal_query_params = $this->_get_default_where_conditions();
-		} else if( $use_default_where_conditions === 'minimum' ) {
+		} else if ($use_default_where_conditions === 'minimum') {
 			$universal_query_params = $this->_get_minimum_where_conditions();
 		}
-		if(in_array($use_default_where_conditions,array('all','other_models_only'))){
-			foreach($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name){
+		if (in_array($use_default_where_conditions, array('all', 'other_models_only'))) {
+			foreach ($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name) {
 				$related_model = $this->get_related_model_obj($model_name);
 				$related_model_universal_where_params = $related_model->_get_default_where_conditions($model_relation_path);
 				$overrides = $this->_override_defaults_or_make_null_friendly(
@@ -3074,20 +3074,20 @@ 
 	 * @return array like EEM_Base::get_all's $query_params[0]
 	 * @throws \EE_Error
 	 */
-	private function _override_defaults_or_make_null_friendly($default_where_conditions,$provided_where_conditions,$model,$model_relation_path){
+	private function _override_defaults_or_make_null_friendly($default_where_conditions, $provided_where_conditions, $model, $model_relation_path) {
 		$null_friendly_where_conditions = array();
 		$none_overridden = true;
 		$or_condition_key_for_defaults = 'OR*'.get_class($model);
 
-		foreach($default_where_conditions as $key => $val){
-			if( isset($provided_where_conditions[$key])){
+		foreach ($default_where_conditions as $key => $val) {
+			if (isset($provided_where_conditions[$key])) {
 				$none_overridden = false;
-			}else{
+			} else {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults]['AND'][$key] = $val;
 			}
 		}
-		if( $none_overridden && $default_where_conditions){
-			if($model->has_primary_key_field()){
+		if ($none_overridden && $default_where_conditions) {
+			if ($model->has_primary_key_field()) {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults][$model_relation_path.".".$model->primary_key_name()] = array('IS NULL');
 			}/*else{
 				//@todo NO PK, use other defaults
@@ -3104,8 +3104,8 @@ 
 	 * @param string $model_relation_path eg, path from Event to Payment is "Registration.Transaction.Payment."
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
-	private function _get_default_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy ){
+	private function _get_default_where_conditions($model_relation_path = null) {
+		if ($this->_ignore_where_strategy) {
 			return array();
 		}
 		return $this->_default_where_conditions_strategy->get_default_where_conditions($model_relation_path);
@@ -3119,8 +3119,8 @@ 
 	 * @param string $model_relation_path eg, path from Event to Payment is "Registration.Transaction.Payment."
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
-	protected function _get_minimum_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy ){
+	protected function _get_minimum_where_conditions($model_relation_path = null) {
+		if ($this->_ignore_where_strategy) {
 			return array();
 		}
 		return $this->_minimum_where_conditions_strategy->get_default_where_conditions($model_relation_path);
@@ -3136,16 +3136,16 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info) {
 		$selects = $this->_get_columns_to_select_for_this_model();
-		foreach($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included){
+		foreach ($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included) {
 			$other_model_included = $this->get_related_model_obj($name_of_other_model_included);
-			$other_model_selects = $other_model_included->_get_columns_to_select_for_this_model( $model_relation_chain );
-			foreach ( $other_model_selects as $key => $value ) {
+			$other_model_selects = $other_model_included->_get_columns_to_select_for_this_model($model_relation_chain);
+			foreach ($other_model_selects as $key => $value) {
 				$selects[] = $value;
 			}
 		}
-		return implode(", ",$selects);
+		return implode(", ", $selects);
 	}
 
 	/**
@@ -3154,19 +3154,19 @@ 
 	 * @param string $model_relation_chain like 'Question.Question_Group.Event'
 	 * @return array numerically indexed, values are columns to select and rename, eg "Event.ID AS 'Event.ID'"
 	 */
-	public function _get_columns_to_select_for_this_model($model_relation_chain = ''){
+	public function _get_columns_to_select_for_this_model($model_relation_chain = '') {
 		$fields = $this->field_settings();
 		$selects = array();
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model_name());
-		foreach($fields as $field_obj){
-			$selects[] = $table_alias_with_model_relation_chain_prefix . $field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
+		foreach ($fields as $field_obj) {
+			$selects[] = $table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
 		}
 		//make sure we are also getting the PKs of each table
 		$tables = $this->get_tables();
-		if(count($tables) > 1){
-			foreach($tables as $table_obj){
-				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix . $table_obj->get_fully_qualified_pk_column();
-				if( ! in_array($qualified_pk_column,$selects)){
+		if (count($tables) > 1) {
+			foreach ($tables as $table_obj) {
+				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix.$table_obj->get_fully_qualified_pk_column();
+				if ( ! in_array($qualified_pk_column, $selects)) {
 					$selects[] = "$qualified_pk_column AS '$qualified_pk_column'";
 				}
 			}
@@ -3196,65 +3196,65 @@ 
 		$query_param_type,
 		$original_query_param = null
 	) {
-		if( $original_query_param === null ){
+		if ($original_query_param === null) {
 			$original_query_param = $query_param;
 		}
 		$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);
 		/** @var $allow_logic_query_params bool whether or not to allow logic_query_params like 'NOT','OR', or 'AND' */
-		$allow_logic_query_params = in_array($query_param_type,array('where','having'));
-		$allow_fields = in_array($query_param_type,array('where','having','order_by','group_by','order'));
+		$allow_logic_query_params = in_array($query_param_type, array('where', 'having'));
+		$allow_fields = in_array($query_param_type, array('where', 'having', 'order_by', 'group_by', 'order'));
 		//check to see if we have a field on this model
 		$this_model_fields = $this->field_settings(true);
-		if(array_key_exists($query_param,$this_model_fields)){
-			if($allow_fields){
+		if (array_key_exists($query_param, $this_model_fields)) {
+			if ($allow_fields) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(sprintf(__("Using a field name (%s) on model %s is not allowed on this query param type '%s'. Original query param was %s", "event_espresso"),
-						$query_param,get_class($this),$query_param_type,$original_query_param));
+						$query_param, get_class($this), $query_param_type, $original_query_param));
 			}
 		}
 		//check if this is a special logic query param
-		elseif(in_array($query_param, $this->_logic_query_param_keys, TRUE)){
-			if($allow_logic_query_params){
+		elseif (in_array($query_param, $this->_logic_query_param_keys, TRUE)) {
+			if ($allow_logic_query_params) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso' ),
-						implode( '", "', $this->_logic_query_param_keys ),
-						$query_param ,
-						get_class( $this ),
+						__('Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso'),
+						implode('", "', $this->_logic_query_param_keys),
+						$query_param,
+						get_class($this),
 						'<br />',
-						"\t" . ' $passed_in_query_info = <pre>' . print_r( $passed_in_query_info, TRUE ) . '</pre>' . "\n\t" . ' $query_param_type = ' . $query_param_type . "\n\t" . ' $original_query_param = ' . $original_query_param
+						"\t".' $passed_in_query_info = <pre>'.print_r($passed_in_query_info, TRUE).'</pre>'."\n\t".' $query_param_type = '.$query_param_type."\n\t".' $original_query_param = '.$original_query_param
 					)
 				);
 			}
 		}
 
 		//check if it's a custom selection
-		elseif(array_key_exists($query_param,$this->_custom_selections)){
+		elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			return;
 		}
 
 		//check if has a model name at the beginning
 		//and
 		//check if it's a field on a related model
-		foreach($this->_model_relations as $valid_related_model_name=>$relation_obj){
-			if(strpos($query_param, $valid_related_model_name.".") === 0){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+		foreach ($this->_model_relations as $valid_related_model_name=>$relation_obj) {
+			if (strpos($query_param, $valid_related_model_name.".") === 0) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				$query_param = substr($query_param, strlen($valid_related_model_name."."));
-				if($query_param === ''){
+				if ($query_param === '') {
 					//nothing left to $query_param
 					//we should actually end in a field name, not a model like this!
 					throw new EE_Error(sprintf(__("Query param '%s' (of type %s on model %s) shouldn't end on a period (.) ", "event_espresso"),
-					$query_param,$query_param_type,get_class($this),$valid_related_model_name));
-				}else{
+					$query_param, $query_param_type, get_class($this), $valid_related_model_name));
+				} else {
 					$related_model_obj = $this->get_related_model_obj($valid_related_model_name);
 					$related_model_obj->_extract_related_model_info_from_query_param($query_param, $passed_in_query_info, $query_param_type, $original_query_param);
 					return;
 				}
-			}elseif($query_param === $valid_related_model_name){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+			}elseif ($query_param === $valid_related_model_name) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				return;
 			}
 		}
@@ -3264,7 +3264,7 @@ 
 		//and we previously confirmed it wasn't a logic query param or field on the current model
 		//it's wack, that's what it is
 		throw new EE_Error(sprintf(__("There is no model named '%s' related to %s. Query param type is %s and original query param is %s", "event_espresso"),
-				$query_param,get_class($this),$query_param_type,$original_query_param));
+				$query_param, get_class($this), $query_param_type, $original_query_param));
 
 	}
 
@@ -3283,26 +3283,26 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info,$original_query_param){
+	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info, $original_query_param) {
 		$relation_obj = $this->related_settings_for($model_name);
 
 		$model_relation_chain = EE_Model_Parser::extract_model_relation_chain($model_name, $original_query_param);
 		//check if the relation is HABTM, because then we're essentially doing two joins
 		//If so, join first to the JOIN table, and add its data types, and then continue as normal
-		if($relation_obj instanceof EE_HABTM_Relation){
+		if ($relation_obj instanceof EE_HABTM_Relation) {
 			$join_model_obj = $relation_obj->get_join_model();
 			//replace the model specified with the join model for this relation chain, whi
 			$relation_chain_to_join_model = EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_obj->get_this_model_name(), $model_relation_chain);
 			$new_query_info = new EE_Model_Query_Info_Carrier(
 					array($relation_chain_to_join_model => $join_model_obj->get_this_model_name()),
 					$relation_obj->get_join_to_intermediate_model_statement($relation_chain_to_join_model));
-			$passed_in_query_info->merge( $new_query_info  );
+			$passed_in_query_info->merge($new_query_info);
 		}
 		//now just join to the other table pointed to by the relation object, and add its data types
 		$new_query_info = new EE_Model_Query_Info_Carrier(
 				array($model_relation_chain=>$model_name),
 				$relation_obj->get_join_statement($model_relation_chain));
-		$passed_in_query_info->merge( $new_query_info  );
+		$passed_in_query_info->merge($new_query_info);
 	}
 
 
@@ -3314,11 +3314,11 @@ 
 	 * @return string of SQL
 	 * @throws \EE_Error
 	 */
-	private function _construct_where_clause($where_params){
+	private function _construct_where_clause($where_params) {
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
-		if($SQL){
-			return " WHERE ". $SQL;
-		}else{
+		if ($SQL) {
+			return " WHERE ".$SQL;
+		} else {
 			return '';
 		}
 	}
@@ -3333,11 +3333,11 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	private function _construct_having_clause($having_params){
+	private function _construct_having_clause($having_params) {
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
-		if($SQL){
-			return " HAVING ". $SQL;
-		}else{
+		if ($SQL) {
+			return " HAVING ".$SQL;
+		} else {
 			return '';
 		}
 
@@ -3351,16 +3351,16 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	protected function _get_field_on_model($field_name,$model_name){
+	protected function _get_field_on_model($field_name, $model_name) {
 		$model_class = 'EEM_'.$model_name;
 		$model_filepath = $model_class.".model.php";
-		if ( is_readable($model_filepath)){
+		if (is_readable($model_filepath)) {
 			require_once($model_filepath);
-			$model_instance=call_user_func($model_name."::instance");
+			$model_instance = call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
-			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s','event_espresso'),$model_name,$model_class,$model_filepath));
+		} else {
+			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s', 'event_espresso'), $model_name, $model_class, $model_filepath));
 		}
 	}
 
@@ -3373,41 +3373,41 @@ 
 	 * @throws EE_Error
 	 * @return string of SQL
 	 */
-	private function _construct_condition_clause_recursive($where_params, $glue = ' AND'){
-		$where_clauses=array();
-		foreach($where_params as $query_param => $op_and_value_or_sub_condition){
-			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);//str_replace("*",'',$query_param);
-			if(in_array($query_param,$this->_logic_query_param_keys)){
-				switch($query_param){
+	private function _construct_condition_clause_recursive($where_params, $glue = ' AND') {
+		$where_clauses = array();
+		foreach ($where_params as $query_param => $op_and_value_or_sub_condition) {
+			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param); //str_replace("*",'',$query_param);
+			if (in_array($query_param, $this->_logic_query_param_keys)) {
+				switch ($query_param) {
 					case 'not':
 					case 'NOT':
-						$where_clauses[] = "! (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
+						$where_clauses[] = "! (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
 						break;
 					case 'and':
 					case 'AND':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ').")";
 						break;
 					case 'or':
 					case 'OR':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ').")";
 						break;
 				}
-			}else{
+			} else {
 				$field_obj = $this->_deduce_field_from_query_param($query_param);
 
 				//if it's not a normal field, maybe it's a custom selection?
-				if( ! $field_obj){
-					if(isset( $this->_custom_selections[$query_param][1])){
+				if ( ! $field_obj) {
+					if (isset($this->_custom_selections[$query_param][1])) {
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
-						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
+					} else {
+						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"), $query_param));
 					}
 				}
 				$op_and_value_sql = $this->_construct_op_and_value($op_and_value_or_sub_condition, $field_obj);
-				$where_clauses[]=$this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
+				$where_clauses[] = $this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
 			}
 		}
-		return $where_clauses ? implode( $glue, $where_clauses ) : '';
+		return $where_clauses ? implode($glue, $where_clauses) : '';
 	}
 
 
@@ -3418,18 +3418,18 @@ 
 	 * @throws EE_Error
 	 * @return string table alias and column name for SQL, eg "Transaction.TXN_ID"
 	 */
-	private function _deduce_column_name_from_query_param($query_param){
+	private function _deduce_column_name_from_query_param($query_param) {
 		$field = $this->_deduce_field_from_query_param($query_param);
 
-		if( $field ){
-			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param( $field->get_model_name(), $query_param );
-			return $table_alias_prefix . $field->get_qualified_column();
-		}elseif(array_key_exists($query_param,$this->_custom_selections)){
+		if ($field) {
+			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param($field->get_model_name(), $query_param);
+			return $table_alias_prefix.$field->get_qualified_column();
+		}elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			//maybe it's custom selection item?
 			//if so, just use it as the "column name"
 			return $query_param;
-		}else{
-			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"),$query_param,implode(",",$this->_custom_selections)));
+		} else {
+			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"), $query_param, implode(",", $this->_custom_selections)));
 		}
 	}
 
@@ -3441,11 +3441,11 @@ 
 	 * @param string $condition_query_param_key
 	 * @return string
 	 */
-	private function _remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key){
+	private function _remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -3460,12 +3460,12 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_op_and_value($op_and_value, $field_obj){
-		if ( is_array( $op_and_value ) ) {
-			$operator = isset( $op_and_value[0] ) ? $this->_prepare_operator_for_sql( $op_and_value[0] ) : null;
-			if ( ! $operator ) {
+	private function _construct_op_and_value($op_and_value, $field_obj) {
+		if (is_array($op_and_value)) {
+			$operator = isset($op_and_value[0]) ? $this->_prepare_operator_for_sql($op_and_value[0]) : null;
+			if ( ! $operator) {
 				$php_array_like_string = array();
-				foreach ( $op_and_value as $key => $value ) {
+				foreach ($op_and_value as $key => $value) {
 					$php_array_like_string[] = "$key=>$value";
 				}
 				throw new EE_Error(
@@ -3474,27 +3474,27 @@ 
 							"You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))",
 							"event_espresso"
 						),
-						implode( ",", $php_array_like_string )
+						implode(",", $php_array_like_string)
 					)
 				);
 			}
-			$value = isset( $op_and_value[1] ) ? $op_and_value[1] : null;
+			$value = isset($op_and_value[1]) ? $op_and_value[1] : null;
 		} else {
 			$operator = '=';
 			$value = $op_and_value;
 		}
 		//check to see if the value is actually another field
-		if ( is_array( $op_and_value ) && isset( $op_and_value[2] ) && $op_and_value[2] == true ) {
-			return $operator . SP . $this->_deduce_column_name_from_query_param( $value );
-		} elseif ( in_array( $operator, $this->_in_style_operators ) && is_array( $value ) ) {
+		if (is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true) {
+			return $operator.SP.$this->_deduce_column_name_from_query_param($value);
+		} elseif (in_array($operator, $this->_in_style_operators) && is_array($value)) {
 			//in this case, the value should be an array, or at least a comma-separated list
 			//it will need to handle a little differently
-			$cleaned_value = $this->_construct_in_value( $value, $field_obj );
+			$cleaned_value = $this->_construct_in_value($value, $field_obj);
 			//note: $cleaned_value has already been run through $wpdb->prepare()
-			return $operator . SP . $cleaned_value;
-		} elseif ( in_array( $operator, $this->_between_style_operators ) && is_array( $value ) ) {
+			return $operator.SP.$cleaned_value;
+		} elseif (in_array($operator, $this->_between_style_operators) && is_array($value)) {
 			//the value should be an array with count of two.
-			if ( count( $value ) !== 2 ) {
+			if (count($value) !== 2) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -3505,10 +3505,10 @@ 
 					)
 				);
 			}
-			$cleaned_value = $this->_construct_between_value( $value, $field_obj );
-			return $operator . SP . $cleaned_value;
-		} elseif ( in_array( $operator, $this->_null_style_operators ) ) {
-			if ( $value !== null ) {
+			$cleaned_value = $this->_construct_between_value($value, $field_obj);
+			return $operator.SP.$cleaned_value;
+		} elseif (in_array($operator, $this->_null_style_operators)) {
+			if ($value !== null) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -3521,13 +3521,13 @@ 
 				);
 			}
 			return $operator;
-		} elseif ( $operator === 'LIKE' && ! is_array( $value ) ) {
+		} elseif ($operator === 'LIKE' && ! is_array($value)) {
 			//if the operator is 'LIKE', we want to allow percent signs (%) and not
 			//remove other junk. So just treat it as a string.
-			return $operator . SP . $this->_wpdb_prepare_using_field( $value, '%s' );
-		} elseif ( ! in_array( $operator, $this->_in_style_operators ) && ! is_array( $value ) ) {
-			return $operator . SP . $this->_wpdb_prepare_using_field( $value, $field_obj );
-		} elseif ( in_array( $operator, $this->_in_style_operators ) && ! is_array( $value ) ) {
+			return $operator.SP.$this->_wpdb_prepare_using_field($value, '%s');
+		} elseif ( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
+			return $operator.SP.$this->_wpdb_prepare_using_field($value, $field_obj);
+		} elseif (in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -3538,7 +3538,7 @@ 
 					$operator
 				)
 			);
-		} elseif ( ! in_array( $operator, $this->_in_style_operators ) && is_array( $value ) ) {
+		} elseif ( ! in_array($operator, $this->_in_style_operators) && is_array($value)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -3556,7 +3556,7 @@ 
 						"It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all",
 						"event_espresso"
 					),
-					http_build_query( $op_and_value )
+					http_build_query($op_and_value)
 				)
 			);
 		}
@@ -3572,12 +3572,12 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function _construct_between_value( $values, $field_obj ) {
+	public function _construct_between_value($values, $field_obj) {
 		$cleaned_values = array();
-		foreach ( $values as $value ) {
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
-		return  $cleaned_values[0] . " AND " . $cleaned_values[1];
+		return  $cleaned_values[0]." AND ".$cleaned_values[1];
 	}
 
 
@@ -3594,26 +3594,26 @@ 
 	 * @return string of SQL to follow an 'IN' or 'NOT IN' operator
 	 * @throws \EE_Error
 	 */
-	public function _construct_in_value($values,  $field_obj){
+	public function _construct_in_value($values, $field_obj) {
 		//check if the value is a CSV list
-		if(is_string($values)){
+		if (is_string($values)) {
 			//in which case, turn it into an array
-			$values = explode(",",$values);
+			$values = explode(",", $values);
 		}
 		$cleaned_values = array();
-		foreach($values as $value){
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
 		//we would just LOVE to leave $cleaned_values as an empty array, and return the value as "()",
 		//but unfortunately that's invalid SQL. So instead we return a string which we KNOW will evaluate to be the empty set
 		//which is effectively equivalent to returning "()". We don't return "(0)" because that only works for auto-incrementing columns
-		if(empty($cleaned_values)){
+		if (empty($cleaned_values)) {
 			$all_fields = $this->field_settings();
 			$a_field = array_shift($all_fields);
 			$main_table = $this->_get_main_table();
 			$cleaned_values[] = "SELECT ".$a_field->get_table_column()." FROM ".$main_table->get_table_name()." WHERE FALSE";
 		}
-		return "(".implode(",",$cleaned_values).")";
+		return "(".implode(",", $cleaned_values).")";
 	}
 
 
@@ -3625,16 +3625,16 @@ 
 	 * @throws EE_Error
 	 * @return false|null|string
 	 */
-	private function _wpdb_prepare_using_field($value,$field_obj){
+	private function _wpdb_prepare_using_field($value, $field_obj) {
 		/** @type WPDB $wpdb */
 		global $wpdb;
-		if($field_obj instanceof EE_Model_Field_Base){
-			return $wpdb->prepare($field_obj->get_wpdb_data_type(),$this->_prepare_value_for_use_in_db($value, $field_obj));
-		}else{//$field_obj should really just be a data type
-			if( ! in_array($field_obj,$this->_valid_wpdb_data_types)){
-				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"),$field_obj,implode(",",$this->_valid_wpdb_data_types)));
+		if ($field_obj instanceof EE_Model_Field_Base) {
+			return $wpdb->prepare($field_obj->get_wpdb_data_type(), $this->_prepare_value_for_use_in_db($value, $field_obj));
+		} else {//$field_obj should really just be a data type
+			if ( ! in_array($field_obj, $this->_valid_wpdb_data_types)) {
+				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"), $field_obj, implode(",", $this->_valid_wpdb_data_types)));
 			}
-			return $wpdb->prepare($field_obj,$value);
+			return $wpdb->prepare($field_obj, $value);
 		}
 	}
 
@@ -3646,27 +3646,27 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	protected function _deduce_field_from_query_param($query_param_name){
+	protected function _deduce_field_from_query_param($query_param_name) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts === 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts === 1) {
 			$field_name = $last_query_param_part;
 			$model_obj = $this;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model_obj = $this->get_related_model_obj( $query_param_parts[ $number_of_parts - 2 ]);
+			$model_obj = $this->get_related_model_obj($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			return null;
 		}
 	}
@@ -3680,13 +3680,13 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function _get_qualified_column_for_field($field_name){
+	public function _get_qualified_column_for_field($field_name) {
 		$all_fields = $this->field_settings();
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
-		if($field){
+		if ($field) {
 			return $field->get_qualified_column();
-		}else{
-			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.",'event_espresso'),$field_name,get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.", 'event_espresso'), $field_name, get_class($this)));
 		}
 	}
 
@@ -3700,17 +3700,17 @@ 
 	 * @param  mixed|string $limit The limit for this select
 	 * @return string                The final select join element for the query.
 	 */
-	public function _construct_limit_join_select( $table_alias, $limit ) {
+	public function _construct_limit_join_select($table_alias, $limit) {
 		$SQL = '';
-		foreach ( $this->_tables as $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
 				$SQL .= $table_alias === $table_obj->get_table_alias()
-					? $table_obj->get_select_join_limit( $limit )
-					: SP . $table_obj->get_table_name() . " AS " . $table_obj->get_table_alias() . SP;
-			} elseif ( $table_obj instanceof EE_Secondary_Table ) {
+					? $table_obj->get_select_join_limit($limit)
+					: SP.$table_obj->get_table_name()." AS ".$table_obj->get_table_alias().SP;
+			} elseif ($table_obj instanceof EE_Secondary_Table) {
 				$SQL .= $table_alias === $table_obj->get_table_alias()
-					? $table_obj->get_select_join_limit_join( $limit )
-					: SP . $table_obj->get_join_sql( $table_alias ) . SP;
+					? $table_obj->get_select_join_limit_join($limit)
+					: SP.$table_obj->get_join_sql($table_alias).SP;
 			}
 		}
 		return $SQL;
@@ -3725,7 +3725,7 @@ 
 	 * @return string SQL
 	 * @throws \EE_Error
 	 */
-	public function _construct_internal_join(){
+	public function _construct_internal_join() {
 		$SQL = $this->_get_main_table()->get_table_sql();
 		$SQL .= $this->_construct_internal_join_to_table_with_alias($this->_get_main_table()->get_table_alias());
 		return $SQL;
@@ -3746,17 +3746,17 @@ 
 	 * @param string $alias_prefixed table alias to join to (this table should already be in the FROM SQL clause)
 	 * @return string
 	 */
-	public function _construct_internal_join_to_table_with_alias($alias_prefixed){
+	public function _construct_internal_join_to_table_with_alias($alias_prefixed) {
 		$SQL = '';
 		$alias_sans_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($alias_prefixed);
-		foreach($this->_tables as $table_obj){
-			if($table_obj instanceof EE_Secondary_Table){//table is secondary table
-				if($alias_sans_prefix === $table_obj->get_table_alias()){
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table) {//table is secondary table
+				if ($alias_sans_prefix === $table_obj->get_table_alias()) {
 					//so we're joining to this table, meaning the table is already in
 					//the FROM statement, BUT the primary table isn't. So we want
 					//to add the inverse join sql
 					$SQL .= $table_obj->get_inverse_join_sql($alias_prefixed);
-				}else{
+				} else {
 					//just add a regular JOIN to this table from the primary table
 					$SQL .= $table_obj->get_join_sql($alias_prefixed);
 				}
@@ -3770,9 +3770,9 @@ 
 	 * This should be a growing array of keys being table-columns (eg 'EVT_ID' and 'Event.EVT_ID'), and values being their data type (eg, '%s', '%d', etc)
 	 * @return array
 	 */
-	public function _get_data_types(){
+	public function _get_data_types() {
 		$data_types = array();
-		foreach( $this->field_settings() as $field_obj){
+		foreach ($this->field_settings() as $field_obj) {
 			//$data_types[$field_obj->get_table_column()] = $field_obj->get_wpdb_data_type();
 			/** @var $field_obj EE_Model_Field_Base */
 			$data_types[$field_obj->get_qualified_column()] = $field_obj->get_wpdb_data_type();
@@ -3788,10 +3788,10 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	public function get_related_model_obj($model_name){
+	public function get_related_model_obj($model_name) {
 		$model_classname = "EEM_".$model_name;
-		if(!class_exists($model_classname)){
-			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s",'event_espresso'),$model_name,$model_classname));
+		if ( ! class_exists($model_classname)) {
+			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s", 'event_espresso'), $model_name, $model_classname));
 		}
 		return call_user_func($model_classname."::instance");
 	}
@@ -3801,7 +3801,7 @@ 
 	 * Returns the array of EE_ModelRelations for this model.
 	 * @return EE_Model_Relation_Base[]
 	 */
-	public function relation_settings(){
+	public function relation_settings() {
 		return $this->_model_relations;
 	}
 
@@ -3811,10 +3811,10 @@ 
 	 * (Eg, without an event, datetimes have little purpose.)
 	 * @return EE_Belongs_To_Relation[]
 	 */
-	public function belongs_to_relations(){
+	public function belongs_to_relations() {
 		$belongs_to_relations = array();
-		foreach($this->relation_settings() as $model_name => $relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->relation_settings() as $model_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$belongs_to_relations[$model_name] = $relation_obj;
 			}
 		}
@@ -3829,15 +3829,15 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Relation_Base
 	 */
-	public function related_settings_for($relation_name){
-		$relatedModels=$this->relation_settings();
-		if(!array_key_exists($relation_name,$relatedModels)){
+	public function related_settings_for($relation_name) {
+		$relatedModels = $this->relation_settings();
+		if ( ! array_key_exists($relation_name, $relatedModels)) {
 			throw new EE_Error(
 				sprintf(
-					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...','event_espresso'),
+					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...', 'event_espresso'),
 					$relation_name,
 					$this->_get_class_name(),
-					implode( ', ', array_keys( $relatedModels ))
+					implode(', ', array_keys($relatedModels))
 				)
 			);
 		}
@@ -3852,10 +3852,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public function field_settings_for($fieldName){
-		$fieldSettings=$this->field_settings(true);
-		if( ! array_key_exists($fieldName,$fieldSettings)){
-			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'",'event_espresso'),$fieldName,get_class($this)));
+	public function field_settings_for($fieldName) {
+		$fieldSettings = $this->field_settings(true);
+		if ( ! array_key_exists($fieldName, $fieldSettings)) {
+			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'", 'event_espresso'), $fieldName, get_class($this)));
 		}
 		return $fieldSettings[$fieldName];
 	}
@@ -3865,11 +3865,11 @@ 
 	 * @param string $fieldName a key in the model's _field_settings array
 	 * @return boolean
 	 */
-	public function has_field($fieldName){
+	public function has_field($fieldName) {
 		$fieldSettings = $this->field_settings(true);
-		if( isset($fieldSettings[$fieldName])){
+		if (isset($fieldSettings[$fieldName])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3879,11 +3879,11 @@ 
 	 * @param string $relation_name possibly one of the keys in the relation_settings array
 	 * @return boolean
 	 */
-	public function has_relation($relation_name){
+	public function has_relation($relation_name) {
 		$relations = $this->relation_settings();
-		if(isset($relations[$relation_name])){
+		if (isset($relations[$relation_name])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3895,7 +3895,7 @@ 
 	 * @param $field_obj
 	 * @return EE_Model_Field_Base
 	 */
-	public function is_primary_key_field( $field_obj ){
+	public function is_primary_key_field($field_obj) {
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
 	}
 
@@ -3907,16 +3907,16 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_primary_key_field(){
-		if( $this->_primary_key_field === NULL ){
-			foreach( $this->field_settings( TRUE ) as $field_obj ){
-				if( $this->is_primary_key_field( $field_obj )){
+	public function get_primary_key_field() {
+		if ($this->_primary_key_field === NULL) {
+			foreach ($this->field_settings(TRUE) as $field_obj) {
+				if ($this->is_primary_key_field($field_obj)) {
 					$this->_primary_key_field = $field_obj;
 					break;
 				}
 			}
-			if( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base ){
-				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s",'event_espresso'),get_class($this)));
+			if ( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base) {
+				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s", 'event_espresso'), get_class($this)));
 			}
 		}
 		return $this->_primary_key_field;
@@ -3929,12 +3929,12 @@ 
 	 * Internally does some caching.
 	 * @return boolean
 	 */
-	public function has_primary_key_field(){
-		if($this->_has_primary_key_field === null){
-			try{
+	public function has_primary_key_field() {
+		if ($this->_has_primary_key_field === null) {
+			try {
 				$this->get_primary_key_field();
 				$this->_has_primary_key_field = true;
-			}catch(EE_Error $e){
+			} catch (EE_Error $e) {
 				$this->_has_primary_key_field = false;
 			}
 		}
@@ -3948,9 +3948,9 @@ 
 	 * @param string $field_class_name class name of field that you want to find. Eg, EE_Datetime_Field, EE_Foreign_Key_Field, etc
 	 * @return EE_Model_Field_Base or null if none is found
 	 */
-	public function get_a_field_of_type($field_class_name){
-		foreach($this->field_settings() as $field){
-			if( $field instanceof $field_class_name ){
+	public function get_a_field_of_type($field_class_name) {
+		foreach ($this->field_settings() as $field) {
+			if ($field instanceof $field_class_name) {
 				return $field;
 			}
 		}
@@ -3964,22 +3964,22 @@ 
 	 * @return EE_Foreign_Key_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_foreign_key_to($model_name){
-		if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-			foreach($this->field_settings() as $field){
-				if(
+	public function get_foreign_key_to($model_name) {
+		if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+			foreach ($this->field_settings() as $field) {
+				if (
 					$field instanceof EE_Foreign_Key_Field_Base
-					&& in_array($model_name,$field->get_model_names_pointed_to() )
+					&& in_array($model_name, $field->get_model_names_pointed_to())
 				) {
-					$this->_cache_foreign_key_to_fields[ $model_name ] = $field;
+					$this->_cache_foreign_key_to_fields[$model_name] = $field;
 					break;
 				}
 			}
-			if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s",'event_espresso'),$model_name,get_class($this)));
+			if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s", 'event_espresso'), $model_name, get_class($this)));
 			}
 		}
-		return $this->_cache_foreign_key_to_fields[ $model_name ];
+		return $this->_cache_foreign_key_to_fields[$model_name];
 	}
 
 
@@ -3990,7 +3990,7 @@ 
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
 	 * @return EE_Table_Base
 	 */
-	public function get_table_for_alias($table_alias){
+	public function get_table_for_alias($table_alias) {
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
 		return $this->_tables[$table_alias_sans_model_relation_chain_prefix]->get_table_name();
 	}
@@ -4003,25 +4003,25 @@ 
 	 * @param bool $include_db_only_fields flag indicating whether or not to include the db-only fields
 	 * @return EE_Model_Field_Base[] where the keys are the field's name
 	 */
-	public function field_settings($include_db_only_fields = false){
-		if( $include_db_only_fields ){
-			if( $this->_cached_fields === NULL ){
+	public function field_settings($include_db_only_fields = false) {
+		if ($include_db_only_fields) {
+			if ($this->_cached_fields === NULL) {
 				$this->_cached_fields = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
-						$this->_cached_fields[$field_name]=$field_obj;
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
+						$this->_cached_fields[$field_name] = $field_obj;
 					}
 				}
 			}
 			return $this->_cached_fields;
-		}else{
-			if( $this->_cached_fields_non_db_only === NULL ){
+		} else {
+			if ($this->_cached_fields_non_db_only === NULL) {
 				$this->_cached_fields_non_db_only = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
 						/** @var $field_obj EE_Model_Field_Base */
-						if( ! $field_obj->is_db_only_field() ){
-							$this->_cached_fields_non_db_only[$field_name]=$field_obj;
+						if ( ! $field_obj->is_db_only_field()) {
+							$this->_cached_fields_non_db_only[$field_name] = $field_obj;
 						}
 					}
 				}
@@ -4040,60 +4040,60 @@ 
 	 * @return \EE_Base_Class[] array keys are primary keys (if there is a primary key on the model. if not, numerically indexed)
 	 * @throws \EE_Error
 	 */
-	protected function _create_objects( $rows = array() ) {
-		$array_of_objects=array();
-		if(empty($rows)){
+	protected function _create_objects($rows = array()) {
+		$array_of_objects = array();
+		if (empty($rows)) {
 			return array();
 		}
 		$count_if_model_has_no_primary_key = 0;
 		$has_primary_key = $this->has_primary_key_field();
 		$primary_key_field = $has_primary_key ? $this->get_primary_key_field() : null;
-		foreach ( (array)$rows as $row ) {
-			if(empty($row)){
+		foreach ((array) $rows as $row) {
+			if (empty($row)) {
 				//wp did its weird thing where it returns an array like array(0=>null), which is totally not helpful...
 				return array();
 			}
 			//check if we've already set this object in the results array,
 			//in which case there's no need to process it further (again)
-			if( $has_primary_key ) {
+			if ($has_primary_key) {
 				$table_pk_value = $this->_get_column_value_with_table_alias_or_not(
 					$row,
 					$primary_key_field->get_qualified_column(),
 					$primary_key_field->get_table_column()
 				);
-				if( $table_pk_value && isset( $array_of_objects[ $table_pk_value ] ) ) {
+				if ($table_pk_value && isset($array_of_objects[$table_pk_value])) {
 					continue;
 				}
 			}
 			$classInstance = $this->instantiate_class_from_array_or_object($row);
-			if( ! $classInstance ) {
+			if ( ! $classInstance) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Could not create instance of class %s from row %s', 'event_espresso' ),
+						__('Could not create instance of class %s from row %s', 'event_espresso'),
 						$this->get_this_model_name(),
-						http_build_query( $row )
+						http_build_query($row)
 					)
 				);
 			}
 			//set the timezone on the instantiated objects
-			$classInstance->set_timezone( $this->_timezone );
+			$classInstance->set_timezone($this->_timezone);
 			//make sure if there is any timezone setting present that we set the timezone for the object
 			$key = $has_primary_key ? $classInstance->ID() : $count_if_model_has_no_primary_key++;
-			$array_of_objects[ $key ] = $classInstance;
+			$array_of_objects[$key] = $classInstance;
 			//also, for all the relations of type BelongsTo, see if we can cache
 			//those related models
 			//(we could do this for other relations too, but if there are conditions
 			//that filtered out some fo the results, then we'd be caching an incomplete set
 			//so it requires a little more thought than just caching them immediately...)
-			foreach($this->_model_relations as $modelName => $relation_obj){
-				if( $relation_obj instanceof EE_Belongs_To_Relation){
+			foreach ($this->_model_relations as $modelName => $relation_obj) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//check if this model's INFO is present. If so, cache it on the model
 					$other_model = $relation_obj->get_other_model();
 					$other_model_obj_maybe = $other_model->instantiate_class_from_array_or_object($row);
 					//if we managed to make a model object from the results, cache it on the main model object
-					if( $other_model_obj_maybe ){
+					if ($other_model_obj_maybe) {
 						//set timezone on these other model objects if they are present
-						$other_model_obj_maybe->set_timezone( $this->_timezone );
+						$other_model_obj_maybe->set_timezone($this->_timezone);
 						$classInstance->cache($modelName, $other_model_obj_maybe);
 					}
 				}
@@ -4114,12 +4114,12 @@ 
 
 		$this_model_fields_and_values = array();
 		//setup the row using default values;
-		foreach ( $this->field_settings() as $field_name => $field_obj ) {
+		foreach ($this->field_settings() as $field_name => $field_obj) {
 			$this_model_fields_and_values[$field_name] = $field_obj->get_default_value();
 		}
 
 		$className = $this->_get_class_name();
-		$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_and_values ), FALSE, FALSE );
+		$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_and_values), FALSE, FALSE);
 
 		return $classInstance;
 	}
@@ -4132,45 +4132,45 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function instantiate_class_from_array_or_object($cols_n_values){
-		if( ! is_array( $cols_n_values ) && is_object( $cols_n_values )) {
-			$cols_n_values = get_object_vars( $cols_n_values );
+	public function instantiate_class_from_array_or_object($cols_n_values) {
+		if ( ! is_array($cols_n_values) && is_object($cols_n_values)) {
+			$cols_n_values = get_object_vars($cols_n_values);
 		}
 		$primary_key = NULL;
 		//make sure the array only has keys that are fields/columns on this model
-		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
-		if( $this->has_primary_key_field() && isset( $this_model_fields_n_values[ $this->primary_key_name() ] ) ){
-			$primary_key = $this_model_fields_n_values[ $this->primary_key_name() ];
+		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
+		if ($this->has_primary_key_field() && isset($this_model_fields_n_values[$this->primary_key_name()])) {
+			$primary_key = $this_model_fields_n_values[$this->primary_key_name()];
 		}
-		$className=$this->_get_class_name();
+		$className = $this->_get_class_name();
 
 		//check we actually found results that we can use to build our model object
 		//if not, return null
-		if( $this->has_primary_key_field()){
-			if(empty( $this_model_fields_n_values[$this->primary_key_name()] )){
+		if ($this->has_primary_key_field()) {
+			if (empty($this_model_fields_n_values[$this->primary_key_name()])) {
 				return NULL;
 			}
-		}else if($this->unique_indexes()){
+		} else if ($this->unique_indexes()) {
 			$first_column = reset($this_model_fields_n_values);
-			if(empty($first_column)){
+			if (empty($first_column)) {
 				return NULL;
 			}
 		}
 
 		// if there is no primary key or the object doesn't already exist in the entity map, then create a new instance
-		if ( $primary_key){
-			$classInstance = $this->get_from_entity_map( $primary_key );
-			if( ! $classInstance) {
-				$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		if ($primary_key) {
+			$classInstance = $this->get_from_entity_map($primary_key);
+			if ( ! $classInstance) {
+				$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 				// add this new object to the entity map
-				$classInstance = $this->add_to_entity_map( $classInstance );
+				$classInstance = $this->add_to_entity_map($classInstance);
 			}
-		}else{
-			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		} else {
+			$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 		}
 
 			//it is entirely possible that the instantiated class object has a set timezone_string db field and has set it's internal _timezone property accordingly (see new_instance_from_db in model objects particularly EE_Event for example).  In this case, we want to make sure the model object doesn't have its timezone string overwritten by any timezone property currently set here on the model so, we intentionally override the model _timezone property with the model_object timezone property.
-		$this->set_timezone( $classInstance->get_timezone() );
+		$this->set_timezone($classInstance->get_timezone());
 		return $classInstance;
 	}
 	/**
@@ -4178,8 +4178,8 @@ 
 	 * @param int|string $id the ID of the model object
 	 * @return EE_Base_Class
 	 */
-	public function get_from_entity_map( $id ){
-		return isset( $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $id ] ) ? $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $id ] : NULL;
+	public function get_from_entity_map($id) {
+		return isset($this->_entity_map[EEM_Base::$_model_query_blog_id][$id]) ? $this->_entity_map[EEM_Base::$_model_query_blog_id][$id] : NULL;
 	}
 
 
@@ -4201,21 +4201,21 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	public function add_to_entity_map( EE_Base_Class $object) {
+	public function add_to_entity_map(EE_Base_Class $object) {
 		$className = $this->_get_class_name();
-		if( ! $object instanceof $className ){
-			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"),is_object( $object ) ? get_class( $object ) : $object, $className ) );
+		if ( ! $object instanceof $className) {
+			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"), is_object($object) ? get_class($object) : $object, $className));
 		}
 		/** @var $object EE_Base_Class */
-		if ( ! $object->ID() ){
-			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"),get_class($this)));
+		if ( ! $object->ID()) {
+			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"), get_class($this)));
 		}
 		// double check it's not already there
-		$classInstance = $this->get_from_entity_map( $object->ID() );
-		if ( $classInstance ) {
+		$classInstance = $this->get_from_entity_map($object->ID());
+		if ($classInstance) {
 			return $classInstance;
 		} else {
-			$this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $object->ID() ] = $object;
+			$this->_entity_map[EEM_Base::$_model_query_blog_id][$object->ID()] = $object;
 			return $object;
 		}
 	}
@@ -4228,8 +4228,8 @@ 
 	 * @param array $cols_n_values
 	 * @return array
 	 */
-	public function deduce_fields_n_values_from_cols_n_values( $cols_n_values ) {
-		return $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
+	public function deduce_fields_n_values_from_cols_n_values($cols_n_values) {
+		return $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
 	}
 
 
@@ -4242,23 +4242,23 @@ 
 	 * @param string $cols_n_values
 	 * @return array
 	 */
-	protected function _deduce_fields_n_values_from_cols_n_values( $cols_n_values ){
+	protected function _deduce_fields_n_values_from_cols_n_values($cols_n_values) {
 		$this_model_fields_n_values = array();
-		foreach( $this->get_tables() as $table_alias => $table_obj ) {
-			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column() );
+		foreach ($this->get_tables() as $table_alias => $table_obj) {
+			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column());
 			//there is a primary key on this table and its not set. Use defaults for all its columns
-			if( $table_pk_value === null && $table_obj->get_pk_column() ){
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() ){
+			if ($table_pk_value === null && $table_obj->get_pk_column()) {
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field()) {
 						//prepare field as if its coming from db
-						$prepared_value = $field_obj->prepare_for_set( $field_obj->get_default_value() );
-						$this_model_fields_n_values[$field_name] = $field_obj->prepare_for_use_in_db( $prepared_value );
+						$prepared_value = $field_obj->prepare_for_set($field_obj->get_default_value());
+						$this_model_fields_n_values[$field_name] = $field_obj->prepare_for_use_in_db($prepared_value);
 					}
 				}
-			}else{
+			} else {
 				//the table's rows existed. Use their values
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() ){
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field()) {
 						$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not(
 							$cols_n_values, $field_obj->get_qualified_column(),
 							$field_obj->get_table_column()
@@ -4278,15 +4278,15 @@ 
 	 * @param $regular_column
 	 * @return null
 	 */
-	protected function _get_column_value_with_table_alias_or_not( $cols_n_values, $qualified_column, $regular_column ){
+	protected function _get_column_value_with_table_alias_or_not($cols_n_values, $qualified_column, $regular_column) {
 		$value = null;
 		//ask the field what it think it's table_name.column_name should be, and call it the "qualified column"
 		//does the field on the model relate to this column retrieved from the db?
 		//or is it a db-only field? (not relating to the model)
-		if( isset( $cols_n_values[ $qualified_column ] ) ){
-			$value = $cols_n_values[ $qualified_column ];
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
-			$value = $cols_n_values[ $regular_column ];
+		if (isset($cols_n_values[$qualified_column])) {
+			$value = $cols_n_values[$qualified_column];
+		}elseif (isset($cols_n_values[$regular_column])) {
+			$value = $cols_n_values[$regular_column];
 		}
 		return $value;
 	}
@@ -4302,25 +4302,25 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function refresh_entity_map_from_db( $id ){
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
+	public function refresh_entity_map_from_db($id) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
 			$wpdb_results = $this->_get_all_wpdb_results(
-				array( array( $this->get_primary_key_field()->get_name() => $id ), 'limit' => 1 )
+				array(array($this->get_primary_key_field()->get_name() => $id), 'limit' => 1)
 			);
-			if( $wpdb_results && is_array( $wpdb_results ) ){
-				$one_row = reset( $wpdb_results );
-				foreach( $this->_deduce_fields_n_values_from_cols_n_values($one_row ) as $field_name => $db_value ) {
-					$obj_in_map->set_from_db( $field_name, $db_value );
+			if ($wpdb_results && is_array($wpdb_results)) {
+				$one_row = reset($wpdb_results);
+				foreach ($this->_deduce_fields_n_values_from_cols_n_values($one_row) as $field_name => $db_value) {
+					$obj_in_map->set_from_db($field_name, $db_value);
 				}
 				//clear the cache of related model objects
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
 				}
 			}
 			return $obj_in_map;
-		}else{
-			return $this->get_one_by_ID( $id );
+		} else {
+			return $this->get_one_by_ID($id);
 		}
 	}
 
@@ -4338,24 +4338,24 @@ 
 	 * @return \EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function refresh_entity_map_with( $id, $replacing_model_obj ) {
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
-			if( $replacing_model_obj instanceof EE_Base_Class ){
-				foreach( $replacing_model_obj->model_field_array() as $field_name => $value ) {
-					$obj_in_map->set( $field_name, $value );
+	public function refresh_entity_map_with($id, $replacing_model_obj) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
+			if ($replacing_model_obj instanceof EE_Base_Class) {
+				foreach ($replacing_model_obj->model_field_array() as $field_name => $value) {
+					$obj_in_map->set($field_name, $value);
 				}
 				//make the model object in the entity map's cache match the $replacing_model_obj
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
-					foreach( $replacing_model_obj->get_all_from_cache( $relation_name ) as $cache_id => $cached_obj ) {
-						$obj_in_map->cache( $relation_name, $cached_obj, $cache_id );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
+					foreach ($replacing_model_obj->get_all_from_cache($relation_name) as $cache_id => $cached_obj) {
+						$obj_in_map->cache($relation_name, $cached_obj, $cache_id);
 					}
 				}
 			}
 			return $obj_in_map;
-		}else{
-			$this->add_to_entity_map( $replacing_model_obj );
+		} else {
+			$this->add_to_entity_map($replacing_model_obj);
 			return $replacing_model_obj;
 		}
 	}
@@ -4368,7 +4368,7 @@ 
 	 * require_once($this->_getClassName().".class.php");
 	 * @return string
 	 */
-	private function _get_class_name(){
+	private function _get_class_name() {
 		return "EE_".$this->get_this_model_name();
 	}
 
@@ -4381,8 +4381,8 @@ 
 	 * @param int $quantity
 	 * @return string
 	 */
-	public function item_name($quantity = 1){
-		return (int)$quantity === 1 ? $this->singular_item : $this->plural_item;
+	public function item_name($quantity = 1) {
+		return (int) $quantity === 1 ? $this->singular_item : $this->plural_item;
 	}
 
 
@@ -4409,13 +4409,13 @@ 
 	 * @throws EE_Error
 	 * @return mixed whatever the plugin which calls add_filter decides
 	 */
-	public function __call($methodName,$args){
-		$className=get_class($this);
-		$tagName="FHEE__{$className}__{$methodName}";
-		if(!has_filter($tagName)){
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso' ),
+					__('Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso'),
 					$methodName,
 					$className,
 					$tagName,
@@ -4424,7 +4424,7 @@ 
 			);
 		}
 
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -4442,28 +4442,28 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ){
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		$className = $this->_get_class_name();
-		if ( $base_class_obj_or_id instanceof $className ) {
+		if ($base_class_obj_or_id instanceof $className) {
 			$model_object = $base_class_obj_or_id;
 		} else {
 			$primary_key_field = $this->get_primary_key_field();
 			if (
 				$primary_key_field instanceof EE_Primary_Key_Int_Field
 				&& (
-					is_int( $base_class_obj_or_id )
-					|| is_string( $base_class_obj_or_id )
+					is_int($base_class_obj_or_id)
+					|| is_string($base_class_obj_or_id)
 				)
 			) {
 				// assume it's an ID.
 				// either a proper integer or a string representing an integer (eg "101" instead of 101)
-				$model_object = $this->get_one_by_ID( $base_class_obj_or_id );
+				$model_object = $this->get_one_by_ID($base_class_obj_or_id);
 			} else if (
 				$primary_key_field instanceof EE_Primary_Key_String_Field
-			    && is_string( $base_class_obj_or_id )
+			    && is_string($base_class_obj_or_id)
 			) {
 				// assume its a string representation of the object
-				$model_object = $this->get_one_by_ID( $base_class_obj_or_id );
+				$model_object = $this->get_one_by_ID($base_class_obj_or_id);
 			} else {
 				throw new EE_Error(
 					sprintf(
@@ -4473,12 +4473,12 @@ 
 						),
 						$base_class_obj_or_id,
 						$this->_get_class_name(),
-						print_r( $base_class_obj_or_id, true )
+						print_r($base_class_obj_or_id, true)
 					)
 				);
 			}
 		}
-		if ( $ensure_is_in_db && $model_object->ID() !== null ) {
+		if ($ensure_is_in_db && $model_object->ID() !== null) {
 			$model_object->save();
 		}
 		return $model_object;
@@ -4494,19 +4494,19 @@ 
 	 * @return int|string depending on the type of this model object's ID
 	 * @throws EE_Error
 	 */
-	public function ensure_is_ID($base_class_obj_or_id){
+	public function ensure_is_ID($base_class_obj_or_id) {
 		$className = $this->_get_class_name();
-		if( $base_class_obj_or_id instanceof $className ){
+		if ($base_class_obj_or_id instanceof $className) {
 			/** @var $base_class_obj_or_id EE_Base_Class */
 			$id = $base_class_obj_or_id->ID();
-		}elseif(is_int($base_class_obj_or_id)){
+		}elseif (is_int($base_class_obj_or_id)) {
 			//assume it's an ID
 			$id = $base_class_obj_or_id;
-		}elseif(is_string($base_class_obj_or_id)){
+		}elseif (is_string($base_class_obj_or_id)) {
 			//assume its a string representation of the object
 			$id = $base_class_obj_or_id;
-		}else{
-			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
+		} else {
+			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'", 'event_espresso'), $base_class_obj_or_id, $this->_get_class_name(), print_r($base_class_obj_or_id, true)));
 		}
 		return $id;
 	}
@@ -4529,14 +4529,14 @@ 
 	 * @param int $values_already_prepared like one of the constants on EEM_Base
 	 * @return void
 	 */
-	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object){
+	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object) {
 		$this->_values_already_prepared_by_model_object = $values_already_prepared;
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
 	 * @return int
 	 */
-	public function get_assumption_concerning_values_already_prepared_by_model_object(){
+	public function get_assumption_concerning_values_already_prepared_by_model_object() {
 		return $this->_values_already_prepared_by_model_object;
 	}
 
@@ -4544,17 +4544,17 @@ 
 	 * Gets all the indexes on this model
 	 * @return EE_Index[]
 	 */
-	public function indexes(){
+	public function indexes() {
 		return $this->_indexes;
 	}
 	/**
 	 * Gets all the Unique Indexes on this model
 	 * @return EE_Unique_Index[]
 	 */
-	public function unique_indexes(){
+	public function unique_indexes() {
 		$unique_indexes = array();
-		foreach($this->_indexes as $name => $index){
-			if($index instanceof EE_Unique_Index){
+		foreach ($this->_indexes as $name => $index) {
+			if ($index instanceof EE_Unique_Index) {
 				$unique_indexes [$name] = $index;
 			}
 		}
@@ -4572,13 +4572,13 @@ 
 	 * @return EE_Model_Field_Base[] indexed by the field's name
 	 * @throws \EE_Error
 	 */
-	public function get_combined_primary_key_fields(){
-		foreach($this->indexes() as $index){
-			if($index instanceof EE_Primary_Key_Index){
+	public function get_combined_primary_key_fields() {
+		foreach ($this->indexes() as $index) {
+			if ($index instanceof EE_Primary_Key_Index) {
 				return $index->fields();
 			}
 		}
-		return array( $this->primary_key_name() => $this->get_primary_key_field());
+		return array($this->primary_key_name() => $this->get_primary_key_field());
 	}
 	
 
@@ -4592,7 +4592,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function get_index_primary_key_string($cols_n_values){
+	public function get_index_primary_key_string($cols_n_values) {
 		$cols_n_values_for_primary_key_index = array_intersect_key($cols_n_values, $this->get_combined_primary_key_fields());
 		return http_build_query($cols_n_values_for_primary_key_index);
 	}
@@ -4607,13 +4607,13 @@ 
 	 * @return null|array
 	 * @throws \EE_Error
 	 */
-	public function parse_index_primary_key_string( $index_primary_key_string) {
+	public function parse_index_primary_key_string($index_primary_key_string) {
 		$key_fields = $this->get_combined_primary_key_fields();
 		//check all of them are in the $id
 		$key_vals_in_combined_pk = array();
-		parse_str( $index_primary_key_string, $key_vals_in_combined_pk );
-		foreach( $key_fields as $key_field_name => $field_obj ) {
-			if( ! isset( $key_vals_in_combined_pk[ $key_field_name ] ) ){
+		parse_str($index_primary_key_string, $key_vals_in_combined_pk);
+		foreach ($key_fields as $key_field_name => $field_obj) {
+			if ( ! isset($key_vals_in_combined_pk[$key_field_name])) {
 				return NULL;
 			}
 		}
@@ -4630,10 +4630,10 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function has_all_combined_primary_key_fields( $key_vals ) {
-		$keys_it_should_have = array_keys( $this->get_combined_primary_key_fields() );
-		foreach( $keys_it_should_have as $key ){
-			if( ! isset( $key_vals[ $key ] ) ){
+	public function has_all_combined_primary_key_fields($key_vals) {
+		$keys_it_should_have = array_keys($this->get_combined_primary_key_fields());
+		foreach ($keys_it_should_have as $key) {
+			if ( ! isset($key_vals[$key])) {
 				return false;
 			}
 		}
@@ -4649,23 +4649,23 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class[] Array keys are object IDs (if there is a primary key on the model. if not, numerically indexed)
 	 */
-	public function get_all_copies($model_object_or_attributes_array, $query_params = array()){
+	public function get_all_copies($model_object_or_attributes_array, $query_params = array()) {
 
-		if($model_object_or_attributes_array instanceof EE_Base_Class){
+		if ($model_object_or_attributes_array instanceof EE_Base_Class) {
 			$attributes_array = $model_object_or_attributes_array->model_field_array();
-		}elseif(is_array($model_object_or_attributes_array)){
+		}elseif (is_array($model_object_or_attributes_array)) {
 			$attributes_array = $model_object_or_attributes_array;
-		}else{
-			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"),$model_object_or_attributes_array));
+		} else {
+			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"), $model_object_or_attributes_array));
 		}
 		//even copies obviously won't have the same ID, so remove the primary key
 		//from the WHERE conditions for finding copies (if there is a primary key, of course)
-		if($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])) {
 			unset($attributes_array[$this->primary_key_name()]);
 		}
-		if(isset($query_params[0])){
-			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		if (isset($query_params[0])) {
+			$query_params[0] = array_merge($attributes_array, $query_params);
+		} else {
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -4681,16 +4681,16 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function get_one_copy($model_object_or_attributes_array,$query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	public function get_one_copy($model_object_or_attributes_array, $query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
-		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
-		if(is_array($copies)){
+		$copies = $this->get_all_copies($model_object_or_attributes_array, $query_params);
+		if (is_array($copies)) {
 			return array_shift($copies);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -4706,10 +4706,10 @@ 
 	 * @return int number of rows updated
 	 * @throws \EE_Error
 	 */
-	public function update_by_ID($fields_n_values,$id){
+	public function update_by_ID($fields_n_values, $id) {
 		$query_params = array(0=>array($this->get_primary_key_field()->get_name() => $id),
 			'default_where_conditions'=>'other_models_only',);
-		return $this->update($fields_n_values,$query_params);
+		return $this->update($fields_n_values, $query_params);
 	}
 
 
@@ -4720,12 +4720,12 @@ 
 	 * @return string an operator which can be used in SQL
 	 * @throws EE_Error
 	 */
-	private function _prepare_operator_for_sql($operator_supplied){
+	private function _prepare_operator_for_sql($operator_supplied) {
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
-		if($sql_operator){
+		if ($sql_operator) {
 			return $sql_operator;
-		}else{
-			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"),$operator_supplied,implode(",",array_keys($this->_valid_operators))));
+		} else {
+			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"), $operator_supplied, implode(",", array_keys($this->_valid_operators))));
 		}
 	}
 
@@ -4739,10 +4739,10 @@ 
 	 * @return string[]
 	 * @throws \EE_Error
 	 */
-	public function get_all_names($query_params = array()){
+	public function get_all_names($query_params = array()) {
 		$objs = $this->get_all($query_params);
 		$names = array();
-		foreach($objs as $obj){
+		foreach ($objs as $obj) {
 			$names[$obj->ID()] = $obj->name();
 		}
 		return $names;
@@ -4761,11 +4761,11 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function get_IDs( $model_objects, $filter_out_empty_ids = false) {
-		if( ! $this->has_primary_key_field() ) {
-			if( WP_DEBUG ) {
+	public function get_IDs($model_objects, $filter_out_empty_ids = false) {
+		if ( ! $this->has_primary_key_field()) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
-					__( 'Trying to get IDs from a model than has no primary key', 'event_espresso' ),
+					__('Trying to get IDs from a model than has no primary key', 'event_espresso'),
 					__FILE__,
 					__FUNCTION__,
 					__LINE__
@@ -4773,13 +4773,13 @@ 
 			}
 		}
 		$IDs = array();
-		foreach( $model_objects as $model_object ) {
+		foreach ($model_objects as $model_object) {
 			$id = $model_object->ID();
-			if( ! $id ) {
-				if( $filter_out_empty_ids ) {
+			if ( ! $id) {
+				if ($filter_out_empty_ids) {
 					continue;
 				}
-				if ( WP_DEBUG ) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						__(
 							'Called %1$s on a model object that has no ID and so probably hasn\'t been saved to the database',
@@ -4801,8 +4801,8 @@ 
 	 * are no capabilities that relate to this model returns false
 	 * @return string|false
 	 */
-	public function cap_slug(){
-		return apply_filters( 'FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
+	public function cap_slug() {
+		return apply_filters('FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
 	}
 
 
@@ -4817,34 +4817,34 @@ 
 	 * @return EE_Default_Where_Conditions[] indexed by associated capability
 	 * @throws \EE_Error
 	 */
-	public function cap_restrictions( $context = EEM_Base::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function cap_restrictions($context = EEM_Base::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		//check if we ought to run the restriction generator first
-		if(
-			isset( $this->_cap_restriction_generators[ $context ] )
-			&& $this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base
-			&& ! $this->_cap_restriction_generators[ $context ]->has_generated_cap_restrictions()
+		if (
+			isset($this->_cap_restriction_generators[$context])
+			&& $this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base
+			&& ! $this->_cap_restriction_generators[$context]->has_generated_cap_restrictions()
 		) {
-			$this->_cap_restrictions[ $context ] = array_merge(
-				$this->_cap_restrictions[ $context ],
-				$this->_cap_restriction_generators[ $context ]->generate_restrictions()
+			$this->_cap_restrictions[$context] = array_merge(
+				$this->_cap_restrictions[$context],
+				$this->_cap_restriction_generators[$context]->generate_restrictions()
 			);
 		}
 		//and make sure we've finalized the construction of each restriction
-		foreach( $this->_cap_restrictions[ $context ] as $where_conditions_obj ) {
-			if ( $where_conditions_obj instanceof EE_Default_Where_Conditions ) {
-				$where_conditions_obj->_finalize_construct( $this );
+		foreach ($this->_cap_restrictions[$context] as $where_conditions_obj) {
+			if ($where_conditions_obj instanceof EE_Default_Where_Conditions) {
+				$where_conditions_obj->_finalize_construct($this);
 			}
 		}
 
-		return $this->_cap_restrictions[ $context ];
+		return $this->_cap_restrictions[$context];
 	}
 
 	/**
 	 * Indicating whether or not this model thinks its a wp core model
 	 * @return boolean
 	 */
-	public function is_wp_core_model(){
+	public function is_wp_core_model() {
 		return $this->_wp_core_model;
 	}
 
@@ -4858,12 +4858,12 @@ 
 	 * @return EE_Default_Where_Conditions[] indexed by capability name
 	 * @throws \EE_Error
 	 */
-	public function caps_missing( $context = EEM_Base::caps_read ) {
+	public function caps_missing($context = EEM_Base::caps_read) {
 		$missing_caps = array();
-		$cap_restrictions = $this->cap_restrictions( $context );
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-			if( ! EE_Capabilities::instance()->current_user_can( $cap, $this->get_this_model_name() . '_model_applying_caps') ) {
-				$missing_caps[ $cap ] = $restriction_if_no_cap;
+		$cap_restrictions = $this->cap_restrictions($context);
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+			if ( ! EE_Capabilities::instance()->current_user_can($cap, $this->get_this_model_name().'_model_applying_caps')) {
+				$missing_caps[$cap] = $restriction_if_no_cap;
 			}
 		}
 		return $missing_caps;
@@ -4875,7 +4875,7 @@ 
 	 * one of 'read', 'edit', or 'delete'
 	 */
 	public function cap_contexts_to_cap_action_map() {
-		return apply_filters( 'FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this );
+		return apply_filters('FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this);
 	}
 
 
@@ -4886,19 +4886,19 @@ 
 	 * @return string one of EEM_Base::cap_contexts_to_cap_action_map() values
 	 * @throws \EE_Error
 	 */
-	public function cap_action_for_context( $context ) {
+	public function cap_action_for_context($context) {
 		$mapping = $this->cap_contexts_to_cap_action_map();
-		if( isset( $mapping[ $context ] ) ) {
-			return $mapping[ $context ];
+		if (isset($mapping[$context])) {
+			return $mapping[$context];
 		}
-		if( $action = apply_filters( 'FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context ) ) {
+		if ($action = apply_filters('FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context)) {
 			return $action;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso' ),
+				__('Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso'),
 				$context,
-				implode(',', array_keys( $this->cap_contexts_to_cap_action_map() ) )
+				implode(',', array_keys($this->cap_contexts_to_cap_action_map()))
 			)
 		);
 
@@ -4909,7 +4909,7 @@ 
 	 * @return array
 	 */
 	static public function valid_cap_contexts() {
-		return apply_filters( 'FHEE__EEM_Base__valid_cap_contexts', array(
+		return apply_filters('FHEE__EEM_Base__valid_cap_contexts', array(
 			self::caps_read,
 			self::caps_read_admin,
 			self::caps_edit,
@@ -4925,17 +4925,17 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	static public function verify_is_valid_cap_context( $context ) {
+	static public function verify_is_valid_cap_context($context) {
 		$valid_cap_contexts = EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_cap_contexts ) ) {
+		if (in_array($context, $valid_cap_contexts)) {
 			return true;
-		}else{
+		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso' ),
+					__('Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso'),
 					$context,
-					'EEM_Base' ,
-					implode(',', $valid_cap_contexts )
+					'EEM_Base',
+					implode(',', $valid_cap_contexts)
 				)
 			);
 		}

Braces +72 added lines, -72 removed lines

@@ -554,7 +554,7 @@ 
 		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
 				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base ) {
 			return $this->_cap_restriction_generators[ $context ]->generate_restrictions();
-		}else{
+		} else{
 			return array();
 		}
 	}
@@ -812,13 +812,13 @@ 
 				$last_model_name = end( $models_to_follow_to_wp_users );
 				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model( $last_model_name );
 				$model_chain_to_wp_user = $this->_model_chain_to_wp_user . '.';
-			}else{
+			} else{
 				$model_with_fk_to_wp_users = $this;
 				$model_chain_to_wp_user = '';
 			}
 			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to( 'WP_User' );
 			return $model_chain_to_wp_user . $wp_user_field->get_name();
-		}catch( EE_Error $e ) {
+		} catch( EE_Error $e ) {
 			return false;
 		}
 	}
@@ -846,11 +846,11 @@ 
 	public function is_owned() {
 		if( $this->model_chain_to_wp_user() ){
 			return true;
-		}else{
+		} else{
 			try{
 				$this->get_foreign_key_to( 'WP_User' );
 				return true;
-			}catch( EE_Error $e ){
+			} catch( EE_Error $e ){
 				return false;
 			}
 		}
@@ -946,7 +946,7 @@ 
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
 			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+		} else{
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -1002,7 +1002,7 @@ 
 		}
 		if( $this->has_primary_key_field ( ) ) {
 			$query_params[ 0 ][ $this->primary_key_name() ] = $id ;
-		}else{
+		} else{
 			//no primary key, so the $id must be from the get_index_primary_key_string()
 			$query_params[0] = array_replace_recursive( $query_params[ 0 ], $this->parse_index_primary_key_string( $id ) );
 		}
@@ -1028,7 +1028,7 @@ 
 		$items = $this->get_all($query_params);
 		if(empty($items)){
 			return null;
-		}else{
+		} else{
 			return array_shift($items);
 		}
 	}
@@ -1414,7 +1414,7 @@ 
 				//get the model object's PK, as we'll want this if we need to insert a row into secondary tables
 				if( $this->has_primary_key_field() ){
 					$main_table_pk_value = $wpdb_result[ $this->get_primary_key_field()->get_qualified_column() ];
-				}else{
+				} else{
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it would be lots of work)
 					$main_table_pk_value = null;
 				}
@@ -1453,7 +1453,7 @@ 
 		if( $keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object ){
 			if( $this->has_primary_key_field() ){
 				$model_objs_affected_ids = $this->get_col( $query_params );
-			}else{
+			} else{
 				//we need to select a bunch of columns and then combine them into the the "index primary key string"s
 				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A );
 				$model_objs_affected_ids = array();
@@ -1517,9 +1517,9 @@ 
 
 		if( $field_to_select ){
 			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		} elseif( $this->has_primary_key_field ( ) ){
 			$field = $this->get_primary_key_field();
-		}else{
+		} else{
 			//no primary key, just grab the first column
 			$field = reset( $this->field_settings());
 		}
@@ -1546,7 +1546,7 @@ 
 		$col = $this->get_col( $query_params, $field_to_select );
 		if( ! empty( $col ) ) {
 			return reset( $col );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -1673,7 +1673,7 @@ 
 
 			//		/echo "delete sql:$SQL";
 			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+		} else{
 			$rows_deleted = 0;
 		}
 
@@ -1717,7 +1717,7 @@ 
 		//first, if $ignore_this_model_obj was supplied, get its model
 		if($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class){
 			$ignored_model = $ignore_this_model_obj->get_model();
-		}else{
+		} else{
 			$ignored_model = null;
 		}
 		//now check all the relations of $this_model_obj_or_id and see if there
@@ -1730,7 +1730,7 @@ 
 				if($ignored_model && $relation_name === $ignored_model->get_this_model_name()){
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id,array(
 					array($ignored_model->get_primary_key_field()->get_name() => array('!=',$ignore_this_model_obj->ID()))));
-				}else{
+				} else{
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
@@ -1803,7 +1803,7 @@ 
 			}
 
 			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+		} elseif(count($this->get_combined_primary_key_fields()) > 1){
 			$ways_to_identify_a_row = array();
 			$fields = $this->get_combined_primary_key_fields();
 			//note: because there' sno primary key, that means nothing else  can be pointing to this model, right?
@@ -1815,7 +1815,7 @@ 
 				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
 			}
 			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+		} else{
 			//so there's no primary key and no combined key...
 			//sorry, can't help you
 			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"),get_class($this)));
@@ -1839,10 +1839,10 @@ 
 		if($field_to_count){
 			$field_obj = $this->field_settings_for($field_to_count);
 			$column_to_count = $field_obj->get_qualified_column();
-		}elseif($this->has_primary_key_field ()){
+		} elseif($this->has_primary_key_field ()){
 			$pk_field_obj = $this->get_primary_key_field();
 			$column_to_count = $pk_field_obj->get_qualified_column();
-		}else{//there's no primary key
+		} else{//there's no primary key
 			$column_to_count = '*';
 		}
 
@@ -1867,7 +1867,7 @@ 
 		if($field_to_sum){
 			$field_obj = $this->field_settings_for($field_to_sum);
 
-		}else{
+		} else{
 			$field_obj = $this->get_primary_key_field();
 		}
 		$column_to_count = $field_obj->get_qualified_column();
@@ -1877,7 +1877,7 @@ 
 		$data_type = $field_obj->get_wpdb_data_type();
 		if( $data_type === '%d' || $data_type === '%s' ){
 			return (float)$return_value;
-		}else{//must be %f
+		} else{//must be %f
 			return (float)$return_value;
 		}
 	}
@@ -1915,10 +1915,10 @@ 
 			$wpdb->show_errors( $old_show_errors_value );
 			if( ! empty( $wpdb->last_error ) ){
 				throw new EE_Error( sprintf( __( 'WPDB Error: "%s"', 'event_espresso' ), $wpdb->last_error ) );
-			}elseif( $result === false ){
+			} elseif( $result === false ){
 				throw new EE_Error( sprintf( __( 'WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso' ), $wpdb_method, var_export( $arguments_to_provide, true ) ) );
 			}
-		}elseif( $result === false ) {
+		} elseif( $result === false ) {
 			EE_Error::add_error( 
 				sprintf( 
 					__( 'A database error has occurred. Turn on WP_DEBUG for more information.||A database error occurred doing wpdb method "%1$s", with arguments "%2$s". The error was "%3$s"', 'event_espresso' ),
@@ -2260,7 +2260,7 @@ 
 		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
 		if( $results ){
 			return array_shift($results);
-		}else{
+		} else{
 			return null;
 		}
 
@@ -2331,7 +2331,7 @@ 
 			 */
 			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
 			return $new_id;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -2389,9 +2389,9 @@ 
 	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true ){
 		if($obj_or_fields_array instanceof EE_Base_Class){
 			$fields_n_values = $obj_or_fields_array->model_field_array();
-		}elseif( is_array($obj_or_fields_array)){
+		} elseif( is_array($obj_or_fields_array)){
 			$fields_n_values = $obj_or_fields_array;
-		}else{
+		} else{
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -2416,7 +2416,7 @@ 
 		//if there is nothing to base this search on, then we shouldn't find anything
 		if( empty( $query_params ) ){
 			return array();
-		}else{
+		} else{
 			return $this->get_one($query_params);
 		}
 	}
@@ -2497,12 +2497,12 @@ 
 		if($this->has_primary_key_field()){
 			if($this->get_primary_key_field()->is_auto_increment()){
 				return $wpdb->insert_id;
-			}else{
+			} else{
 				//it's not an auto-increment primary key, so
 				//it must have been supplied
 				return $fields_n_values[$this->get_primary_key_field()->get_name()];
 			}
-		}else{
+		} else{
 			//we can't return a  primary key because there is none. instead return
 			//a unique string indicating this model
 			return $this->get_index_primary_key_string($fields_n_values);
@@ -2554,7 +2554,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else{
 			return $value;
 		}
 	}
@@ -2723,10 +2723,10 @@ 
 					if (! is_array($possibly_array_of_params)){
 						throw new EE_Error(sprintf(__("You used a special where query param %s, but the value isn't an array of where query params, it's just %s'. It should be an array, eg array('EVT_ID'=>23,'OR'=>array('Venue.VNU_ID'=>32,'Venue.VNU_name'=>'monkey_land'))", "event_espresso"),
 							$param,$possibly_array_of_params));
-					}else{
+					} else{
 						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier,$query_param_type);
 					}
-				}elseif($query_param_type === 0 //ie WHERE
+				} elseif($query_param_type === 0 //ie WHERE
 						&& is_array($possibly_array_of_params)
 						&& isset($possibly_array_of_params[2])
 						&& $possibly_array_of_params[2] == true){
@@ -3004,7 +3004,7 @@ 
 	private function _extract_order($should_be_order_string){
 		if(in_array($should_be_order_string, $this->_allowed_order_values)){
 			return $should_be_order_string;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"),get_class($this),$should_be_order_string));
 		}
 	}
@@ -3082,7 +3082,7 @@ 
 		foreach($default_where_conditions as $key => $val){
 			if( isset($provided_where_conditions[$key])){
 				$none_overridden = false;
-			}else{
+			} else{
 				$null_friendly_where_conditions[$or_condition_key_for_defaults]['AND'][$key] = $val;
 			}
 		}
@@ -3208,7 +3208,7 @@ 
 		if(array_key_exists($query_param,$this_model_fields)){
 			if($allow_fields){
 				return;
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("Using a field name (%s) on model %s is not allowed on this query param type '%s'. Original query param was %s", "event_espresso"),
 						$query_param,get_class($this),$query_param_type,$original_query_param));
 			}
@@ -3217,7 +3217,7 @@ 
 		elseif(in_array($query_param, $this->_logic_query_param_keys, TRUE)){
 			if($allow_logic_query_params){
 				return;
-			}else{
+			} else{
 				throw new EE_Error(
 					sprintf(
 						__( 'Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso' ),
@@ -3248,12 +3248,12 @@ 
 					//we should actually end in a field name, not a model like this!
 					throw new EE_Error(sprintf(__("Query param '%s' (of type %s on model %s) shouldn't end on a period (.) ", "event_espresso"),
 					$query_param,$query_param_type,get_class($this),$valid_related_model_name));
-				}else{
+				} else{
 					$related_model_obj = $this->get_related_model_obj($valid_related_model_name);
 					$related_model_obj->_extract_related_model_info_from_query_param($query_param, $passed_in_query_info, $query_param_type, $original_query_param);
 					return;
 				}
-			}elseif($query_param === $valid_related_model_name){
+			} elseif($query_param === $valid_related_model_name){
 				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
 				return;
 			}
@@ -3318,7 +3318,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
 		if($SQL){
 			return " WHERE ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 	}
@@ -3337,7 +3337,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
 		if($SQL){
 			return " HAVING ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 
@@ -3359,7 +3359,7 @@ 
 			$model_instance=call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s','event_espresso'),$model_name,$model_class,$model_filepath));
 		}
 	}
@@ -3392,14 +3392,14 @@ 
 						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ') .")";
 						break;
 				}
-			}else{
+			} else{
 				$field_obj = $this->_deduce_field_from_query_param($query_param);
 
 				//if it's not a normal field, maybe it's a custom selection?
 				if( ! $field_obj){
 					if(isset( $this->_custom_selections[$query_param][1])){
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
+					} else{
 						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
 					}
 				}
@@ -3424,11 +3424,11 @@ 
 		if( $field ){
 			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param( $field->get_model_name(), $query_param );
 			return $table_alias_prefix . $field->get_qualified_column();
-		}elseif(array_key_exists($query_param,$this->_custom_selections)){
+		} elseif(array_key_exists($query_param,$this->_custom_selections)){
 			//maybe it's custom selection item?
 			//if so, just use it as the "column name"
 			return $query_param;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"),$query_param,implode(",",$this->_custom_selections)));
 		}
 	}
@@ -3445,7 +3445,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -3630,7 +3630,7 @@ 
 		global $wpdb;
 		if($field_obj instanceof EE_Model_Field_Base){
 			return $wpdb->prepare($field_obj->get_wpdb_data_type(),$this->_prepare_value_for_use_in_db($value, $field_obj));
-		}else{//$field_obj should really just be a data type
+		} else{//$field_obj should really just be a data type
 			if( ! in_array($field_obj,$this->_valid_wpdb_data_types)){
 				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"),$field_obj,implode(",",$this->_valid_wpdb_data_types)));
 			}
@@ -3659,14 +3659,14 @@ 
 		if($number_of_parts === 1){
 			$field_name = $last_query_param_part;
 			$model_obj = $this;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model_obj = $this->get_related_model_obj( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			return null;
 		}
 	}
@@ -3685,7 +3685,7 @@ 
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
 		if($field){
 			return $field->get_qualified_column();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.",'event_espresso'),$field_name,get_class($this)));
 		}
 	}
@@ -3756,7 +3756,7 @@ 
 					//the FROM statement, BUT the primary table isn't. So we want
 					//to add the inverse join sql
 					$SQL .= $table_obj->get_inverse_join_sql($alias_prefixed);
-				}else{
+				} else{
 					//just add a regular JOIN to this table from the primary table
 					$SQL .= $table_obj->get_join_sql($alias_prefixed);
 				}
@@ -3869,7 +3869,7 @@ 
 		$fieldSettings = $this->field_settings(true);
 		if( isset($fieldSettings[$fieldName])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3883,7 +3883,7 @@ 
 		$relations = $this->relation_settings();
 		if(isset($relations[$relation_name])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3934,7 +3934,7 @@ 
 			try{
 				$this->get_primary_key_field();
 				$this->_has_primary_key_field = true;
-			}catch(EE_Error $e){
+			} catch(EE_Error $e){
 				$this->_has_primary_key_field = false;
 			}
 		}
@@ -4014,7 +4014,7 @@ 
 				}
 			}
 			return $this->_cached_fields;
-		}else{
+		} else{
 			if( $this->_cached_fields_non_db_only === NULL ){
 				$this->_cached_fields_non_db_only = array();
 				foreach($this->_fields as $fields_corresponding_to_table){
@@ -4150,7 +4150,7 @@ 
 			if(empty( $this_model_fields_n_values[$this->primary_key_name()] )){
 				return NULL;
 			}
-		}else if($this->unique_indexes()){
+		} else if($this->unique_indexes()){
 			$first_column = reset($this_model_fields_n_values);
 			if(empty($first_column)){
 				return NULL;
@@ -4165,7 +4165,7 @@ 
 				// add this new object to the entity map
 				$classInstance = $this->add_to_entity_map( $classInstance );
 			}
-		}else{
+		} else{
 			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
 		}
 
@@ -4255,7 +4255,7 @@ 
 						$this_model_fields_n_values[$field_name] = $field_obj->prepare_for_use_in_db( $prepared_value );
 					}
 				}
-			}else{
+			} else{
 				//the table's rows existed. Use their values
 				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
 					if( ! $field_obj->is_db_only_field() ){
@@ -4285,7 +4285,7 @@ 
 		//or is it a db-only field? (not relating to the model)
 		if( isset( $cols_n_values[ $qualified_column ] ) ){
 			$value = $cols_n_values[ $qualified_column ];
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
+		} elseif( isset( $cols_n_values[ $regular_column ] ) ){
 			$value = $cols_n_values[ $regular_column ];
 		}
 		return $value;
@@ -4319,7 +4319,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			return $this->get_one_by_ID( $id );
 		}
 	}
@@ -4354,7 +4354,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			$this->add_to_entity_map( $replacing_model_obj );
 			return $replacing_model_obj;
 		}
@@ -4499,13 +4499,13 @@ 
 		if( $base_class_obj_or_id instanceof $className ){
 			/** @var $base_class_obj_or_id EE_Base_Class */
 			$id = $base_class_obj_or_id->ID();
-		}elseif(is_int($base_class_obj_or_id)){
+		} elseif(is_int($base_class_obj_or_id)){
 			//assume it's an ID
 			$id = $base_class_obj_or_id;
-		}elseif(is_string($base_class_obj_or_id)){
+		} elseif(is_string($base_class_obj_or_id)){
 			//assume its a string representation of the object
 			$id = $base_class_obj_or_id;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
 		}
 		return $id;
@@ -4653,9 +4653,9 @@ 
 
 		if($model_object_or_attributes_array instanceof EE_Base_Class){
 			$attributes_array = $model_object_or_attributes_array->model_field_array();
-		}elseif(is_array($model_object_or_attributes_array)){
+		} elseif(is_array($model_object_or_attributes_array)){
 			$attributes_array = $model_object_or_attributes_array;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"),$model_object_or_attributes_array));
 		}
 		//even copies obviously won't have the same ID, so remove the primary key
@@ -4665,7 +4665,7 @@ 
 		}
 		if(isset($query_params[0])){
 			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		} else{
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -4690,7 +4690,7 @@ 
 		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
 		if(is_array($copies)){
 			return array_shift($copies);
-		}else{
+		} else{
 			return null;
 		}
 	}
@@ -4724,7 +4724,7 @@ 
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
 		if($sql_operator){
 			return $sql_operator;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"),$operator_supplied,implode(",",array_keys($this->_valid_operators))));
 		}
 	}
@@ -4929,7 +4929,7 @@ 
 		$valid_cap_contexts = EEM_Base::valid_cap_contexts();
 		if( in_array( $context, $valid_cap_contexts ) ) {
 			return true;
-		}else{
+		} else{
 			throw new EE_Error(
 				sprintf(
 					__( 'Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso' ),

Doc Comments +22 added lines, -18 removed lines

@@ -802,7 +802,7 @@ 
 	 * Returns the name of the field's name that points to the WP_User table
 	 *  on this model (or follows the _model_chain_to_wp_user and uses that model's
 	 * foreign key to the WP_User table)
-	 * @return string|boolean string on success, boolean false when there is no
+	 * @return string|false string on success, boolean false when there is no
 	 * foreign key to the WP_User table
 	 */
 	public function wp_user_field_name() {
@@ -897,6 +897,7 @@ 
 	 * If you would like to use these custom selections in WHERE, GROUP_BY, or HAVING clauses, you must instead provide an array.
 	 * Array keys are the aliases used to refer to this selection, and values are to be numerically-indexed arrays, where 0 is the selection
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
+	 * @param string $columns_to_select
 	 * @return array|stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 * @throws \EE_Error
 	 */
@@ -1040,7 +1041,7 @@ 
 	 * found in the database matching the given query conditions.
 	 *
 	 * @param mixed $current_field_value    Value used for the reference point.
-	 * @param null  $field_to_order_by      What field is used for the
+	 * @param string  $field_to_order_by      What field is used for the
 	 *                                      reference point.
 	 * @param int   $limit                  How many to return.
 	 * @param array $query_params           Extra conditions on the query.
@@ -1062,7 +1063,7 @@ 
 	 * as found in the database matching the given query conditions.
 	 *
 	 * @param mixed $current_field_value    Value used for the reference point.
-	 * @param null  $field_to_order_by      What field is used for the
+	 * @param string  $field_to_order_by      What field is used for the
 	 *                                      reference point.
 	 * @param int   $limit                  How many to return.
 	 * @param array $query_params           Extra conditions on the query.
@@ -1084,7 +1085,7 @@ 
 	 * database matching the given query conditions.
 	 *
 	 * @param mixed $current_field_value    Value used for the reference point.
-	 * @param null  $field_to_order_by      What field is used for the
+	 * @param string  $field_to_order_by      What field is used for the
 	 *                                      reference point.
 	 * @param array $query_params           Extra conditions on the query.
 	 * @param null  $columns_to_select      If left null, then an EE_Base_Class
@@ -1108,7 +1109,7 @@ 
 	 * the database matching the given query conditions.
 	 *
 	 * @param mixed $current_field_value    Value used for the reference point.
-	 * @param null $field_to_order_by       What field is used for the
+	 * @param string $field_to_order_by       What field is used for the
 	 *                                      reference point.
 	 * @param array $query_params           Extra conditions on the query.
 	 * @param null $columns_to_select       If left null, then an EE_Base_Class
@@ -1187,6 +1188,7 @@ 
 	/**
 	 * This sets the _timezone property after model object has been instantiated.
 	 * @param null | string $timezone valid PHP DateTimeZone timezone string
+	 * @param null|string $timezone
 	 */
 	public function set_timezone( $timezone ) {
 		if ( $timezone !== null ) {
@@ -1241,7 +1243,7 @@ 
 	 * @param bool   $pretty          Whether to return the pretty formats (true) or not (false).
 	 * @throws EE_Error   If the given field_name is not of the EE_Datetime_Field type.
 	 *
-	 * @return array formats in an array with the date format first, and the time format last.
+	 * @return string[] formats in an array with the date format first, and the time format last.
 	 */
 	public function get_formats_for( $field_name, $pretty = false ) {
 		$field_settings = $this->field_settings_for( $field_name );
@@ -1276,7 +1278,7 @@ 
 	 *
 	 * @throws EE_Error   	If the given field_name is not of the EE_Datetime_Field type.
 	 *
-	 * @return int|string  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
+	 * @return string|null  If the given field_name is not of the EE_Datetime_Field type, then an EE_Error
 	 *                    	     exception is triggered.
 	 */
 	public function current_time_for_query( $field_name, $timestamp = false, $what = 'both' ) {
@@ -1587,7 +1589,7 @@ 
 	 * Wrapper for EEM_Base::delete_permanently()
 	 *
 	 * @param mixed $id
-	 * @return boolean whether the row got deleted or not
+	 * @return integer whether the row got deleted or not
 	 * @throws \EE_Error
 	 */
 	public function delete_permanently_by_ID( $id ) {
@@ -1606,7 +1608,7 @@ 
 	 * Wrapper for EEM_Base::delete()
 	 *
 	 * @param mixed $id
-	 * @return boolean whether the row got deleted or not
+	 * @return integer whether the row got deleted or not
 	 * @throws \EE_Error
 	 */
 	public function delete_by_ID( $id ){
@@ -2012,7 +2014,7 @@ 
 	/**
 	 * Verifies the EE addons' database is up-to-date and records that we've done it on
 	 * EEM_Base::$_db_verification_level
-	 * @param $wpdb_method
+	 * @param string $wpdb_method
 	 * @param $arguments_to_provide
 	 * @return string
 	 */
@@ -2107,6 +2109,7 @@ 
 	 * @return boolean of success
 	 * @throws \EE_Error
 	 * @param array  $where_query  This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
+	 * @param EE_Base_Class $id_or_obj
 	 */
 	public function remove_relationship_to($id_or_obj,  $other_model_id_or_obj, $relationName, $where_query= array() ){
 		$relation_obj = $this->related_settings_for($relationName);
@@ -2116,7 +2119,7 @@ 
 
 
 	/**
-	 * @param mixed           $id_or_obj
+	 * @param EE_Base_Class           $id_or_obj
 	 * @param string          $relationName
 	 * @param array           $where_query_params
 	 * @param EE_Base_Class[] objects to which relations were removed
@@ -2155,7 +2158,7 @@ 
 	 * However, if the model objects can't be deleted because of blocking related model objects, then
 	 * they aren't deleted. (Unless the thing that would have been deleted can be soft-deleted, that still happens).
 	 *
-	 * @param EE_Base_Class|int|string $id_or_obj
+	 * @param EE_Base_Class $id_or_obj
 	 * @param string                   $model_name
 	 * @param array                    $query_params
 	 * @return int how many deleted
@@ -2175,7 +2178,7 @@ 
 	 * the model objects can't be hard deleted because of blocking related model objects,
 	 * just does a soft-delete on them instead.
 	 *
-	 * @param EE_Base_Class|int|string $id_or_obj
+	 * @param EE_Base_Class $id_or_obj
 	 * @param string                   $model_name
 	 * @param array                    $query_params
 	 * @return int how many deleted
@@ -2224,6 +2227,7 @@ 
 	 * @param string $model_name   like 'Event', or 'Registration'
 	 * @param array  $query_params like EEM_Base::get_all's
 	 * @param string $field_to_sum name of field to count by. By default, uses primary key
+	 * @param EE_Base_Class $id_or_obj
 	 * @return float
 	 * @throws \EE_Error
 	 */
@@ -2629,7 +2633,7 @@ 
 	/**
 	 * Finds all the fields that correspond to the given table
 	 * @param string $table_alias, array key in EEM_Base::_tables
-	 * @return EE_Model_Field_Base[]
+	 * @return EE_Model_Field_Base
 	 */
 	public function _get_fields_for_table($table_alias){
 		return $this->_fields[$table_alias];
@@ -3892,8 +3896,8 @@ 
 	/**
 	 * gets the field object of type 'primary_key' from the fieldsSettings attribute.
 	 * Eg, on EE_Answer that would be ANS_ID field object
-	 * @param $field_obj
-	 * @return EE_Model_Field_Base
+	 * @param EE_Model_Field_Base $field_obj
+	 * @return boolean
 	 */
 	public function is_primary_key_field( $field_obj ){
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
@@ -3988,7 +3992,7 @@ 
 	 * Gets the actual table for the table alias
 	 * @param string $table_alias eg Event, Event_Meta, Registration, Transaction, but maybe
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
-	 * @return EE_Table_Base
+	 * @return string
 	 */
 	public function get_table_for_alias($table_alias){
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
@@ -4534,7 +4538,7 @@ 
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
-	 * @return int
+	 * @return boolean
 	 */
 	public function get_assumption_concerning_values_already_prepared_by_model_object(){
 		return $this->_values_already_prepared_by_model_object;