eventespresso / event-espresso-core

core/libraries/line_item_filters/EE_Specific_Registrations_Line_Item_Filter.class.php

Spacing +35 added lines, -35 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -50,9 +50,9 @@ 
 	 *
 	 * @param EE_Registration[] $registrations
 	 */
-	public function __construct( $registrations ) {
+	public function __construct($registrations) {
 		$this->_registrations = $registrations;
-		$this->_calculate_registrations_per_line_item_code( $registrations );
+		$this->_calculate_registrations_per_line_item_code($registrations);
 		// these reg statuses should NOT increment the line item quantity
 		$this->_closed_reg_statuses = EEM_Registration::closed_reg_statuses();
 	}
@@ -65,20 +65,20 @@ 
 	 * @param EE_Registration[] $registrations
 	 * @return void
 	 */
-	protected function _calculate_registrations_per_line_item_code( $registrations ) {
-		foreach ( $registrations as $registration ) {
+	protected function _calculate_registrations_per_line_item_code($registrations) {
+		foreach ($registrations as $registration) {
 			$line_item_code = EEM_Line_Item::instance()->get_var(
 				EEM_Line_Item::instance()->line_item_for_registration_query_params(
 					$registration,
-					array( 'limit' => 1 )
+					array('limit' => 1)
 				),
 				'LIN_code'
 			);
-			if ( $line_item_code ) {
-				if ( ! isset( $this->_line_item_registrations[ $line_item_code ] ) ) {
-					$this->_line_item_registrations[ $line_item_code ] = array();
+			if ($line_item_code) {
+				if ( ! isset($this->_line_item_registrations[$line_item_code])) {
+					$this->_line_item_registrations[$line_item_code] = array();
 				}
-				$this->_line_item_registrations[ $line_item_code ][ $registration->ID() ] = $registration;
+				$this->_line_item_registrations[$line_item_code][$registration->ID()] = $registration;
 			}
 		}
 	}
@@ -92,9 +92,9 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return \EEI_Line_Item
 	 */
-	public function process( EEI_Line_Item $line_item ) {
-		$this->_adjust_line_item_quantity( $line_item );
-		if ( ! $line_item->children() ) {
+	public function process(EEI_Line_Item $line_item) {
+		$this->_adjust_line_item_quantity($line_item);
+		if ( ! $line_item->children()) {
 			return $line_item;
 		}
 		//the original running total (taking ALL tickets into account)
@@ -103,11 +103,11 @@ 
 		$running_total_of_children_under_consideration = 0;
 		// let's also track the quantity of tickets that pertain to the registrations
 		$total_child_ticket_quantity = 0;
-		foreach ( $line_item->children() as $child_line_item ) {
+		foreach ($line_item->children() as $child_line_item) {
 			$original_li_total = $child_line_item->is_percent()
 				? $running_total_of_children * $child_line_item->percent() / 100
 				: $child_line_item->unit_price() * $child_line_item->quantity();
-			$this->process( $child_line_item );
+			$this->process($child_line_item);
 			// If this line item is a normal line item that isn't for a ticket,
 			// we want to modify its total (and unit price if not a percentage line item)
 			// so it reflects only that portion of the surcharge/discount shared by these registrations
@@ -121,8 +121,8 @@ 
 				$child_line_item->set_total(
 					$running_total_of_children_under_consideration * $percent_of_running_total
 				);
-				if ( ! $child_line_item->is_percent() ) {
-					$child_line_item->set_unit_price( $child_line_item->total() / $child_line_item->quantity() );
+				if ( ! $child_line_item->is_percent()) {
+					$child_line_item->set_unit_price($child_line_item->total() / $child_line_item->quantity());
 				}
 			} else if (
 				$line_item->type() === EEM_Line_Item::type_line_item
@@ -139,28 +139,28 @@ 
 							// unless it IS a cancellation and the current registration is cancelled
 							$child_line_item->is_cancelled()
 							&& $this->_current_registration instanceof EE_Registration
-							&& in_array( $this->_current_registration->status_ID(), $this->_closed_reg_statuses )
+							&& in_array($this->_current_registration->status_ID(), $this->_closed_reg_statuses)
 						)
 					)
 				) {
-					$child_line_item->set_quantity( $line_item->quantity() );
-					$child_line_item->set_total( $child_line_item->unit_price() * $child_line_item->quantity() );
+					$child_line_item->set_quantity($line_item->quantity());
+					$child_line_item->set_total($child_line_item->unit_price() * $child_line_item->quantity());
 				}
 			}
 			$running_total_of_children += $original_li_total;
 			$running_total_of_children_under_consideration += $child_line_item->total();
-			if ( $child_line_item->OBJ_type() == 'Ticket' ) {
+			if ($child_line_item->OBJ_type() == 'Ticket') {
 				$total_child_ticket_quantity += $child_line_item->quantity();
 			}
 		}
-		$line_item->set_total( $running_total_of_children_under_consideration );
-		if ( $line_item->quantity() ) {
-			$line_item->set_unit_price( $running_total_of_children_under_consideration / $line_item->quantity() );
+		$line_item->set_total($running_total_of_children_under_consideration);
+		if ($line_item->quantity()) {
+			$line_item->set_unit_price($running_total_of_children_under_consideration / $line_item->quantity());
 		} else {
-			$line_item->set_unit_price( 0 );
+			$line_item->set_unit_price(0);
 		}
-		if ( $line_item->OBJ_type() == 'Event' ) {
-			$line_item->set_quantity( $total_child_ticket_quantity );
+		if ($line_item->OBJ_type() == 'Event') {
+			$line_item->set_quantity($total_child_ticket_quantity);
 		}
 		return $line_item;
 	}
@@ -174,18 +174,18 @@ 
 	 * @param EEI_Line_Item $line_item
 	 * @return EEI_Line_Item
 	 */
-	protected function _adjust_line_item_quantity( EEI_Line_Item $line_item ) {
+	protected function _adjust_line_item_quantity(EEI_Line_Item $line_item) {
 		// is this a ticket ?
-		if ( $line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket' ) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item && $line_item->OBJ_type() == 'Ticket') {
 			$this->_current_registration = null;
 			$quantity = 0;
 			// if this ticket is billable at this moment, then we should have a positive quantity
 			if (
-				isset( $this->_line_item_registrations[ $line_item->code() ] )
-				&& is_array( $this->_line_item_registrations[ $line_item->code() ] )
+				isset($this->_line_item_registrations[$line_item->code()])
+				&& is_array($this->_line_item_registrations[$line_item->code()])
 			) {
 				// set quantity based on number of open registrations for this ticket
-				foreach ( $this->_line_item_registrations[ $line_item->code() ] as $registration ) {
+				foreach ($this->_line_item_registrations[$line_item->code()] as $registration) {
 					if (
 						$registration instanceof EE_Registration
 					) {
@@ -194,8 +194,8 @@ 
 					}
 				}
 			}
-			$line_item->set_quantity( $quantity );
-			$line_item->set_total( $line_item->unit_price() * $line_item->quantity() );
+			$line_item->set_quantity($quantity);
+			$line_item->set_total($line_item->unit_price() * $line_item->quantity());
 		}
 		return $line_item;
 	}

core/db_classes/EE_Line_Item.class.php

Spacing +215 added lines, -215 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');
 }
 /**
  * Event Espresso
@@ -50,9 +50,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Line_Item
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -63,8 +63,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Line_Item
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -75,10 +75,10 @@ 
 	 * @param bool   $bydb
 	 * @param string $timezone
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '' ) {
-		parent::__construct( $fieldValues, $bydb, $timezone );
-		if ( ! $this->get( 'LIN_code' ) ) {
-			$this->set_code( $this->generate_code() );
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '') {
+		parent::__construct($fieldValues, $bydb, $timezone);
+		if ( ! $this->get('LIN_code')) {
+			$this->set_code($this->generate_code());
 		}
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @return int
 	 */
 	public function ID() {
-		return $this->get( 'LIN_ID' );
+		return $this->get('LIN_ID');
 	}
 
 
@@ -99,7 +99,7 @@ 
 	 * @return int
 	 */
 	public function TXN_ID() {
-		return $this->get( 'TXN_ID' );
+		return $this->get('TXN_ID');
 	}
 
 
@@ -108,8 +108,8 @@ 
 	 * Sets TXN_ID
 	 * @param int $TXN_ID
 	 */
-	public function set_TXN_ID( $TXN_ID ) {
-		$this->set( 'TXN_ID', $TXN_ID );
+	public function set_TXN_ID($TXN_ID) {
+		$this->set('TXN_ID', $TXN_ID);
 	}
 
 
@@ -119,9 +119,9 @@ 
 	 * @return string
 	 */
 	public function name() {
-		$name =  $this->get( 'LIN_name' );
-		if( ! $name ){
-			$name = ucwords( str_replace( '-', ' ', $this->type() ) );
+		$name = $this->get('LIN_name');
+		if ( ! $name) {
+			$name = ucwords(str_replace('-', ' ', $this->type()));
 		}
 		return $name;
 	}
@@ -132,8 +132,8 @@ 
 	 * Sets name
 	 * @param string $name
 	 */
-	public function set_name( $name ) {
-		$this->set( 'LIN_name', $name );
+	public function set_name($name) {
+		$this->set('LIN_name', $name);
 	}
 
 
@@ -143,7 +143,7 @@ 
 	 * @return string
 	 */
 	public function desc() {
-		return $this->get( 'LIN_desc' );
+		return $this->get('LIN_desc');
 	}
 
 
@@ -152,8 +152,8 @@ 
 	 * Sets desc
 	 * @param string $desc
 	 */
-	public function set_desc( $desc ) {
-		$this->set( 'LIN_desc', $desc );
+	public function set_desc($desc) {
+		$this->set('LIN_desc', $desc);
 	}
 
 
@@ -163,7 +163,7 @@ 
 	 * @return int
 	 */
 	public function quantity() {
-		return $this->get( 'LIN_quantity' );
+		return $this->get('LIN_quantity');
 	}
 
 
@@ -172,8 +172,8 @@ 
 	 * Sets quantity
 	 * @param int $quantity
 	 */
-	function set_quantity( $quantity ) {
-		$this->set( 'LIN_quantity', max( $quantity, 0 ) );
+	function set_quantity($quantity) {
+		$this->set('LIN_quantity', max($quantity, 0));
 	}
 
 
@@ -183,7 +183,7 @@ 
 	 * @return string
 	 */
 	public function OBJ_ID() {
-		return $this->get( 'OBJ_ID' );
+		return $this->get('OBJ_ID');
 	}
 
 
@@ -192,8 +192,8 @@ 
 	 * Sets item_id
 	 * @param string $item_id
 	 */
-	public function set_OBJ_ID( $item_id ) {
-		$this->set( 'OBJ_ID', $item_id );
+	public function set_OBJ_ID($item_id) {
+		$this->set('OBJ_ID', $item_id);
 	}
 
 
@@ -203,7 +203,7 @@ 
 	 * @return string
 	 */
 	public function OBJ_type() {
-		return $this->get( 'OBJ_type' );
+		return $this->get('OBJ_type');
 	}
 
 
@@ -240,8 +240,8 @@ 
 	 * Sets item_type
 	 * @param string $OBJ_type
 	 */
-	public function set_OBJ_type( $OBJ_type ) {
-		$this->set( 'OBJ_type', $OBJ_type );
+	public function set_OBJ_type($OBJ_type) {
+		$this->set('OBJ_type', $OBJ_type);
 	}
 
 
@@ -251,7 +251,7 @@ 
 	 * @return float
 	 */
 	public function unit_price() {
-		return $this->get( 'LIN_unit_price' );
+		return $this->get('LIN_unit_price');
 	}
 
 
@@ -261,8 +261,8 @@ 
 	 *
 	 * @param float $unit_price
 	 */
-	public function set_unit_price( $unit_price ) {
-		$this->set( 'LIN_unit_price', $unit_price );
+	public function set_unit_price($unit_price) {
+		$this->set('LIN_unit_price', $unit_price);
 	}
 
 
@@ -273,19 +273,19 @@ 
 	 * @return boolean
 	 */
 	public function is_percent() {
-		if( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			//tax subtotals HAVE a percent on them, that percentage only applies
 			//to taxable items, so its' an exception. Treat it like a flat line item
 			return false;
 		}
-		$unit_price = abs( $this->get( 'LIN_unit_price' ) );
-		$percent = abs( $this->get( 'LIN_percent' ) );
-		if ( $unit_price < .001 && $percent ) {
+		$unit_price = abs($this->get('LIN_unit_price'));
+		$percent = abs($this->get('LIN_percent'));
+		if ($unit_price < .001 && $percent) {
 			return TRUE;
-		} elseif ( $unit_price >= .001 && !$percent ) {
+		} elseif ($unit_price >= .001 && ! $percent) {
 			return FALSE;
-		} elseif ( $unit_price >= .001 && $percent ) {
-			throw new EE_Error( sprintf( __( "A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso" ), $unit_price, $percent ) );
+		} elseif ($unit_price >= .001 && $percent) {
+			throw new EE_Error(sprintf(__("A Line Item can not have a unit price of (%s) AND a percent (%s)!", "event_espresso"), $unit_price, $percent));
 		} else {
 			// if they're both 0, assume its not a percent item
 			return FALSE;
@@ -299,7 +299,7 @@ 
 	 * @return float
 	 */
 	public function percent() {
-		return $this->get( 'LIN_percent' );
+		return $this->get('LIN_percent');
 	}
 
 
@@ -308,8 +308,8 @@ 
 	 * Sets percent (between 100-0.01)
 	 * @param float $percent
 	 */
-	public function set_percent( $percent ) {
-		$this->set( 'LIN_percent', $percent );
+	public function set_percent($percent) {
+		$this->set('LIN_percent', $percent);
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return float
 	 */
 	public function total() {
-		return $this->get( 'LIN_total' );
+		return $this->get('LIN_total');
 	}
 
 
@@ -328,8 +328,8 @@ 
 	 * Sets total
 	 * @param float $total
 	 */
-	public function set_total( $total ) {
-		$this->set( 'LIN_total', $total );
+	public function set_total($total) {
+		$this->set('LIN_total', $total);
 	}
 
 
@@ -339,7 +339,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'LIN_order' );
+		return $this->get('LIN_order');
 	}
 
 
@@ -348,8 +348,8 @@ 
 	 * Sets order
 	 * @param int $order
 	 */
-	public function set_order( $order ) {
-		$this->set( 'LIN_order', $order );
+	public function set_order($order) {
+		$this->set('LIN_order', $order);
 	}
 
 
@@ -359,7 +359,7 @@ 
 	 * @return int
 	 */
 	public function parent_ID() {
-		return $this->get( 'LIN_parent' );
+		return $this->get('LIN_parent');
 	}
 
 
@@ -368,8 +368,8 @@ 
 	 * Sets parent
 	 * @param int $parent
 	 */
-	public function set_parent_ID( $parent ) {
-		$this->set( 'LIN_parent', $parent );
+	public function set_parent_ID($parent) {
+		$this->set('LIN_parent', $parent);
 	}
 
 
@@ -379,7 +379,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'LIN_type' );
+		return $this->get('LIN_type');
 	}
 
 
@@ -388,8 +388,8 @@ 
 	 * Sets type
 	 * @param string $type
 	 */
-	public function set_type( $type ) {
-		$this->set( 'LIN_type', $type );
+	public function set_type($type) {
+		$this->set('LIN_type', $type);
 	}
 
 
@@ -402,8 +402,8 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function parent() {
-		if( $this->ID() ) {
-			return $this->get_model()->get_one_by_ID( $this->parent_ID() );
+		if ($this->ID()) {
+			return $this->get_model()->get_one_by_ID($this->parent_ID());
 		} else {
 			return $this->_parent;
 		}
@@ -416,13 +416,13 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function children() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->get_model()->get_all(
 					array(
-						array( 'LIN_parent' => $this->ID() ),
-						'order_by' => array( 'LIN_order' => 'ASC' ) ) );
+						array('LIN_parent' => $this->ID()),
+						'order_by' => array('LIN_order' => 'ASC') ) );
 		} else {
-			if ( ! is_array( $this->_children ) ) {
+			if ( ! is_array($this->_children)) {
 				$this->_children = array();
 			}
 			return $this->_children;
@@ -436,7 +436,7 @@ 
 	 * @return string
 	 */
 	public function code() {
-		return $this->get( 'LIN_code' );
+		return $this->get('LIN_code');
 	}
 
 
@@ -445,8 +445,8 @@ 
 	 * Sets code
 	 * @param string $code
 	 */
-	public function set_code( $code ) {
-		$this->set( 'LIN_code', $code );
+	public function set_code($code) {
+		$this->set('LIN_code', $code);
 	}
 
 
@@ -456,7 +456,7 @@ 
 	 * @return boolean
 	 */
 	public function is_taxable() {
-		return $this->get( 'LIN_is_taxable' );
+		return $this->get('LIN_is_taxable');
 	}
 
 
@@ -465,8 +465,8 @@ 
 	 * Sets is_taxable
 	 * @param boolean $is_taxable
 	 */
-	public function set_is_taxable( $is_taxable ) {
-		$this->set( 'LIN_is_taxable', $is_taxable );
+	public function set_is_taxable($is_taxable) {
+		$this->set('LIN_is_taxable', $is_taxable);
 	}
 
 
@@ -481,7 +481,7 @@ 
 	 */
 	public function get_object() {
 		$model_name_of_related_obj = $this->OBJ_type();
-		return $this->get_model()->has_relation(  $model_name_of_related_obj ) ? $this->get_first_related( $model_name_of_related_obj ) : NULL;
+		return $this->get_model()->has_relation($model_name_of_related_obj) ? $this->get_first_related($model_name_of_related_obj) : NULL;
 	}
 
 
@@ -492,11 +492,11 @@ 
 	 * @param array $query_params
 	 * @return EE_Ticket
 	 */
-	public function ticket( $query_params = array() ) {
+	public function ticket($query_params = array()) {
 		//we're going to assume that when this method is called we always want to receive the attached ticket EVEN if that ticket is archived.  This can be overridden via the incoming $query_params argument
-		$remove_defaults = array( 'default_where_conditions' => 'none' );
-		$query_params = array_merge( $remove_defaults, $query_params );
-		return $this->get_first_related( 'Ticket', $query_params );
+		$remove_defaults = array('default_where_conditions' => 'none');
+		$query_params = array_merge($remove_defaults, $query_params);
+		return $this->get_first_related('Ticket', $query_params);
 	}
 
 
@@ -506,11 +506,11 @@ 
 	 * @return EE_Datetime | NULL
 	 */
 	public function get_ticket_datetime() {
-		if ( $this->OBJ_type() === 'Ticket' ) {
+		if ($this->OBJ_type() === 'Ticket') {
 			$ticket = $this->ticket();
-			if ( $ticket instanceof EE_Ticket ) {
+			if ($ticket instanceof EE_Ticket) {
 				$datetime = $ticket->first_datetime();
-				if ( $datetime instanceof EE_Datetime ) {
+				if ($datetime instanceof EE_Datetime) {
 					return $datetime;
 				}
 			}
@@ -526,9 +526,9 @@ 
 	 * @return string
 	 */
 	public function ticket_event_name() {
-		$event_name = __( "Unknown", "event_espresso" );
+		$event_name = __("Unknown", "event_espresso");
 		$event = $this->ticket_event();
-		if ( $event instanceof EE_Event ) {
+		if ($event instanceof EE_Event) {
 			$event_name = $event->name();
 		}
 		return $event_name;
@@ -542,9 +542,9 @@ 
 	public function ticket_event() {
 		$event = null;
 		$ticket = $this->ticket();
-		if ( $ticket instanceof EE_Ticket ) {
+		if ($ticket instanceof EE_Ticket) {
 			$datetime = $ticket->first_datetime();
-			if ( $datetime instanceof EE_Datetime ) {
+			if ($datetime instanceof EE_Datetime) {
 				$event = $datetime->event();
 			}
 		}
@@ -559,11 +559,11 @@ 
 	 * @param string $time_format
 	 * @return string
 	 */
-	public function ticket_datetime_start( $date_format = '', $time_format = '' ) {
-		$first_datetime_string = __( "Unknown", "event_espresso" );
+	public function ticket_datetime_start($date_format = '', $time_format = '') {
+		$first_datetime_string = __("Unknown", "event_espresso");
 		$datetime = $this->get_ticket_datetime();
-		if ( $datetime ) {
-			$first_datetime_string = $datetime->start_date_and_time( $date_format, $time_format );
+		if ($datetime) {
+			$first_datetime_string = $datetime->start_date_and_time($date_format, $time_format);
 		}
 		return $first_datetime_string;
 	}
@@ -578,26 +578,26 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	public function add_child_line_item( EEI_Line_Item $line_item, $set_order = true ) {
+	public function add_child_line_item(EEI_Line_Item $line_item, $set_order = true) {
 		// should we calculate the LIN_order for this line item ?
-		if ( $set_order || $line_item->order() === null ) {
-			$line_item->set_order( count( $this->children() ) );
+		if ($set_order || $line_item->order() === null) {
+			$line_item->set_order(count($this->children()));
 		}
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			//check for any duplicate line items (with the same code), if so, this replaces it
-			$line_item_with_same_code = $this->get_child_line_item(  $line_item->code() );
-			if( $line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item ) {
-				$this->delete_child_line_item( $line_item_with_same_code->code() );
+			$line_item_with_same_code = $this->get_child_line_item($line_item->code());
+			if ($line_item_with_same_code instanceof EE_Line_Item && $line_item_with_same_code !== $line_item) {
+				$this->delete_child_line_item($line_item_with_same_code->code());
 			}
-			$line_item->set_parent_ID( $this->ID() );
-			if( $this->TXN_ID() ){
-				$line_item->set_TXN_ID( $this->TXN_ID() );
+			$line_item->set_parent_ID($this->ID());
+			if ($this->TXN_ID()) {
+				$line_item->set_TXN_ID($this->TXN_ID());
 			}
 			return $line_item->save();
 		} else {
-			$this->_children[ $line_item->code() ] = $line_item;
-			if( $line_item->parent() != $this ) {
-				$line_item->set_parent( $this );
+			$this->_children[$line_item->code()] = $line_item;
+			if ($line_item->parent() != $this) {
+				$line_item->set_parent($this);
 			}
 			return TRUE;
 		}
@@ -611,16 +611,16 @@ 
 	 * @param EE_Line_Item $line_item
 	 *
 	 */
-	public function set_parent( $line_item ) {
-		if ( $this->ID() ) {
-			if( ! $line_item->ID() ) {
+	public function set_parent($line_item) {
+		if ($this->ID()) {
+			if ( ! $line_item->ID()) {
 				$line_item->save();
 			}
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 			$this->save();
 		} else {
 			$this->_parent = $line_item;
-			$this->set_parent_ID( $line_item->ID() );
+			$this->set_parent_ID($line_item->ID());
 		}
 	}
 
@@ -633,11 +633,11 @@ 
 	 * @param string $code
 	 * @return EE_Line_Item
 	 */
-	public function get_child_line_item( $code ) {
-		if ( $this->ID() ) {
-			return $this->get_model()->get_one( array( array( 'LIN_parent' => $this->ID(), 'LIN_code' => $code ) ) );
+	public function get_child_line_item($code) {
+		if ($this->ID()) {
+			return $this->get_model()->get_one(array(array('LIN_parent' => $this->ID(), 'LIN_code' => $code)));
 		} else {
-			return isset( $this->_children[ $code ] ) ? $this->_children[ $code ] : null;
+			return isset($this->_children[$code]) ? $this->_children[$code] : null;
 		}
 	}
 
@@ -648,10 +648,10 @@ 
 	 * @return int
 	 */
 	public function delete_children_line_items() {
-		if ( $this->ID() ) {
-			return $this->get_model()->delete( array( array( 'LIN_parent' => $this->ID() ) ) );
+		if ($this->ID()) {
+			return $this->get_model()->delete(array(array('LIN_parent' => $this->ID())));
 		} else {
-			$count = count( $this->_children );
+			$count = count($this->_children);
 			$this->_children = array();
 			return $count;
 		}
@@ -668,25 +668,25 @@ 
 	 * @param bool $stop_search_once_found
 	 * @return int count of items deleted (or simply removed from the line item's cache, if not has not been saved to the DB yet)
 	 */
-	public function delete_child_line_item( $code, $stop_search_once_found = true ) {
-		if ( $this->ID() ) {
+	public function delete_child_line_item($code, $stop_search_once_found = true) {
+		if ($this->ID()) {
 			$items_deleted = 0;
-			if( $this->code() == $code ) {
-				$items_deleted += EEH_Line_Item::delete_all_child_items( $this );
+			if ($this->code() == $code) {
+				$items_deleted += EEH_Line_Item::delete_all_child_items($this);
 				$items_deleted += (int) $this->delete();
-				if( $stop_search_once_found ){
+				if ($stop_search_once_found) {
 					return $items_deleted;
 				}
 			}
-			foreach( $this->children() as $child_line_item ) {
-				$items_deleted += $child_line_item->delete_child_line_item( $code, $stop_search_once_found );
+			foreach ($this->children() as $child_line_item) {
+				$items_deleted += $child_line_item->delete_child_line_item($code, $stop_search_once_found);
 			}
 			return $items_deleted;
 		} else {
-			if( isset( $this->_children[ $code ] ) ) {
-				unset( $this->_children[ $code ] );
+			if (isset($this->_children[$code])) {
+				unset($this->_children[$code]);
 				return 1;
-			}else{
+			} else {
 				return 0;
 			}
 		}
@@ -699,9 +699,9 @@ 
 	 * @return boolean
 	 */
 	public function delete_if_childless_subtotal() {
-		if( $this->ID() &&
+		if ($this->ID() &&
 				$this->type() == EEM_Line_Item::type_sub_total &&
-				! $this->children() ) {
+				! $this->children()) {
 			return $this->delete();
 		} else {
 			return false;
@@ -716,7 +716,7 @@ 
 	 */
 	public function generate_code() {
 		// each line item in the cart requires a unique identifier
-		return md5( $this->get( 'OBJ_type' ) . $this->get( 'OBJ_ID' ) . microtime() );
+		return md5($this->get('OBJ_type').$this->get('OBJ_ID').microtime());
 	}
 
 
@@ -799,7 +799,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	public function unit_price_no_code() {
-		return $this->get_pretty( 'LIN_unit_price', 'no_currency_code' );
+		return $this->get_pretty('LIN_unit_price', 'no_currency_code');
 	}
 
 
@@ -809,7 +809,7 @@ 
 	 * @return string like '2, 004.00', formatted according to the localized currency
 	 */
 	public function total_no_code() {
-		return $this->get_pretty( 'LIN_total', 'no_currency_code' );
+		return $this->get_pretty('LIN_total', 'no_currency_code');
 	}
 
 
@@ -829,17 +829,17 @@ 
 		$tax_total = $this->recalculate_taxes_and_tax_total();
 		$total = $pre_tax_total + $tax_total;
 		// no negative totals plz
-		$total = max( $total, 0 );
-		$this->set_total( $total );
+		$total = max($total, 0);
+		$this->set_total($total);
 		//only update the related transaction's total
 		//if we intend to save this line item and its a grand total
-		if(
+		if (
 			$this->allow_persist() &&
 			$this->type() === EEM_Line_Item::type_total &&
 			$this->transaction() instanceof EE_Transaction
-		){
-			$this->transaction()->set_total( $total );
-			if ( $this->transaction()->ID() ) {
+		) {
+			$this->transaction()->set_total($total);
+			if ($this->transaction()->ID()) {
 				$this->transaction()->save();
 			}
 		}
@@ -858,47 +858,47 @@ 
 	public function recalculate_pre_tax_total() {
 		$total = 0;
 		$my_children = $this->children();
-		$has_children = ! empty( $my_children );
-		if ( $has_children && $this->is_line_item() ) {
-			$total = $this->_recalculate_pretax_total_for_line_item( $total, $my_children );
-		} elseif ( ! $has_children && ( $this->is_sub_line_item() || $this->is_line_item() ) ) {
+		$has_children = ! empty($my_children);
+		if ($has_children && $this->is_line_item()) {
+			$total = $this->_recalculate_pretax_total_for_line_item($total, $my_children);
+		} elseif ( ! $has_children && ($this->is_sub_line_item() || $this->is_line_item())) {
 			$total = $this->unit_price() * $this->quantity();
-		} elseif( $this->is_sub_total() || $this->is_total() ) {
-			$total = $this->_recalculate_pretax_total_for_subtotal( $total, $my_children );
-		} elseif ( $this->is_tax_sub_total() || $this->is_tax() || $this->is_cancelled() ) {
+		} elseif ($this->is_sub_total() || $this->is_total()) {
+			$total = $this->_recalculate_pretax_total_for_subtotal($total, $my_children);
+		} elseif ($this->is_tax_sub_total() || $this->is_tax() || $this->is_cancelled()) {
 			// completely ignore tax totals, tax sub-totals, and cancelled line items, when calculating the pre-tax-total
 			return 0;
 		}
 		// ensure all non-line items and non-sub-line-items have a quantity of 1 (except for Events)
-		if(
+		if (
 			! $this->is_line_item() &&
 			! $this->is_sub_line_item() &&
 			! $this->is_cancellation()
 		) {
-			if ( $this->OBJ_type() !== 'Event' ) {
-				$this->set_quantity( 1 );
+			if ($this->OBJ_type() !== 'Event') {
+				$this->set_quantity(1);
 			}
-			if( ! $this->is_percent() ) {
-				$this->set_unit_price( $this->total() );
+			if ( ! $this->is_percent()) {
+				$this->set_unit_price($this->total());
 			}
 		}
 
 		//we don't want to bother saving grand totals, because that needs to factor in taxes anyways
 		//so it ought to be
-		if( ! $this->is_total() ) {
-			$this->set_total( $total );
+		if ( ! $this->is_total()) {
+			$this->set_total($total);
 			//if not a percent line item, make sure we keep the unit price in sync
-			if(
+			if (
 				$has_children
 				&& $this->is_line_item()
 				&& ! $this->is_percent()
 			) {
-				if( $this->quantity() === 0 ){
+				if ($this->quantity() === 0) {
 					$new_unit_price = 0;
 				} else {
 					$new_unit_price = $this->total() / $this->quantity();
 				}
-				$this->set_unit_price( $new_unit_price );
+				$this->set_unit_price($new_unit_price);
 			}
 			$this->maybe_save();
 		}
@@ -918,39 +918,39 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	protected function _recalculate_pretax_total_for_subtotal( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_subtotal($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item && ! $child_line_item->is_cancellation() ) {
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item && ! $child_line_item->is_cancellation()) {
 				// percentage line items are based on total so far
-				if ( $child_line_item->is_percent() ) {
+				if ($child_line_item->is_percent()) {
 					//round as we go so that the line items add up ok
 					$percent_total = round(
 						$calculated_total_so_far * $child_line_item->percent() / 100,
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
 				}
 			}
 		}
 
-		if( $this->is_sub_total() ){
+		if ($this->is_sub_total()) {
 			// no negative totals plz
-			$calculated_total_so_far = max( $calculated_total_so_far, 0 );
+			$calculated_total_so_far = max($calculated_total_so_far, 0);
 		}
 		return $calculated_total_so_far;
 	}
@@ -968,8 +968,8 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	protected function _recalculate_pretax_total_for_line_item( $calculated_total_so_far, $my_children = null ) {
-		if( $my_children === null ) {
+	protected function _recalculate_pretax_total_for_line_item($calculated_total_so_far, $my_children = null) {
+		if ($my_children === null) {
 			$my_children = $this->children();
 		}
 		//we need to keep track of the running total for a single item,
@@ -977,10 +977,10 @@ 
 		$unit_price_for_total = 0;
 		$quantity_for_total = 1;
 		//get the total of all its children
-		foreach ( $my_children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item &&
+		foreach ($my_children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item &&
 					! $child_line_item->is_cancellation()) {
-				if ( $child_line_item->is_percent() ) {
+				if ($child_line_item->is_percent()) {
 					//it should be the unit-price-so-far multiplied by teh percent multiplied by the quantity
 					//not total multiplied by percent, because that ignores rounding along-the-way
 					$percent_unit_price = round(
@@ -988,17 +988,17 @@ 
 						EE_Registry::instance()->CFG->currency->dec_plc
 					);
 					$percent_total = $percent_unit_price * $quantity_for_total;
-					$child_line_item->set_total( $percent_total );
+					$child_line_item->set_total($percent_total);
 					//so far all percent line items should have a quantity of 1
 					//(ie, no double percent discounts. Although that might be requested someday)
-					$child_line_item->set_quantity( 1 );
+					$child_line_item->set_quantity(1);
 					$child_line_item->maybe_save();
 					$calculated_total_so_far += $percent_total;
 					$unit_price_for_total += $percent_unit_price;
 				} else {
 					//verify flat sub-line-item quantities match their parent
-					if( $child_line_item->is_sub_line_item() ) {
-						$child_line_item->set_quantity( $this->quantity() );
+					if ($child_line_item->is_sub_line_item()) {
+						$child_line_item->set_quantity($this->quantity());
 					}
 					$quantity_for_total = $child_line_item->quantity();
 					$calculated_total_so_far += $child_line_item->recalculate_pre_tax_total();
@@ -1022,10 +1022,10 @@ 
 		//calculate the pretax total
 		$taxable_total = $this->taxable_total();
 		$tax_total = 0;
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			$total_on_this_tax = $taxable_total * $tax->percent() / 100;
 			//remember the total on this line item
-			$tax->set_total( $total_on_this_tax );
+			$tax->set_total($total_on_this_tax);
 			$tax_total += $tax->total();
 		}
 		$this->_recalculate_tax_sub_total();
@@ -1039,21 +1039,21 @@ 
 	 * @return void
 	 */
 	private function _recalculate_tax_sub_total() {
-		if ( $this->is_tax_sub_total() ) {
+		if ($this->is_tax_sub_total()) {
 			$total = 0;
 			$total_percent = 0;
 			//simply loop through all its children (which should be taxes) and sum their total
-			foreach ( $this->children() as $child_tax ) {
-				if ( $child_tax instanceof EE_Line_Item ) {
+			foreach ($this->children() as $child_tax) {
+				if ($child_tax instanceof EE_Line_Item) {
 					$total += $child_tax->total();
 					$total_percent += $child_tax->percent();
 				}
 			}
-			$this->set_total( $total );
-			$this->set_percent( $total_percent );
-		} elseif ( $this->is_total() ) {
-			foreach ( $this->children() as $maybe_tax_subtotal ) {
-				if ( $maybe_tax_subtotal instanceof EE_Line_Item ) {
+			$this->set_total($total);
+			$this->set_percent($total_percent);
+		} elseif ($this->is_total()) {
+			foreach ($this->children() as $maybe_tax_subtotal) {
+				if ($maybe_tax_subtotal instanceof EE_Line_Item) {
 					$maybe_tax_subtotal->_recalculate_tax_sub_total();
 				}
 			}
@@ -1069,8 +1069,8 @@ 
 	public function get_total_tax() {
 		$this->_recalculate_tax_sub_total();
 		$total = 0;
-		foreach ( $this->tax_descendants() as $tax_line_item ) {
-			if ( $tax_line_item instanceof EE_Line_Item ) {
+		foreach ($this->tax_descendants() as $tax_line_item) {
+			if ($tax_line_item instanceof EE_Line_Item) {
 				$total += $tax_line_item->total();
 			}
 		}
@@ -1084,15 +1084,15 @@ 
 	 */
 	public function get_items_total() {
 		//by default, let's make sure we're consistent with the existing line item
-		if( $this->is_total() ) {
-			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal( $this );
-			if( $pretax_subtotal_li instanceof EE_Line_Item ) {
+		if ($this->is_total()) {
+			$pretax_subtotal_li = EEH_Line_Item::get_pre_tax_subtotal($this);
+			if ($pretax_subtotal_li instanceof EE_Line_Item) {
 				return $pretax_subtotal_li->total();
 			}
 		}
 		$total = 0;
-		foreach ( $this->get_items() as $item ) {
-			if ( $item instanceof EE_Line_Item ) {
+		foreach ($this->get_items() as $item) {
+			if ($item instanceof EE_Line_Item) {
 				$total += $item->total();
 			}
 		}
@@ -1107,7 +1107,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function tax_descendants() {
-		return EEH_Line_Item::get_tax_descendants( $this );
+		return EEH_Line_Item::get_tax_descendants($this);
 	}
 
 
@@ -1117,7 +1117,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function get_items() {
-		return EEH_Line_Item::get_line_item_descendants( $this );
+		return EEH_Line_Item::get_line_item_descendants($this);
 	}
 
 
@@ -1133,22 +1133,22 @@ 
 	 */
 	public function taxable_total() {
 		$total = 0;
-		if ( $this->children() ) {
-			foreach ( $this->children() as $child_line_item ) {
-				if ( $child_line_item->type() === EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
+		if ($this->children()) {
+			foreach ($this->children() as $child_line_item) {
+				if ($child_line_item->type() === EEM_Line_Item::type_line_item && $child_line_item->is_taxable()) {
 					//if it's a percent item, only take into account the percent
 					//that's taxable too (the taxable total so far)
-					if( $child_line_item->is_percent() ) {
-						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					if ($child_line_item->is_percent()) {
+						$total = $total + ($total * $child_line_item->percent() / 100);
+					} else {
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() === EEM_Line_Item::type_sub_total ){
+				}elseif ($child_line_item->type() === EEM_Line_Item::type_sub_total) {
 					$total += $child_line_item->taxable_total();
 				}
 			}
 		}
-		return max( $total, 0 );
+		return max($total, 0);
 	}
 
 
@@ -1158,7 +1158,7 @@ 
 	 * @return EE_Transaction
 	 */
 	public function transaction() {
-		return $this->get_first_related( 'Transaction' );
+		return $this->get_first_related('Transaction');
 	}
 
 
@@ -1171,18 +1171,18 @@ 
 	 * @param int $txn_id if none is provided, assumes $this->TXN_ID()
 	 * @return int count of items saved
 	 */
-	public function save_this_and_descendants_to_txn( $txn_id = NULL ) {
+	public function save_this_and_descendants_to_txn($txn_id = NULL) {
 		$count = 0;
-		if ( ! $txn_id ) {
+		if ( ! $txn_id) {
 			$txn_id = $this->TXN_ID();
 		}
-		$this->set_TXN_ID( $txn_id );
+		$this->set_TXN_ID($txn_id);
 		$children = $this->children();
 		$count += $this->save() ? 1 : 0;
-		foreach ( $children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$child_line_item->set_parent_ID( $this->ID() );
-				$count += $child_line_item->save_this_and_descendants_to_txn( $txn_id );
+		foreach ($children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$child_line_item->set_parent_ID($this->ID());
+				$count += $child_line_item->save_this_and_descendants_to_txn($txn_id);
 			}
 		}
 		return $count;
@@ -1199,9 +1199,9 @@ 
 		$count = 0;
 		$children = $this->children();
 		$count += $this->save() ? 1 : 0;
-		foreach ( $children as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$child_line_item->set_parent_ID( $this->ID() );
+		foreach ($children as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$child_line_item->set_parent_ID($this->ID());
 				$count += $child_line_item->save_this_and_descendants();
 			}
 		}
@@ -1215,8 +1215,8 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	function get_cancellations() {
-		EE_Registry::instance()->load_helper( 'Line_Item' );
-		return EEH_Line_Item::get_descendants_of_type( $this, EEM_Line_Item::type_cancellation );
+		EE_Registry::instance()->load_helper('Line_Item');
+		return EEH_Line_Item::get_descendants_of_type($this, EEM_Line_Item::type_cancellation);
 	}
 
 
@@ -1226,9 +1226,9 @@ 
 	 * @param string $type one of the constants on EEM_Line_Item
 	 * @return EE_Line_Item[]
 	 */
-	protected function _get_descendants_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0' );
-		return EEH_Line_Item::get_descendants_of_type( $this, $type );
+	protected function _get_descendants_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()', __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0');
+		return EEH_Line_Item::get_descendants_of_type($this, $type);
 	}
 
 
@@ -1238,9 +1238,9 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public function get_nearest_descendant_of_type( $type ) {
-		EE_Error::doing_it_wrong( 'EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0' );
-		return EEH_Line_Item::get_nearest_descendant_of_type( $this, $type );
+	public function get_nearest_descendant_of_type($type) {
+		EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()', __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0');
+		return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
 	}
 
 
@@ -1251,7 +1251,7 @@ 
 	 * @return int count of items saved
 	 */
 	public function maybe_save() {
-		if ( $this->ID() ) {
+		if ($this->ID()) {
 			return $this->save();
 		}
 		return false;

core/helpers/EEH_Line_Item.helper.php

Spacing +346 added lines, -346 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
 /**
  *
  * EEH_Line_Item
@@ -45,8 +45,8 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public static function add_unrelated_item( EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL  ){
-		$items_subtotal = self::get_pre_tax_subtotal( $parent_line_item );
+	public static function add_unrelated_item(EE_Line_Item $parent_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = NULL) {
+		$items_subtotal = self::get_pre_tax_subtotal($parent_line_item);
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -54,7 +54,7 @@ 
 			'LIN_quantity' => $quantity,
 			'LIN_percent' => null,
 			'LIN_is_taxable' => $taxable,
-			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count( $items_subtotal->children() ) : 0,
+			'LIN_order' => $items_subtotal instanceof EE_Line_Item ? count($items_subtotal->children()) : 0,
 			'LIN_total' => (float) $unit_price * (int) $quantity,
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_code' => $code,
@@ -64,7 +64,7 @@ 
 			$line_item,
 			$parent_line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -86,7 +86,7 @@ 
 	 * @return boolean success
 	 * @throws \EE_Error
 	 */
-	public static function add_percentage_based_item( EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE ){
+	public static function add_percentage_based_item(EE_Line_Item $parent_line_item, $name, $percentage_amount, $description = '', $taxable = FALSE) {
 		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name' => $name,
 			'LIN_desc' => $description,
@@ -94,7 +94,7 @@ 
 			'LIN_percent' => $percentage_amount,
 			'LIN_quantity' => NULL,
 			'LIN_is_taxable' => $taxable,
-			'LIN_total' => (float) ( $percentage_amount * ( $parent_line_item->total() / 100 ) ),
+			'LIN_total' => (float) ($percentage_amount * ($parent_line_item->total() / 100)),
 			'LIN_type'=>  EEM_Line_Item::type_line_item,
 			'LIN_parent' => $parent_line_item->ID()
 		));
@@ -102,7 +102,7 @@ 
 			'FHEE__EEH_Line_Item__add_percentage_based_item__line_item',
 			$line_item
 		);
-		return self::add_item( $parent_line_item, $line_item );
+		return self::add_item($parent_line_item, $line_item);
 	}
 
 
@@ -123,15 +123,15 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function add_ticket_purchase( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ){
-		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total() ) {
-			throw new EE_Error( sprintf( __( 'A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso' ), $ticket->ID(), $total_line_item->ID() ) );
+	public static function add_ticket_purchase(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
+		if ( ! $total_line_item instanceof EE_Line_Item || ! $total_line_item->is_total()) {
+			throw new EE_Error(sprintf(__('A valid line item total is required in order to add tickets. A line item of type "%s" was passed.', 'event_espresso'), $ticket->ID(), $total_line_item->ID()));
 		}
 		// either increment the qty for an existing ticket
-		$line_item = self::increment_ticket_qty_if_already_in_cart( $total_line_item, $ticket, $qty );
+		$line_item = self::increment_ticket_qty_if_already_in_cart($total_line_item, $ticket, $qty);
 		// or add a new one
-		if ( ! $line_item instanceof EE_Line_Item ) {
-			$line_item = self::create_ticket_line_item( $total_line_item, $ticket, $qty );
+		if ( ! $line_item instanceof EE_Line_Item) {
+			$line_item = self::create_ticket_line_item($total_line_item, $ticket, $qty);
 		}
 		$total_line_item->recalculate_total_including_taxes();
 		return $line_item;
@@ -147,11 +147,11 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function increment_ticket_qty_if_already_in_cart( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function increment_ticket_qty_if_already_in_cart(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$line_item = null;
-		if ( $total_line_item instanceof EE_Line_Item && $total_line_item->is_total() ) {
-			$ticket_line_items = EEH_Line_Item::get_ticket_line_items( $total_line_item );
-			foreach ( (array)$ticket_line_items as $ticket_line_item ) {
+		if ($total_line_item instanceof EE_Line_Item && $total_line_item->is_total()) {
+			$ticket_line_items = EEH_Line_Item::get_ticket_line_items($total_line_item);
+			foreach ((array) $ticket_line_items as $ticket_line_item) {
 				if (
 					$ticket_line_item instanceof EE_Line_Item
 					&& (int) $ticket_line_item->OBJ_ID() === (int) $ticket->ID()
@@ -161,8 +161,8 @@ 
 				}
 			}
 		}
-		if ( $line_item instanceof EE_Line_Item ) {
-			EEH_Line_Item::increment_quantity( $line_item, $qty );
+		if ($line_item instanceof EE_Line_Item) {
+			EEH_Line_Item::increment_quantity($line_item, $qty);
 			return $line_item;
 		}
 		return null;
@@ -179,16 +179,16 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function increment_quantity( EE_Line_Item $line_item, $qty = 1 ) {
-		if( ! $line_item->is_percent() ) {
+	public static function increment_quantity(EE_Line_Item $line_item, $qty = 1) {
+		if ( ! $line_item->is_percent()) {
 			$qty += $line_item->quantity();
-			$line_item->set_quantity( $qty );
-			$line_item->set_total( $line_item->unit_price() * $qty );
+			$line_item->set_quantity($qty);
+			$line_item->set_total($line_item->unit_price() * $qty);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $qty );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $qty);
 			}
 		}
 	}
@@ -204,17 +204,17 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function decrement_quantity( EE_Line_Item $line_item, $qty = 1 ) {
-		if( ! $line_item->is_percent() ) {
+	public static function decrement_quantity(EE_Line_Item $line_item, $qty = 1) {
+		if ( ! $line_item->is_percent()) {
 			$qty = $line_item->quantity() - $qty;
-			$qty = max( $qty, 0 );
-			$line_item->set_quantity( $qty );
-			$line_item->set_total( $line_item->unit_price() * $qty );
+			$qty = max($qty, 0);
+			$line_item->set_quantity($qty);
+			$line_item->set_total($line_item->unit_price() * $qty);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $qty );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $qty);
 			}
 		}
 	}
@@ -229,15 +229,15 @@ 
 	 * @param int          $new_quantity
 	 * @throws \EE_Error
 	 */
-	public static function update_quantity( EE_Line_Item $line_item, $new_quantity ) {
-		if( ! $line_item->is_percent() ) {
-			$line_item->set_quantity( $new_quantity );
-			$line_item->set_total( $line_item->unit_price() * $new_quantity );
+	public static function update_quantity(EE_Line_Item $line_item, $new_quantity) {
+		if ( ! $line_item->is_percent()) {
+			$line_item->set_quantity($new_quantity);
+			$line_item->set_total($line_item->unit_price() * $new_quantity);
 			$line_item->save();
 		}
-		foreach( $line_item->children() as $child ) {
-			if( $child->is_sub_line_item() ) {
-				EEH_Line_Item::update_quantity( $child, $new_quantity );
+		foreach ($line_item->children() as $child) {
+			if ($child->is_sub_line_item()) {
+				EEH_Line_Item::update_quantity($child, $new_quantity);
 			}
 		}
 	}
@@ -252,43 +252,43 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_ticket_line_item( EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1 ) {
+	public static function create_ticket_line_item(EE_Line_Item $total_line_item, EE_Ticket $ticket, $qty = 1) {
 		$datetimes = $ticket->datetimes();
-		$first_datetime = reset( $datetimes );
-		if( $first_datetime instanceof EE_Datetime && $first_datetime->event() instanceof EE_Event ) {
+		$first_datetime = reset($datetimes);
+		if ($first_datetime instanceof EE_Datetime && $first_datetime->event() instanceof EE_Event) {
 			$first_datetime_name = $first_datetime->event()->name();
 		} else {
-			$first_datetime_name = __( 'Event', 'event_espresso' );
+			$first_datetime_name = __('Event', 'event_espresso');
 		}
-		$event = sprintf( _x( '(For %1$s)', '(For Event Name)', 'event_espresso' ), $first_datetime_name );
+		$event = sprintf(_x('(For %1$s)', '(For Event Name)', 'event_espresso'), $first_datetime_name);
 		// get event subtotal line
-		$events_sub_total = self::get_event_line_item_for_ticket( $total_line_item, $ticket );
+		$events_sub_total = self::get_event_line_item_for_ticket($total_line_item, $ticket);
 		// add $ticket to cart
-		$line_item = EE_Line_Item::new_instance( array(
+		$line_item = EE_Line_Item::new_instance(array(
 			'LIN_name'       	=> $ticket->name(),
-			'LIN_desc'       		=> $ticket->description() !== '' ? $ticket->description() . ' ' . $event : $event,
+			'LIN_desc'       		=> $ticket->description() !== '' ? $ticket->description().' '.$event : $event,
 			'LIN_unit_price' 	=> $ticket->price(),
 			'LIN_quantity'   	=> $qty,
 			'LIN_is_taxable' 	=> $ticket->taxable(),
-			'LIN_order'      	=> count( $events_sub_total->children() ),
+			'LIN_order'      	=> count($events_sub_total->children()),
 			'LIN_total'      		=> $ticket->price() * $qty,
 			'LIN_type'       		=> EEM_Line_Item::type_line_item,
 			'OBJ_ID'         		=> $ticket->ID(),
 			'OBJ_type'       	=> 'Ticket'
-		) );
+		));
 		$line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_ticket_line_item__line_item',
 			$line_item
 		);
-		$events_sub_total->add_child_line_item( $line_item );
+		$events_sub_total->add_child_line_item($line_item);
 		//now add the sub-line items
 		$running_total_for_ticket = 0;
-		foreach ( $ticket->prices( array( 'order_by' => array( 'PRC_order' => 'ASC' ) ) ) as $price ) {
+		foreach ($ticket->prices(array('order_by' => array('PRC_order' => 'ASC'))) as $price) {
 			$sign = $price->is_discount() ? -1 : 1;
 			$price_total = $price->is_percent()
 				? $running_total_for_ticket * $price->amount() / 100
 				: $price->amount() * $qty;
-			$sub_line_item = EE_Line_Item::new_instance( array(
+			$sub_line_item = EE_Line_Item::new_instance(array(
 				'LIN_name'       	=> $price->name(),
 				'LIN_desc'       		=> $price->desc(),
 				'LIN_quantity'   	=> $price->is_percent() ? null : $qty,
@@ -298,18 +298,18 @@ 
 				'LIN_type'       		=> EEM_Line_Item::type_sub_line_item,
 				'OBJ_ID'         		=> $price->ID(),
 				'OBJ_type'       	=> 'Price'
-			) );
+			));
 			$sub_line_item = apply_filters(
 				'FHEE__EEH_Line_Item__create_ticket_line_item__sub_line_item',
 				$sub_line_item
 			);
-			if ( $price->is_percent() ) {
-				$sub_line_item->set_percent( $sign * $price->amount() );
+			if ($price->is_percent()) {
+				$sub_line_item->set_percent($sign * $price->amount());
 			} else {
-				$sub_line_item->set_unit_price( $sign * $price->amount() );
+				$sub_line_item->set_unit_price($sign * $price->amount());
 			}
 			$running_total_for_ticket += $price_total;
-			$line_item->add_child_line_item( $sub_line_item );
+			$line_item->add_child_line_item($sub_line_item);
 		}
 		return $line_item;
 	}
@@ -329,11 +329,11 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public static function add_item( EE_Line_Item $total_line_item, EE_Line_Item $item ){
-		$pre_tax_subtotal = self::get_pre_tax_subtotal( $total_line_item );
-		if ( $pre_tax_subtotal instanceof EE_Line_Item ){
+	public static function add_item(EE_Line_Item $total_line_item, EE_Line_Item $item) {
+		$pre_tax_subtotal = self::get_pre_tax_subtotal($total_line_item);
+		if ($pre_tax_subtotal instanceof EE_Line_Item) {
 			$success = $pre_tax_subtotal->add_child_line_item($item);
-		}else{
+		} else {
 			return FALSE;
 		}
 		$total_line_item->recalculate_total_including_taxes();
@@ -352,34 +352,34 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	public static function cancel_ticket_line_item( EE_Line_Item $ticket_line_item, $qty = 1 ) {
+	public static function cancel_ticket_line_item(EE_Line_Item $ticket_line_item, $qty = 1) {
 		// validate incoming line_item
-		if ( $ticket_line_item->OBJ_type() !== 'Ticket' ) {
+		if ($ticket_line_item->OBJ_type() !== 'Ticket') {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso' ),
+					__('The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso'),
 					$ticket_line_item->type()
 				)
 			);
 		}
-		if ( $ticket_line_item->quantity() < $qty ) {
+		if ($ticket_line_item->quantity() < $qty) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Can not cancel %1$d ticket(s) because the supplied line item has a quantity of %2$d.', 'event_espresso' ),
+					__('Can not cancel %1$d ticket(s) because the supplied line item has a quantity of %2$d.', 'event_espresso'),
 					$qty,
 					$ticket_line_item->quantity()
 				)
 			);
 		}
 		// decrement ticket quantity; don't rely on auto-fixing when recalculating totals to do this
-		$ticket_line_item->set_quantity( $ticket_line_item->quantity() - $qty );
-		foreach( $ticket_line_item->children() as $child_line_item ) {
-			if(
+		$ticket_line_item->set_quantity($ticket_line_item->quantity() - $qty);
+		foreach ($ticket_line_item->children() as $child_line_item) {
+			if (
 				$child_line_item->is_sub_line_item()
 				&& ! $child_line_item->is_percent()
 				&& ! $child_line_item->is_cancellation()
 			) {
-				$child_line_item->set_quantity( $child_line_item->quantity() - $qty );
+				$child_line_item->set_quantity($child_line_item->quantity() - $qty);
 			}
 		}
 		// get cancellation sub line item
@@ -387,37 +387,37 @@ 
 			$ticket_line_item,
 			EEM_Line_Item::type_cancellation
 		);
-		$cancellation_line_item = reset( $cancellation_line_item );
+		$cancellation_line_item = reset($cancellation_line_item);
 		// verify that this ticket was indeed previously cancelled
-		if ( $cancellation_line_item instanceof EE_Line_Item ) {
+		if ($cancellation_line_item instanceof EE_Line_Item) {
 			// increment cancelled quantity
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() + $qty );
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() + $qty);
 		} else {
 			// create cancellation sub line item
-			$cancellation_line_item = EE_Line_Item::new_instance( array(
-				'LIN_name'       => __( 'Cancellation', 'event_espresso' ),
+			$cancellation_line_item = EE_Line_Item::new_instance(array(
+				'LIN_name'       => __('Cancellation', 'event_espresso'),
 				'LIN_desc'       => sprintf(
-					_x( 'Cancelled %1$s : %2$s', 'Cancelled Ticket Name : 2015-01-01 11:11', 'event_espresso' ),
+					_x('Cancelled %1$s : %2$s', 'Cancelled Ticket Name : 2015-01-01 11:11', 'event_espresso'),
 					$ticket_line_item->name(),
-					current_time( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ) )
+					current_time(get_option('date_format').' '.get_option('time_format'))
 				),
 				'LIN_unit_price' => 0, // $ticket_line_item->unit_price()
 				'LIN_quantity'   => $qty,
 				'LIN_is_taxable' => $ticket_line_item->is_taxable(),
-				'LIN_order'      => count( $ticket_line_item->children() ),
+				'LIN_order'      => count($ticket_line_item->children()),
 				'LIN_total'      => 0, // $ticket_line_item->unit_price()
 				'LIN_type'       => EEM_Line_Item::type_cancellation,
-			) );
-			$ticket_line_item->add_child_line_item( $cancellation_line_item );
+			));
+			$ticket_line_item->add_child_line_item($cancellation_line_item);
 		}
-		if ( $ticket_line_item->save_this_and_descendants() > 0 ) {
+		if ($ticket_line_item->save_this_and_descendants() > 0) {
 			// decrement parent line item quantity
 			$event_line_item = $ticket_line_item->parent();
-			if ( $event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event' ) {
-				$event_line_item->set_quantity( $event_line_item->quantity() - $qty );
+			if ($event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event') {
+				$event_line_item->set_quantity($event_line_item->quantity() - $qty);
 				$event_line_item->save();
 			}
-			EEH_Line_Item::get_grand_total_and_recalculate_everything( $ticket_line_item );
+			EEH_Line_Item::get_grand_total_and_recalculate_everything($ticket_line_item);
 			return true;
 		}
 		return false;
@@ -435,12 +435,12 @@ 
 	 * @return bool success
 	 * @throws \EE_Error
 	 */
-	public static function reinstate_canceled_ticket_line_item( EE_Line_Item $ticket_line_item, $qty = 1 ) {
+	public static function reinstate_canceled_ticket_line_item(EE_Line_Item $ticket_line_item, $qty = 1) {
 		// validate incoming line_item
-		if ( $ticket_line_item->OBJ_type() !== 'Ticket' ) {
+		if ($ticket_line_item->OBJ_type() !== 'Ticket') {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso' ),
+					__('The supplied line item must have an Object Type of "Ticket", not %1$s.', 'event_espresso'),
 					$ticket_line_item->type()
 				)
 			);
@@ -450,42 +450,42 @@ 
 			$ticket_line_item,
 			EEM_Line_Item::type_cancellation
 		);
-		$cancellation_line_item = reset( $cancellation_line_item );
+		$cancellation_line_item = reset($cancellation_line_item);
 		// verify that this ticket was indeed previously cancelled
-		if ( ! $cancellation_line_item instanceof EE_Line_Item ) {
+		if ( ! $cancellation_line_item instanceof EE_Line_Item) {
 			return false;
 		}
-		if ( $cancellation_line_item->quantity() > $qty ) {
+		if ($cancellation_line_item->quantity() > $qty) {
 			// decrement cancelled quantity
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() - $qty );
-		} else if ( $cancellation_line_item->quantity() == $qty ) {
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() - $qty);
+		} else if ($cancellation_line_item->quantity() == $qty) {
 			// decrement cancelled quantity in case anyone still has the object kicking around
-			$cancellation_line_item->set_quantity( $cancellation_line_item->quantity() - $qty );
+			$cancellation_line_item->set_quantity($cancellation_line_item->quantity() - $qty);
 			// delete because quantity will end up as 0
 			$cancellation_line_item->delete();
 			// and attempt to destroy the object,
 			// even though PHP won't actually destroy it until it needs the memory
-			unset( $cancellation_line_item );
+			unset($cancellation_line_item);
 		} else {
 			// what ?!?! negative quantity ?!?!
 			throw new EE_Error(
 				sprintf(
-					__( 'Can not reinstate %1$d cancelled ticket(s) because the cancelled ticket quantity is only %2$d.',
-						'event_espresso' ),
+					__('Can not reinstate %1$d cancelled ticket(s) because the cancelled ticket quantity is only %2$d.',
+						'event_espresso'),
 					$qty,
 					$cancellation_line_item->quantity()
 				)
 			);
 		}
 		// increment ticket quantity
-		$ticket_line_item->set_quantity( $ticket_line_item->quantity() + $qty );
-		if ( $ticket_line_item->save_this_and_descendants() > 0 ) {
+		$ticket_line_item->set_quantity($ticket_line_item->quantity() + $qty);
+		if ($ticket_line_item->save_this_and_descendants() > 0) {
 			// increment parent line item quantity
 			$event_line_item = $ticket_line_item->parent();
-			if ( $event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event' ) {
-				$event_line_item->set_quantity( $event_line_item->quantity() + $qty );
+			if ($event_line_item instanceof EE_Line_Item && $event_line_item->OBJ_type() === 'Event') {
+				$event_line_item->set_quantity($event_line_item->quantity() + $qty);
 			}
-			EEH_Line_Item::get_grand_total_and_recalculate_everything( $ticket_line_item );
+			EEH_Line_Item::get_grand_total_and_recalculate_everything($ticket_line_item);
 			return true;
 		}
 		return false;
@@ -500,8 +500,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return \EE_Line_Item
 	 */
-	public static function get_grand_total_and_recalculate_everything( EE_Line_Item $line_item ){
-		$grand_total_line_item = EEH_Line_Item::find_transaction_grand_total_for_line_item( $line_item );
+	public static function get_grand_total_and_recalculate_everything(EE_Line_Item $line_item) {
+		$grand_total_line_item = EEH_Line_Item::find_transaction_grand_total_for_line_item($line_item);
 		return $grand_total_line_item->recalculate_total_including_taxes();
 	}
 
@@ -514,11 +514,11 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_pre_tax_subtotal( EE_Line_Item $total_line_item ){
-		$pre_tax_subtotal = $total_line_item->get_child_line_item( 'pre-tax-subtotal' );
+	public static function get_pre_tax_subtotal(EE_Line_Item $total_line_item) {
+		$pre_tax_subtotal = $total_line_item->get_child_line_item('pre-tax-subtotal');
 		return $pre_tax_subtotal instanceof EE_Line_Item
 			? $pre_tax_subtotal
-			: self::create_pre_tax_subtotal( $total_line_item );
+			: self::create_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -530,9 +530,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_taxes_subtotal( EE_Line_Item $total_line_item ){
-		$taxes = $total_line_item->get_child_line_item( 'taxes' );
-		return $taxes ? $taxes : self::create_taxes_subtotal( $total_line_item );
+	public static function get_taxes_subtotal(EE_Line_Item $total_line_item) {
+		$taxes = $total_line_item->get_child_line_item('taxes');
+		return $taxes ? $taxes : self::create_taxes_subtotal($total_line_item);
 	}
 
 
@@ -545,12 +545,12 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function set_TXN_ID( EE_Line_Item $line_item, $transaction = NULL ){
-		if( $transaction ){
+	public static function set_TXN_ID(EE_Line_Item $line_item, $transaction = NULL) {
+		if ($transaction) {
 			/** @type EEM_Transaction $EEM_Transaction */
-			$EEM_Transaction = EE_Registry::instance()->load_model( 'Transaction' );
-			$TXN_ID = $EEM_Transaction->ensure_is_ID( $transaction );
-			$line_item->set_TXN_ID( $TXN_ID );
+			$EEM_Transaction = EE_Registry::instance()->load_model('Transaction');
+			$TXN_ID = $EEM_Transaction->ensure_is_ID($transaction);
+			$line_item->set_TXN_ID($TXN_ID);
 		}
 	}
 
@@ -565,8 +565,8 @@ 
 	 * @return \EE_Line_Item of type total
 	 * @throws \EE_Error
 	 */
-	public static function create_total_line_item( $transaction = NULL ){
-		$total_line_item = EE_Line_Item::new_instance( array(
+	public static function create_total_line_item($transaction = NULL) {
+		$total_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'total',
 			'LIN_name'	=> __('Grand Total', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_total,
@@ -576,9 +576,9 @@ 
 			'FHEE__EEH_Line_Item__create_total_line_item__total_line_item',
 			$total_line_item
 		);
-		self::set_TXN_ID( $total_line_item, $transaction );
-		self::create_pre_tax_subtotal( $total_line_item, $transaction );
-		self::create_taxes_subtotal( $total_line_item, $transaction );
+		self::set_TXN_ID($total_line_item, $transaction);
+		self::create_pre_tax_subtotal($total_line_item, $transaction);
+		self::create_taxes_subtotal($total_line_item, $transaction);
 		return $total_line_item;
 	}
 
@@ -592,19 +592,19 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	protected static function create_pre_tax_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
-		$pre_tax_line_item = EE_Line_Item::new_instance( array(
+	protected static function create_pre_tax_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		$pre_tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code' 	=> 'pre-tax-subtotal',
-			'LIN_name' 	=> __( 'Pre-Tax Subtotal', 'event_espresso' ),
+			'LIN_name' 	=> __('Pre-Tax Subtotal', 'event_espresso'),
 			'LIN_type' 	=> EEM_Line_Item::type_sub_total
-		) );
+		));
 		$pre_tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_pre_tax_subtotal__pre_tax_line_item',
 			$pre_tax_line_item
 		);
-		self::set_TXN_ID( $pre_tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $pre_tax_line_item );
-		self::create_event_subtotal( $pre_tax_line_item, $transaction );
+		self::set_TXN_ID($pre_tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($pre_tax_line_item);
+		self::create_event_subtotal($pre_tax_line_item, $transaction);
 		return $pre_tax_line_item;
 	}
 
@@ -619,21 +619,21 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	protected static function create_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL ){
+	protected static function create_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
 		$tax_line_item = EE_Line_Item::new_instance(array(
 			'LIN_code'	=> 'taxes',
 			'LIN_name' 	=> __('Taxes', 'event_espresso'),
 			'LIN_type'	=> EEM_Line_Item::type_tax_sub_total,
-			'LIN_order' => 1000,//this should always come last
+			'LIN_order' => 1000, //this should always come last
 		));
 		$tax_line_item = apply_filters(
 			'FHEE__EEH_Line_Item__create_taxes_subtotal__tax_line_item',
 			$tax_line_item
 		);
-		self::set_TXN_ID( $tax_line_item, $transaction );
-		$total_line_item->add_child_line_item( $tax_line_item );
+		self::set_TXN_ID($tax_line_item, $transaction);
+		$total_line_item->add_child_line_item($tax_line_item);
 		//and lastly, add the actual taxes
-		self::apply_taxes( $total_line_item );
+		self::apply_taxes($total_line_item);
 		return $tax_line_item;
 	}
 
@@ -648,11 +648,11 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_event_subtotal( EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL ){
+	public static function create_event_subtotal(EE_Line_Item $pre_tax_line_item, $transaction = NULL, $event = NULL) {
 		$event_line_item = EE_Line_Item::new_instance(array(
-			'LIN_code'	=> self::get_event_code( $event ),
-			'LIN_name' 	=> self::get_event_name( $event ),
-			'LIN_desc' 	=> self::get_event_desc( $event ),
+			'LIN_code'	=> self::get_event_code($event),
+			'LIN_name' 	=> self::get_event_name($event),
+			'LIN_desc' 	=> self::get_event_desc($event),
 			'LIN_type'	=> EEM_Line_Item::type_sub_total,
 			'OBJ_type' 	=> 'Event',
 			'OBJ_ID' 		=>  $event instanceof EE_Event ? $event->ID() : 0
@@ -661,8 +661,8 @@ 
 			'FHEE__EEH_Line_Item__create_event_subtotal__event_line_item',
 			$event_line_item
 		);
-		self::set_TXN_ID( $event_line_item, $transaction );
-		$pre_tax_line_item->add_child_line_item( $event_line_item );
+		self::set_TXN_ID($event_line_item, $transaction);
+		$pre_tax_line_item->add_child_line_item($event_line_item);
 		return $event_line_item;
 	}
 
@@ -675,8 +675,8 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public static function get_event_code( $event ) {
-		return 'event-' . ( $event instanceof EE_Event ? $event->ID() : '0' );
+	public static function get_event_code($event) {
+		return 'event-'.($event instanceof EE_Event ? $event->ID() : '0');
 	}
 
 	/**
@@ -684,8 +684,8 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_name( $event ) {
-		return $event instanceof EE_Event ? $event->name() : __( 'Event', 'event_espresso' );
+	public static function get_event_name($event) {
+		return $event instanceof EE_Event ? $event->name() : __('Event', 'event_espresso');
 	}
 
 	/**
@@ -693,7 +693,7 @@ 
 	 * @param EE_Event $event
 	 * @return string
 	 */
-	public static function get_event_desc( $event ) {
+	public static function get_event_desc($event) {
 		return $event instanceof EE_Event ? $event->short_description() : '';
 	}
 
@@ -707,27 +707,27 @@ 
 	  * @throws \EE_Error
 	  * @return EE_Line_Item
 	  */
-	public static function get_event_line_item_for_ticket( EE_Line_Item $grand_total, EE_Ticket $ticket ) {
+	public static function get_event_line_item_for_ticket(EE_Line_Item $grand_total, EE_Ticket $ticket) {
 		$first_datetime = $ticket->first_datetime();
-		if ( ! $first_datetime instanceof EE_Datetime ) {
+		if ( ! $first_datetime instanceof EE_Datetime) {
 			throw new EE_Error(
-				sprintf( __( 'The supplied ticket (ID %d) has no datetimes', 'event_espresso' ), $ticket->ID() )
+				sprintf(__('The supplied ticket (ID %d) has no datetimes', 'event_espresso'), $ticket->ID())
 			);
 		}
 		$event = $first_datetime->event();
-		if ( ! $event instanceof EE_Event ) {
+		if ( ! $event instanceof EE_Event) {
 			throw new EE_Error(
 				sprintf(
-					__( 'The supplied ticket (ID %d) has no event data associated with it.', 'event_espresso' ),
+					__('The supplied ticket (ID %d) has no event data associated with it.', 'event_espresso'),
 					$ticket->ID()
 				)
 			);
 		}
-		$events_sub_total = EEH_Line_Item::get_event_line_item( $grand_total, $event );
-		if ( ! $events_sub_total instanceof EE_Line_Item ) {
+		$events_sub_total = EEH_Line_Item::get_event_line_item($grand_total, $event);
+		if ( ! $events_sub_total instanceof EE_Line_Item) {
 			throw new EE_Error(
 				sprintf(
-					__( 'There is no events sub-total for ticket %s on total line item %d', 'event_espresso' ),
+					__('There is no events sub-total for ticket %s on total line item %d', 'event_espresso'),
 					$ticket->ID(),
 					$grand_total->ID()
 				)
@@ -746,31 +746,31 @@ 
 	 * @return EE_Line_Item for the event subtotal which is a child of $grand_total
 	 * @throws \EE_Error
 	 */
-	public static function get_event_line_item( EE_Line_Item $grand_total, $event ) {
+	public static function get_event_line_item(EE_Line_Item $grand_total, $event) {
 		/** @type EE_Event $event */
-		$event = EEM_Event::instance()->ensure_is_obj( $event, true );
+		$event = EEM_Event::instance()->ensure_is_obj($event, true);
 		$event_line_item = NULL;
 		$found = false;
-		foreach ( EEH_Line_Item::get_event_subtotals( $grand_total ) as $event_line_item ) {
+		foreach (EEH_Line_Item::get_event_subtotals($grand_total) as $event_line_item) {
 			// default event subtotal, we should only ever find this the first time this method is called
-			if ( ! $event_line_item->OBJ_ID() ) {
+			if ( ! $event_line_item->OBJ_ID()) {
 				// let's use this! but first... set the event details
-				EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+				EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 				$found = true;
 				break;
-			} else if ( $event_line_item->OBJ_ID() === $event->ID() ) {
+			} else if ($event_line_item->OBJ_ID() === $event->ID()) {
 				// found existing line item for this event in the cart, so break out of loop and use this one
 				$found = true;
 				break;
 			}
 		}
-		if ( ! $found ) {
+		if ( ! $found) {
 			//there is no event sub-total yet, so add it
-			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal( $grand_total );
+			$pre_tax_subtotal = EEH_Line_Item::get_pre_tax_subtotal($grand_total);
 			// create a new "event" subtotal below that
-			$event_line_item = EEH_Line_Item::create_event_subtotal( $pre_tax_subtotal, null, $event );
+			$event_line_item = EEH_Line_Item::create_event_subtotal($pre_tax_subtotal, null, $event);
 			// and set the event details
-			EEH_Line_Item::set_event_subtotal_details( $event_line_item, $event );
+			EEH_Line_Item::set_event_subtotal_details($event_line_item, $event);
 		}
 		return $event_line_item;
 	}
@@ -791,13 +791,13 @@ 
 		EE_Event $event,
 		$transaction = null
 	) {
-		if ( $event instanceof EE_Event ) {
-			$event_line_item->set_code( self::get_event_code( $event ) );
-			$event_line_item->set_name( self::get_event_name( $event ) );
-			$event_line_item->set_desc( self::get_event_desc( $event ) );
-			$event_line_item->set_OBJ_ID( $event->ID() );
+		if ($event instanceof EE_Event) {
+			$event_line_item->set_code(self::get_event_code($event));
+			$event_line_item->set_name(self::get_event_name($event));
+			$event_line_item->set_desc(self::get_event_desc($event));
+			$event_line_item->set_OBJ_ID($event->ID());
 		}
-		self::set_TXN_ID( $event_line_item, $transaction );
+		self::set_TXN_ID($event_line_item, $transaction);
 	}
 
 
@@ -810,19 +810,19 @@ 
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @throws \EE_Error
 	 */
-	public static function apply_taxes( EE_Line_Item $total_line_item ){
+	public static function apply_taxes(EE_Line_Item $total_line_item) {
 		/** @type EEM_Price $EEM_Price */
-		$EEM_Price = EE_Registry::instance()->load_model( 'Price' );
+		$EEM_Price = EE_Registry::instance()->load_model('Price');
 		// get array of taxes via Price Model
 		$ordered_taxes = $EEM_Price->get_all_prices_that_are_taxes();
-		ksort( $ordered_taxes );
-		$taxes_line_item = self::get_taxes_subtotal( $total_line_item );
+		ksort($ordered_taxes);
+		$taxes_line_item = self::get_taxes_subtotal($total_line_item);
 		//just to be safe, remove its old tax line items
 		$taxes_line_item->delete_children_line_items();
 		//loop thru taxes
-		foreach ( $ordered_taxes as $order => $taxes ) {
-			foreach ( $taxes as $tax ) {
-				if ( $tax instanceof EE_Price ) {
+		foreach ($ordered_taxes as $order => $taxes) {
+			foreach ($taxes as $tax) {
+				if ($tax instanceof EE_Price) {
 					$tax_line_item = EE_Line_Item::new_instance(
 						array(
 							'LIN_name'       => $tax->name(),
@@ -840,7 +840,7 @@ 
 						'FHEE__EEH_Line_Item__apply_taxes__tax_line_item',
 						$tax_line_item
 					);
-					$taxes_line_item->add_child_line_item( $tax_line_item );
+					$taxes_line_item->add_child_line_item($tax_line_item);
 				}
 			}
 		}
@@ -857,10 +857,10 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public static function ensure_taxes_applied( $total_line_item ){
-		$taxes_subtotal = self::get_taxes_subtotal( $total_line_item );
-		if( ! $taxes_subtotal->children()){
-			self::apply_taxes( $total_line_item );
+	public static function ensure_taxes_applied($total_line_item) {
+		$taxes_subtotal = self::get_taxes_subtotal($total_line_item);
+		if ( ! $taxes_subtotal->children()) {
+			self::apply_taxes($total_line_item);
 		}
 		return $taxes_subtotal->total();
 	}
@@ -874,16 +874,16 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public static function delete_all_child_items( EE_Line_Item $parent_line_item ) {
+	public static function delete_all_child_items(EE_Line_Item $parent_line_item) {
 		$deleted = 0;
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
-				$deleted += EEH_Line_Item::delete_all_child_items( $child_line_item );
-				if ( $child_line_item->ID() ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
+				$deleted += EEH_Line_Item::delete_all_child_items($child_line_item);
+				if ($child_line_item->ID()) {
 					$child_line_item->delete();
-					unset( $child_line_item );
+					unset($child_line_item);
 				} else {
-					$parent_line_item->delete_child_line_item( $child_line_item->code() );
+					$parent_line_item->delete_child_line_item($child_line_item->code());
 				}
 				$deleted++;
 			}
@@ -905,9 +905,9 @@ 
 	 * @param array|bool|string $line_item_codes
 	 * @return int number of items successfully removed
 	 */
-	public static function delete_items( EE_Line_Item $total_line_item, $line_item_codes = FALSE ) {
+	public static function delete_items(EE_Line_Item $total_line_item, $line_item_codes = FALSE) {
 
-		if( $total_line_item->type() !== EEM_Line_Item::type_total ){
+		if ($total_line_item->type() !== EEM_Line_Item::type_total) {
 			EE_Error::doing_it_wrong(
 				'EEH_Line_Item::delete_items',
 				__(
@@ -917,20 +917,20 @@ 
 				'4.6.18'
 			);
 		}
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
 		// check if only a single line_item_id was passed
-		if ( ! empty( $line_item_codes ) && ! is_array( $line_item_codes )) {
+		if ( ! empty($line_item_codes) && ! is_array($line_item_codes)) {
 			// place single line_item_id in an array to appear as multiple line_item_ids
-			$line_item_codes = array ( $line_item_codes );
+			$line_item_codes = array($line_item_codes);
 		}
 		$removals = 0;
 		// cycle thru line_item_ids
-		foreach ( $line_item_codes as $line_item_id ) {
+		foreach ($line_item_codes as $line_item_id) {
 			$removals += $total_line_item->delete_child_line_item($line_item_id);
 		}
 
-		if ( $removals > 0 ) {
+		if ($removals > 0) {
 			$total_line_item->recalculate_taxes_and_tax_total();
 			return $removals;
 		} else {
@@ -963,33 +963,33 @@ 
 		$code = null,
 		$add_to_existing_line_item = false
 	) {
-		$tax_subtotal = self::get_taxes_subtotal( $total_line_item );
+		$tax_subtotal = self::get_taxes_subtotal($total_line_item);
             $taxable_total = $total_line_item->taxable_total();
 
-            if( $add_to_existing_line_item ) {
-                $new_tax = $tax_subtotal->get_child_line_item( $code );
+            if ($add_to_existing_line_item) {
+                $new_tax = $tax_subtotal->get_child_line_item($code);
 	            EEM_Line_Item::instance()->delete(
-		            array( array( 'LIN_code' => array( '!=', $code ), 'LIN_parent' => $tax_subtotal->ID() ) )
+		            array(array('LIN_code' => array('!=', $code), 'LIN_parent' => $tax_subtotal->ID()))
 	            );
             } else {
                 $new_tax = null;
                 $tax_subtotal->delete_children_line_items();
             }
-            if( $new_tax ) {
-                $new_tax->set_total( $new_tax->total() + $amount );
-                $new_tax->set_percent( $taxable_total ? $new_tax->total() / $taxable_total * 100 : 0 );
+            if ($new_tax) {
+                $new_tax->set_total($new_tax->total() + $amount);
+                $new_tax->set_percent($taxable_total ? $new_tax->total() / $taxable_total * 100 : 0);
             } else {
                 //no existing tax item. Create it
-				$new_tax = EE_Line_Item::new_instance( array(
+				$new_tax = EE_Line_Item::new_instance(array(
 					'TXN_ID'      => $total_line_item->TXN_ID(),
-					'LIN_name'    => $name ? $name : __( 'Tax', 'event_espresso' ),
+					'LIN_name'    => $name ? $name : __('Tax', 'event_espresso'),
 					'LIN_desc'    => $description ? $description : '',
-					'LIN_percent' => $taxable_total ? ( $amount / $taxable_total * 100 ) : 0,
+					'LIN_percent' => $taxable_total ? ($amount / $taxable_total * 100) : 0,
 					'LIN_total'   => $amount,
 					'LIN_parent'  => $tax_subtotal->ID(),
 					'LIN_type'    => EEM_Line_Item::type_tax,
 					'LIN_code'    => $code
-				) );
+				));
 			}
 
             $new_tax = apply_filters(
@@ -998,7 +998,7 @@ 
 				$total_line_item
             );
             $new_tax->save();
-            $tax_subtotal->set_total( $new_tax->total() );
+            $tax_subtotal->set_total($new_tax->total());
             $tax_subtotal->save();
             $total_line_item->recalculate_total_including_taxes();
             return $new_tax;
@@ -1020,14 +1020,14 @@ 
 		$code_substring_for_whitelist = null
 	) {
 		$whitelisted = false;
-		if( $code_substring_for_whitelist !== null ) {
-			$whitelisted = strpos( $line_item->code(), $code_substring_for_whitelist ) !== false ? true : false;
+		if ($code_substring_for_whitelist !== null) {
+			$whitelisted = strpos($line_item->code(), $code_substring_for_whitelist) !== false ? true : false;
 		}
-		if( ! $whitelisted && $line_item->is_line_item() ) {
-			$line_item->set_is_taxable( $taxable );
+		if ( ! $whitelisted && $line_item->is_line_item()) {
+			$line_item->set_is_taxable($taxable);
 		}
-		foreach( $line_item->children() as $child_line_item ) {
-			EEH_Line_Item::set_line_items_taxable( $child_line_item, $taxable, $code_substring_for_whitelist );
+		foreach ($line_item->children() as $child_line_item) {
+			EEH_Line_Item::set_line_items_taxable($child_line_item, $taxable, $code_substring_for_whitelist);
 		}
 	}
 
@@ -1040,8 +1040,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_event_subtotals( EE_Line_Item $parent_line_item ) {
-		return self::get_subtotals_of_object_type( $parent_line_item, 'Event' );
+	public static function get_event_subtotals(EE_Line_Item $parent_line_item) {
+		return self::get_subtotals_of_object_type($parent_line_item, 'Event');
 	}
 
 
@@ -1054,7 +1054,7 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_subtotals_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
+	public static function get_subtotals_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
 		return self::_get_descendants_by_type_and_object_type(
 			$parent_line_item,
 			EEM_Line_Item::type_sub_total,
@@ -1071,8 +1071,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_ticket_line_items( EE_Line_Item $parent_line_item ) {
-		return self::get_line_items_of_object_type( $parent_line_item, 'Ticket' );
+	public static function get_ticket_line_items(EE_Line_Item $parent_line_item) {
+		return self::get_line_items_of_object_type($parent_line_item, 'Ticket');
 	}
 
 
@@ -1085,8 +1085,8 @@ 
 	 * @param string $obj_type
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_items_of_object_type( EE_Line_Item $parent_line_item, $obj_type = '' ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, EEM_Line_Item::type_line_item, $obj_type );
+	public static function get_line_items_of_object_type(EE_Line_Item $parent_line_item, $obj_type = '') {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, EEM_Line_Item::type_line_item, $obj_type);
 	}
 
 
@@ -1097,8 +1097,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_tax_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_tax );
+	public static function get_tax_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_tax);
 	}
 
 
@@ -1109,8 +1109,8 @@ 
 	 * @param \EE_Line_Item $parent_line_item - the line item to find descendants of
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_line_item_descendants( EE_Line_Item $parent_line_item ) {
-		return EEH_Line_Item::get_descendants_of_type( $parent_line_item, EEM_Line_Item::type_line_item );
+	public static function get_line_item_descendants(EE_Line_Item $parent_line_item) {
+		return EEH_Line_Item::get_descendants_of_type($parent_line_item, EEM_Line_Item::type_line_item);
 	}
 
 
@@ -1123,8 +1123,8 @@ 
 	 * @param string $line_item_type one of the EEM_Line_Item constants
 	 * @return EE_Line_Item[]
 	 */
-	public static function get_descendants_of_type( EE_Line_Item $parent_line_item, $line_item_type ) {
-		return self::_get_descendants_by_type_and_object_type( $parent_line_item, $line_item_type, NULL );
+	public static function get_descendants_of_type(EE_Line_Item $parent_line_item, $line_item_type) {
+		return self::_get_descendants_by_type_and_object_type($parent_line_item, $line_item_type, NULL);
 	}
 
 
@@ -1143,8 +1143,8 @@ 
 		$obj_type = null
 	) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
 				if (
 					$child_line_item->type() === $line_item_type
 				    && (
@@ -1184,7 +1184,7 @@ 
 		$OBJ_type = '',
 		$OBJ_IDs = array()
 	) {
-		return self::_get_descendants_by_object_type_and_object_ID( $parent_line_item, $OBJ_type, $OBJ_IDs );
+		return self::_get_descendants_by_object_type_and_object_ID($parent_line_item, $OBJ_type, $OBJ_IDs);
 	}
 
 
@@ -1203,12 +1203,12 @@ 
 		$OBJ_IDs
 	) {
 		$objects = array();
-		foreach ( $parent_line_item->children() as $child_line_item ) {
-			if ( $child_line_item instanceof EE_Line_Item ) {
+		foreach ($parent_line_item->children() as $child_line_item) {
+			if ($child_line_item instanceof EE_Line_Item) {
 				if (
-					is_array( $OBJ_IDs )
+					is_array($OBJ_IDs)
 					&& $child_line_item->OBJ_type() === $OBJ_type
-					&& in_array( $child_line_item->OBJ_ID(), $OBJ_IDs )
+					&& in_array($child_line_item->OBJ_ID(), $OBJ_IDs)
 				) {
 					$objects[] = $child_line_item;
 				} else {
@@ -1238,8 +1238,8 @@ 
 	 * @param string $type like one of the EEM_Line_Item::type_*
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_of_type( EE_Line_Item $parent_line_item, $type ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_type' , $type );
+	public static function get_nearest_descendant_of_type(EE_Line_Item $parent_line_item, $type) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_type', $type);
 	}
 
 
@@ -1253,8 +1253,8 @@ 
 	 * @param string $code any value used for LIN_code
 	 * @return EE_Line_Item
 	 */
-	public static function get_nearest_descendant_having_code( EE_Line_Item $parent_line_item, $code ) {
-		return self::_get_nearest_descendant( $parent_line_item, 'LIN_code' , $code );
+	public static function get_nearest_descendant_having_code(EE_Line_Item $parent_line_item, $code) {
+		return self::_get_nearest_descendant($parent_line_item, 'LIN_code', $code);
 	}
 
 
@@ -1268,15 +1268,15 @@ 
 	 * @param string $value any value stored in $search_field
 	 * @return EE_Line_Item
 	 */
-	protected static function _get_nearest_descendant( EE_Line_Item $parent_line_item, $search_field, $value ) {
-		foreach( $parent_line_item->children() as $child ){
-			if ( $child->get( $search_field ) == $value ){
+	protected static function _get_nearest_descendant(EE_Line_Item $parent_line_item, $search_field, $value) {
+		foreach ($parent_line_item->children() as $child) {
+			if ($child->get($search_field) == $value) {
 				return $child;
 			}
 		}
-		foreach( $parent_line_item->children() as $child ){
-			$descendant_found = self::_get_nearest_descendant( $child, $search_field, $value );
-			if ( $descendant_found ){
+		foreach ($parent_line_item->children() as $child) {
+			$descendant_found = self::_get_nearest_descendant($child, $search_field, $value);
+			if ($descendant_found) {
 				return $descendant_found;
 			}
 		}
@@ -1293,24 +1293,24 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function find_transaction_grand_total_for_line_item( EE_Line_Item $line_item ){
-		if ( $line_item->TXN_ID() ) {
-			$total_line_item = $line_item->transaction()->total_line_item( false );
-			if ( $total_line_item instanceof EE_Line_Item ) {
+	public static function find_transaction_grand_total_for_line_item(EE_Line_Item $line_item) {
+		if ($line_item->TXN_ID()) {
+			$total_line_item = $line_item->transaction()->total_line_item(false);
+			if ($total_line_item instanceof EE_Line_Item) {
 				return $total_line_item;
 			}
 		} else {
 			$line_item_parent = $line_item->parent();
-			if ( $line_item_parent instanceof EE_Line_Item ) {
-				if ( $line_item_parent->is_total() ) {
+			if ($line_item_parent instanceof EE_Line_Item) {
+				if ($line_item_parent->is_total()) {
 					return $line_item_parent;
 				}
-				return EEH_Line_Item::find_transaction_grand_total_for_line_item( $line_item_parent );
+				return EEH_Line_Item::find_transaction_grand_total_for_line_item($line_item_parent);
 			}
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'A valid grand total for line item %1$d was not found.', 'event_espresso' ),
+				__('A valid grand total for line item %1$d was not found.', 'event_espresso'),
 				$line_item->ID()
 			)
 		);
@@ -1327,31 +1327,31 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public static function visualize( EE_Line_Item $line_item, $indentation = 0 ){
+	public static function visualize(EE_Line_Item $line_item, $indentation = 0) {
 		echo defined('EE_TESTS_DIR') ? "\n" : '<br />';
-		if ( ! $indentation ) {
-			echo defined( 'EE_TESTS_DIR' ) ? "\n" : '<br />';
+		if ( ! $indentation) {
+			echo defined('EE_TESTS_DIR') ? "\n" : '<br />';
 		}
-		for( $i = 0; $i < $indentation; $i++ ){
+		for ($i = 0; $i < $indentation; $i++) {
 			echo ". ";
 		}
 		$breakdown = '';
-		if ( $line_item->is_line_item()){
-			if ( $line_item->is_percent() ) {
+		if ($line_item->is_line_item()) {
+			if ($line_item->is_percent()) {
 				$breakdown = "{$line_item->percent()}%";
 			} else {
-				$breakdown = '$' . "{$line_item->unit_price()} x {$line_item->quantity()}";
+				$breakdown = '$'."{$line_item->unit_price()} x {$line_item->quantity()}";
 			}
 		}
-		echo $line_item->name() . " [ ID:{$line_item->ID()} | qty:{$line_item->quantity()} ] {$line_item->type()} : " . '$' . "{$line_item->total()}";
-		if ( $breakdown ) {
+		echo $line_item->name()." [ ID:{$line_item->ID()} | qty:{$line_item->quantity()} ] {$line_item->type()} : ".'$'."{$line_item->total()}";
+		if ($breakdown) {
 			echo " ( {$breakdown} )";
 		}
-		if( $line_item->is_taxable() ){
+		if ($line_item->is_taxable()) {
 			echo "  * taxable";
 		}
-		if( $line_item->children() ){
-			foreach($line_item->children() as $child){
+		if ($line_item->children()) {
+			foreach ($line_item->children() as $child) {
 				self::visualize($child, $indentation + 1);
 			}
 		}
@@ -1392,97 +1392,97 @@ 
 	 *                                          is theirs, which can be done with
 	 *                                          `EEM_Line_Item::instance()->get_line_item_for_registration( $registration );`
 	 */
-	public static function calculate_reg_final_prices_per_line_item( EE_Line_Item $line_item, $billable_ticket_quantities = array() ) {
+	public static function calculate_reg_final_prices_per_line_item(EE_Line_Item $line_item, $billable_ticket_quantities = array()) {
 		//init running grand total if not already
-		if ( ! isset( $running_totals[ 'total' ] ) ) {
-			$running_totals[ 'total' ] = 0;
+		if ( ! isset($running_totals['total'])) {
+			$running_totals['total'] = 0;
 		}
-		if( ! isset( $running_totals[ 'taxable' ] ) ) {
-			$running_totals[ 'taxable' ] = array( 'total' => 0 );
+		if ( ! isset($running_totals['taxable'])) {
+			$running_totals['taxable'] = array('total' => 0);
 		}
-		foreach ( $line_item->children() as $child_line_item ) {
-			switch ( $child_line_item->type() ) {
+		foreach ($line_item->children() as $child_line_item) {
+			switch ($child_line_item->type()) {
 
 				case EEM_Line_Item::type_sub_total :
-					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item( $child_line_item, $billable_ticket_quantities );
+					$running_totals_from_subtotal = EEH_Line_Item::calculate_reg_final_prices_per_line_item($child_line_item, $billable_ticket_quantities);
 					//combine arrays but preserve numeric keys
-					$running_totals = array_replace_recursive( $running_totals_from_subtotal, $running_totals );
-					$running_totals[ 'total' ] += $running_totals_from_subtotal[ 'total' ];
-					$running_totals[ 'taxable'][ 'total' ] += $running_totals_from_subtotal[ 'taxable' ][ 'total' ];
+					$running_totals = array_replace_recursive($running_totals_from_subtotal, $running_totals);
+					$running_totals['total'] += $running_totals_from_subtotal['total'];
+					$running_totals['taxable']['total'] += $running_totals_from_subtotal['taxable']['total'];
 					break;
 
 				case EEM_Line_Item::type_tax_sub_total :
 
 					//find how much the taxes percentage is
-					if ( $child_line_item->percent() !== 0 ) {
+					if ($child_line_item->percent() !== 0) {
 						$tax_percent_decimal = $child_line_item->percent() / 100;
 					} else {
 						$tax_percent_decimal = EE_Taxes::get_total_taxes_percentage() / 100;
 					}
 					//and apply to all the taxable totals, and add to the pretax totals
-					foreach ( $running_totals as $line_item_id => $this_running_total ) {
+					foreach ($running_totals as $line_item_id => $this_running_total) {
 						//"total" and "taxable" array key is an exception
-						if ( $line_item_id === 'taxable' ) {
+						if ($line_item_id === 'taxable') {
 							continue;
 						}
-						$taxable_total = $running_totals[ 'taxable' ][ $line_item_id ];
-						$running_totals[ $line_item_id ] += ( $taxable_total * $tax_percent_decimal );
+						$taxable_total = $running_totals['taxable'][$line_item_id];
+						$running_totals[$line_item_id] += ($taxable_total * $tax_percent_decimal);
 					}
 					break;
 
 				case EEM_Line_Item::type_line_item :
 
 					// ticket line items or ????
-					if ( $child_line_item->OBJ_type() === 'Ticket' ) {
+					if ($child_line_item->OBJ_type() === 'Ticket') {
 						// kk it's a ticket
-						if ( isset( $running_totals[ $child_line_item->ID() ] ) ) {
+						if (isset($running_totals[$child_line_item->ID()])) {
 							//huh? that shouldn't happen.
-							$running_totals[ 'total' ] += $child_line_item->total();
+							$running_totals['total'] += $child_line_item->total();
 						} else {
 							//its not in our running totals yet. great.
-							if ( $child_line_item->is_taxable() ) {
+							if ($child_line_item->is_taxable()) {
 								$taxable_amount = $child_line_item->unit_price();
 							} else {
 								$taxable_amount = 0;
 							}
 							// are we only calculating totals for some tickets?
-							if ( isset( $billable_ticket_quantities[ $child_line_item->OBJ_ID() ] ) ) {
-								$quantity = $billable_ticket_quantities[ $child_line_item->OBJ_ID() ];
-								$running_totals[ $child_line_item->ID() ] = $quantity
+							if (isset($billable_ticket_quantities[$child_line_item->OBJ_ID()])) {
+								$quantity = $billable_ticket_quantities[$child_line_item->OBJ_ID()];
+								$running_totals[$child_line_item->ID()] = $quantity
 									? $child_line_item->unit_price()
 									: 0;
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $quantity
+								$running_totals['taxable'][$child_line_item->ID()] = $quantity
 									? $taxable_amount
 									: 0;
 							} else {
 								$quantity = $child_line_item->quantity();
-								$running_totals[ $child_line_item->ID() ] = $child_line_item->unit_price();
-								$running_totals[ 'taxable' ][ $child_line_item->ID() ] = $taxable_amount;
+								$running_totals[$child_line_item->ID()] = $child_line_item->unit_price();
+								$running_totals['taxable'][$child_line_item->ID()] = $taxable_amount;
 							}
-							$running_totals[ 'taxable' ][ 'total' ] += $taxable_amount * $quantity;
-							$running_totals[ 'total' ] += $child_line_item->unit_price() * $quantity;
+							$running_totals['taxable']['total'] += $taxable_amount * $quantity;
+							$running_totals['total'] += $child_line_item->unit_price() * $quantity;
 						}
 					} else {
 						// it's some other type of item added to the cart
 						// it should affect the running totals
 						// basically we want to convert it into a PERCENT modifier. Because
 						// more clearly affect all registration's final price equally
-						$line_items_percent_of_running_total = $running_totals[ 'total' ] > 0
-							? ( $child_line_item->total() / $running_totals[ 'total' ] ) + 1
+						$line_items_percent_of_running_total = $running_totals['total'] > 0
+							? ($child_line_item->total() / $running_totals['total']) + 1
 							: 1;
-						foreach ( $running_totals as $line_item_id => $this_running_total ) {
+						foreach ($running_totals as $line_item_id => $this_running_total) {
 							//the "taxable" array key is an exception
-							if ( $line_item_id === 'taxable' ) {
+							if ($line_item_id === 'taxable') {
 								continue;
 							}
 							// update the running totals
 							// yes this actually even works for the running grand total!
-							$running_totals[ $line_item_id ] =
+							$running_totals[$line_item_id] =
 								$line_items_percent_of_running_total * $this_running_total;
 
-							if ( $child_line_item->is_taxable() ) {
-								$running_totals[ 'taxable' ][ $line_item_id ] =
-									$line_items_percent_of_running_total * $running_totals[ 'taxable' ][ $line_item_id ];
+							if ($child_line_item->is_taxable()) {
+								$running_totals['taxable'][$line_item_id] =
+									$line_items_percent_of_running_total * $running_totals['taxable'][$line_item_id];
 							}
 						}
 					}
@@ -1500,16 +1500,16 @@ 
 	 * @return float | null
 	 * @throws \OutOfRangeException
 	 */
-	public static function calculate_final_price_for_ticket_line_item( \EE_Line_Item $total_line_item, \EE_Line_Item $ticket_line_item ) {
+	public static function calculate_final_price_for_ticket_line_item(\EE_Line_Item $total_line_item, \EE_Line_Item $ticket_line_item) {
 		static $final_prices_per_ticket_line_item = array();
-		if ( empty( $final_prices_per_ticket_line_item ) ) {
+		if (empty($final_prices_per_ticket_line_item)) {
 			$final_prices_per_ticket_line_item = \EEH_Line_Item::calculate_reg_final_prices_per_line_item(
 				$total_line_item
 			);
 		}
 		//ok now find this new registration's final price
-		if ( isset( $final_prices_per_ticket_line_item[ $ticket_line_item->ID() ] ) ) {
-			return $final_prices_per_ticket_line_item[ $ticket_line_item->ID() ];
+		if (isset($final_prices_per_ticket_line_item[$ticket_line_item->ID()])) {
+			return $final_prices_per_ticket_line_item[$ticket_line_item->ID()];
 		}
 		$message = sprintf(
 			__(
@@ -1518,10 +1518,10 @@ 
 			),
 			$ticket_line_item->ID()
 		);
-		if ( WP_DEBUG ) {
-			throw new \OutOfRangeException( $message );
+		if (WP_DEBUG) {
+			throw new \OutOfRangeException($message);
 		} else {
-			EE_Log::instance()->log( __CLASS__, __FUNCTION__, $message );
+			EE_Log::instance()->log(__CLASS__, __FUNCTION__, $message);
 		}
 		return null;
 	}
@@ -1537,15 +1537,15 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function billable_line_item_tree( EE_Line_Item $line_item, $registrations ) {
-		$copy_li = EEH_Line_Item::billable_line_item( $line_item, $registrations );
-		foreach ( $line_item->children() as $child_li ) {
-			$copy_li->add_child_line_item( EEH_Line_Item::billable_line_item_tree( $child_li, $registrations ) );
+	public static function billable_line_item_tree(EE_Line_Item $line_item, $registrations) {
+		$copy_li = EEH_Line_Item::billable_line_item($line_item, $registrations);
+		foreach ($line_item->children() as $child_li) {
+			$copy_li->add_child_line_item(EEH_Line_Item::billable_line_item_tree($child_li, $registrations));
 		}
 		//if this is the grand total line item, make sure the totals all add up
 		//(we could have duplicated this logic AS we copied the line items, but
 		//it seems DRYer this way)
-		if ( $copy_li->type() === EEM_Line_Item::type_total ) {
+		if ($copy_li->type() === EEM_Line_Item::type_total) {
 			$copy_li->recalculate_total_including_taxes();
 		}
 		return $copy_li;
@@ -1562,24 +1562,24 @@ 
 	 * @throws \EE_Error
 	 * @param EE_Registration[] $registrations
 	 */
-	public static function billable_line_item( EE_Line_Item $line_item, $registrations ) {
+	public static function billable_line_item(EE_Line_Item $line_item, $registrations) {
 		$new_li_fields = $line_item->model_field_array();
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket'
 		) {
 			$count = 0;
-			foreach ( $registrations as $registration ) {
-				if ( $line_item->OBJ_ID() === $registration->ticket_ID() &&
-					in_array( $registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment() )
+			foreach ($registrations as $registration) {
+				if ($line_item->OBJ_ID() === $registration->ticket_ID() &&
+					in_array($registration->status_ID(), EEM_Registration::reg_statuses_that_allow_payment())
 				) {
 					$count++;
 				}
 			}
-			$new_li_fields[ 'LIN_quantity' ] = $count;
+			$new_li_fields['LIN_quantity'] = $count;
 		}
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ], $new_li_fields[ 'LIN_parent' ], $new_li_fields[ 'LIN_total' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID'], $new_li_fields['LIN_parent'], $new_li_fields['LIN_total']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1592,19 +1592,19 @@ 
 	 * @return \EE_Line_Item|null
 	 * @throws \EE_Error
 	 */
-	public static function non_empty_line_items( EE_Line_Item $line_item ) {
-		$copied_li = EEH_Line_Item::non_empty_line_item( $line_item );
-		if ( $copied_li === null ) {
+	public static function non_empty_line_items(EE_Line_Item $line_item) {
+		$copied_li = EEH_Line_Item::non_empty_line_item($line_item);
+		if ($copied_li === null) {
 			return null;
 		}
 		//if this is an event subtotal, we want to only include it if it
 		//has a non-zero total and at least one ticket line item child
 		$ticket_children = 0;
-		foreach ( $line_item->children() as $child_li ) {
-			$child_li_copy = EEH_Line_Item::non_empty_line_items( $child_li );
-			if ( $child_li_copy !== null ) {
-				$copied_li->add_child_line_item( $child_li_copy );
-				if ( $child_li_copy->type() === EEM_Line_Item::type_line_item &&
+		foreach ($line_item->children() as $child_li) {
+			$child_li_copy = EEH_Line_Item::non_empty_line_items($child_li);
+			if ($child_li_copy !== null) {
+				$copied_li->add_child_line_item($child_li_copy);
+				if ($child_li_copy->type() === EEM_Line_Item::type_line_item &&
 					$child_li_copy->OBJ_type() === 'Ticket'
 				) {
 					$ticket_children++;
@@ -1634,8 +1634,8 @@ 
 	 * @return EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function non_empty_line_item( EE_Line_Item $line_item ) {
-		if ( $line_item->type() === EEM_Line_Item::type_line_item &&
+	public static function non_empty_line_item(EE_Line_Item $line_item) {
+		if ($line_item->type() === EEM_Line_Item::type_line_item &&
 			$line_item->OBJ_type() === 'Ticket' &&
 			$line_item->quantity() === 0
 		) {
@@ -1643,8 +1643,8 @@ 
 		}
 		$new_li_fields = $line_item->model_field_array();
 		//don't set the total. We'll leave that up to the code that calculates it
-		unset( $new_li_fields[ 'LIN_ID' ], $new_li_fields[ 'LIN_parent' ] );
-		return EE_Line_Item::new_instance( $new_li_fields );
+		unset($new_li_fields['LIN_ID'], $new_li_fields['LIN_parent']);
+		return EE_Line_Item::new_instance($new_li_fields);
 	}
 
 
@@ -1656,9 +1656,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function get_items_subtotal( EE_Line_Item $total_line_item ){
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::get_pre_tax_subtotal( $total_line_item );
+	public static function get_items_subtotal(EE_Line_Item $total_line_item) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::get_items_subtotal()', __('Method replaced with EEH_Line_Item::get_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::get_pre_tax_subtotal($total_line_item);
 	}
 
 
@@ -1669,9 +1669,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_total_line_item( $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0' );
-		return self::create_total_line_item( $transaction );
+	public static function create_default_total_line_item($transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_total_line_item()', __('Method replaced with EEH_Line_Item::create_total_line_item()', 'event_espresso'), '4.6.0');
+		return self::create_total_line_item($transaction);
 	}
 
 
@@ -1683,9 +1683,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_tickets_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_pre_tax_subtotal( $total_line_item, $transaction );
+	public static function create_default_tickets_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_tickets_subtotal()', __('Method replaced with EEH_Line_Item::create_pre_tax_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_pre_tax_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1697,9 +1697,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_taxes_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_taxes_subtotal( $total_line_item, $transaction );
+	public static function create_default_taxes_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_taxes_subtotal()', __('Method replaced with EEH_Line_Item::create_taxes_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_taxes_subtotal($total_line_item, $transaction);
 	}
 
 
@@ -1711,9 +1711,9 @@ 
 	 * @return \EE_Line_Item
 	 * @throws \EE_Error
 	 */
-	public static function create_default_event_subtotal( EE_Line_Item $total_line_item, $transaction = NULL) {
-		EE_Error::doing_it_wrong( 'EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0' );
-		return self::create_event_subtotal( $total_line_item, $transaction );
+	public static function create_default_event_subtotal(EE_Line_Item $total_line_item, $transaction = NULL) {
+		EE_Error::doing_it_wrong('EEH_Line_Item::create_default_event_subtotal()', __('Method replaced with EEH_Line_Item::create_event_subtotal()', 'event_espresso'), '4.6.0');
+		return self::create_event_subtotal($total_line_item, $transaction);
 	}
 
 

core/db_models/EEM_Attendee.model.php

Spacing +55 added lines, -55 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
+require_once (EE_MODELS.'EEM_Base.model.php');
 
 /**
  *
@@ -21,60 +21,60 @@ 
 	 * Please instead use the EEM_Attendee::system_question_* constants
 	 * @deprecated
 	 */
-	const fname_question_id=1;
+	const fname_question_id = 1;
 
 	/**
 	 * @deprecated
 	 */
-	const lname_question_id=2;
+	const lname_question_id = 2;
 
 
 	/**
 	 * @deprecated
 	 */
-	const email_question_id=3;
+	const email_question_id = 3;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address_question_id=4;
+	const address_question_id = 4;
 
 
 	/**
 	 * @deprecated
 	 */
-	const address2_question_id=5;
+	const address2_question_id = 5;
 
 
 	/**
 	 * @deprecated
 	 */
-	const city_question_id=6;
+	const city_question_id = 6;
 
 
 	/**
 	 * @deprecated
 	 */
-	const state_question_id=7;
+	const state_question_id = 7;
 
 
 	/**
 	 * @deprecated
 	 */
-	const country_question_id=8;
+	const country_question_id = 8;
 
 
 	/**
 	 * @deprecated
 	 */
-	const zip_question_id=9;
+	const zip_question_id = 9;
 
 
 	/**
 	 * @deprecated
 	 */
-	const phone_question_id=10;
+	const phone_question_id = 10;
 
 	/**
 	 * When looking for questions that correspond to attendee fields,
@@ -119,9 +119,9 @@ 
 	 * @access protected
 	 * @param null $timezone
 	 */
-	protected function __construct( $timezone = NULL ) {
-		$this->singular_item = __('Attendee','event_espresso');
-		$this->plural_item = __('Attendees','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Attendee', 'event_espresso');
+		$this->plural_item = __('Attendees', 'event_espresso');
 		$this->_tables = array(
 			'Attendee_CPT'=> new EE_Primary_Table('posts', 'ID'),
 			'Attendee_Meta'=>new EE_Secondary_Table('esp_attendee_meta', 'ATTM_ID', 'ATT_ID')
@@ -132,40 +132,40 @@ 
 				'ATT_full_name'=>new EE_Plain_Text_Field('post_title', __("Attendee Full Name", "event_espresso"), false, __("Unknown", "event_espresso")),
 				'ATT_bio'=>new EE_Post_Content_Field('post_content', __("Attendee Biography", "event_espresso"), false, __("No Biography Provided", "event_espresso")),
 				'ATT_slug'=>new EE_Slug_Field('post_name', __("Attendee URL Slug", "event_espresso"), false),
-				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, EE_Datetime_Field::now ),
+				'ATT_created'=>new EE_Datetime_Field('post_date', __("Time Attendee Created", "event_espresso"), false, EE_Datetime_Field::now),
 				'ATT_short_bio'=>new EE_Simple_HTML_Field('post_excerpt', __("Attendee Short Biography", "event_espresso"), true, __("No Biography Provided", "event_espresso")),
-				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, EE_Datetime_Field::now ),
-				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false ),
+				'ATT_modified'=>new EE_Datetime_Field('post_modified', __("Time Attendee Last Modified", "event_espresso"), FALSE, EE_Datetime_Field::now),
+				'ATT_author'=>new EE_WP_User_Field('post_author', __("Creator ID of the first Event attended", "event_espresso"), false),
 				'ATT_parent'=>new EE_DB_Only_Int_Field('post_parent', __("Parent Attendee (unused)", "event_espresso"), false, 0),
-				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'),// EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
+				'post_type'=>new EE_WP_Post_Type_Field('espresso_attendees'), // EE_DB_Only_Text_Field('post_type', __("Post Type of Attendee", "event_espresso"), false,'espresso_attendees'),
 				'status' => new EE_WP_Post_Status_Field('post_status', __('Attendee Status', 'event_espresso'), false, 'publish')
 			),
 			'Attendee_Meta'=>array(
-				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID','event_espresso'), false),
+				'ATTM_ID'=> new EE_DB_Only_Int_Field('ATTM_ID', __('Attendee Meta Row ID', 'event_espresso'), false),
 				'ATT_ID_fk'=>new EE_DB_Only_Int_Field('ATT_ID', __("Foreign Key to Attendee in Post Table", "event_espresso"), false),
-				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name','event_espresso'), true, ''),
-				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name','event_espresso'), true, ''),
-				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1','event_espresso'), true, ''),
-				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2','event_espresso'), true, ''),
-				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City','event_espresso'), true, ''),
-				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State','event_espresso'), true,0,'State'),
-				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country','event_espresso'), true,'','Country'),
-				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code','event_espresso'), true, ''),
-				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address','event_espresso'), true, ''),
-				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone','event_espresso'), true, '')
+				'ATT_fname'=>new EE_Plain_Text_Field('ATT_fname', __('First Name', 'event_espresso'), true, ''),
+				'ATT_lname'=>new EE_Plain_Text_Field('ATT_lname', __('Last Name', 'event_espresso'), true, ''),
+				'ATT_address'=>new EE_Plain_Text_Field('ATT_address', __('Address Part 1', 'event_espresso'), true, ''),
+				'ATT_address2'=>new EE_Plain_Text_Field('ATT_address2', __('Address Part 2', 'event_espresso'), true, ''),
+				'ATT_city'=>new EE_Plain_Text_Field('ATT_city', __('City', 'event_espresso'), true, ''),
+				'STA_ID'=>new EE_Foreign_Key_Int_Field('STA_ID', __('State', 'event_espresso'), true, 0, 'State'),
+				'CNT_ISO'=>new EE_Foreign_Key_String_Field('CNT_ISO', __('Country', 'event_espresso'), true, '', 'Country'),
+				'ATT_zip'=>new EE_Plain_Text_Field('ATT_zip', __('ZIP/Postal Code', 'event_espresso'), true, ''),
+				'ATT_email'=>new EE_Email_Field('ATT_email', __('Email Address', 'event_espresso'), true, ''),
+				'ATT_phone'=>new EE_Plain_Text_Field('ATT_phone', __('Phone', 'event_espresso'), true, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Has_Many_Relation(),
 			'State'=>new EE_Belongs_To_Relation(),
 			'Country'=>new EE_Belongs_To_Relation(),
-			'Event'=>new EE_HABTM_Relation('Registration', FALSE ),
+			'Event'=>new EE_HABTM_Relation('Registration', FALSE),
 			'WP_User' => new EE_Belongs_To_Relation(),
-			'Message' => new EE_Has_Many_Any_Relation( false ), //allow deletion of attendees even if they have messages in the queue for them.
+			'Message' => new EE_Has_Many_Any_Relation(false), //allow deletion of attendees even if they have messages in the queue for them.
 			'Term_Relationship' => new EE_Has_Many_Relation(),
 			'Term_Taxonomy'=>new EE_HABTM_Relation('Term_Relationship'),
 		);
 		$this->_caps_slug = 'contacts';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 
 	}
 
@@ -175,8 +175,8 @@ 
 	 * @param string $system_question_string
 	 * @return string|null if not found
 	 */
-	public function get_attendee_field_for_system_question( $system_question_string ) {
-		return isset( $this->_system_question_to_attendee_field_name[ $system_question_string ] ) ? $this->_system_question_to_attendee_field_name[ $system_question_string ] : null;
+	public function get_attendee_field_for_system_question($system_question_string) {
+		return isset($this->_system_question_to_attendee_field_name[$system_question_string]) ? $this->_system_question_to_attendee_field_name[$system_question_string] : null;
 	}
 
 
@@ -187,8 +187,8 @@ 
 	 * @param EE_Transaction/int $transaction_id_or_obj EE_Transaction or its ID
 	 * @return EE_Attendee[]
 	 */
-	public function get_attendees_for_transaction( $transaction_id_or_obj ){
-		return $this->get_all( array( array(
+	public function get_attendees_for_transaction($transaction_id_or_obj) {
+		return $this->get_all(array(array(
 			  'Registration.Transaction.TXN_ID' => $transaction_id_or_obj instanceof EE_Transaction ? $transaction_id_or_obj->ID() : $transaction_id_or_obj
 		  )));
 	}
@@ -203,9 +203,9 @@ 
 	*		@return 		mixed		array on success, FALSE on fail
 	 * 		@deprecated
 	*/
-	public function get_attendee_by_ID( $ATT_ID = FALSE ) {
+	public function get_attendee_by_ID($ATT_ID = FALSE) {
 		// retrieve a particular EE_Attendee
-		return $this->get_one_by_ID( $ATT_ID );
+		return $this->get_one_by_ID($ATT_ID);
 	}
 
 
@@ -218,14 +218,14 @@ 
 	* 		@param		array $where_cols_n_values
 	*		@return 		mixed		array on success, FALSE on fail
 	*/
-	public function get_attendee( $where_cols_n_values = array() ) {
+	public function get_attendee($where_cols_n_values = array()) {
 
-		if ( empty( $where_cols_n_values )) {
+		if (empty($where_cols_n_values)) {
 			return FALSE;
 		}
-		$attendee = $this->get_all( array($where_cols_n_values ));
-		if ( ! empty( $attendee )) {
-			return array_shift( $attendee );
+		$attendee = $this->get_all(array($where_cols_n_values));
+		if ( ! empty($attendee)) {
+			return array_shift($attendee);
 		} else {
 			return FALSE;
 		}
@@ -241,20 +241,20 @@ 
 	 * @param array $where_cols_n_values
 	 * @return bool|mixed
 	 */
-	public function find_existing_attendee( $where_cols_n_values = NULL ) {
+	public function find_existing_attendee($where_cols_n_values = NULL) {
 		// search by combo of first and last names plus the email address
-		$attendee_data_keys = array( 'ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email );
+		$attendee_data_keys = array('ATT_fname' => $this->_ATT_fname, 'ATT_lname' => $this->_ATT_lname, 'ATT_email' => $this->_ATT_email);
 		// no search params means attendee object already exists.
-		$where_cols_n_values = is_array( $where_cols_n_values ) && ! empty( $where_cols_n_values ) ? $where_cols_n_values : $attendee_data_keys;
+		$where_cols_n_values = is_array($where_cols_n_values) && ! empty($where_cols_n_values) ? $where_cols_n_values : $attendee_data_keys;
 		$valid_data = TRUE;
 		// check for required values
-		$valid_data = isset( $where_cols_n_values['ATT_fname'] ) && ! empty( $where_cols_n_values['ATT_fname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_lname'] ) && ! empty( $where_cols_n_values['ATT_lname'] ) ? $valid_data : FALSE;
-		$valid_data = isset( $where_cols_n_values['ATT_email'] ) && ! empty( $where_cols_n_values['ATT_email'] ) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_fname']) && ! empty($where_cols_n_values['ATT_fname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_lname']) && ! empty($where_cols_n_values['ATT_lname']) ? $valid_data : FALSE;
+		$valid_data = isset($where_cols_n_values['ATT_email']) && ! empty($where_cols_n_values['ATT_email']) ? $valid_data : FALSE;
 
-		if ( $valid_data ) {
-			$attendee = $this->get_attendee( $where_cols_n_values );
-			if ( $attendee instanceof EE_Attendee ) {
+		if ($valid_data) {
+			$attendee = $this->get_attendee($where_cols_n_values);
+			if ($attendee instanceof EE_Attendee) {
 				return $attendee;
 			}
 		}
@@ -272,12 +272,12 @@ 
              * @param  array $ids array of EE_Registration ids
              * @return  EE_Attendee[]
              */
-            public function get_array_of_contacts_from_reg_ids( $ids ) {
+            public function get_array_of_contacts_from_reg_ids($ids) {
                 $ids = (array) $ids;
                 $_where = array(
-                    'Registration.REG_ID' => array( 'in', $ids )
+                    'Registration.REG_ID' => array('in', $ids)
                     );
-                return $this->get_all( array( $_where ) );
+                return $this->get_all(array($_where));
             }
 
 

modules/gateways/Invoice/lib/templates/receipt_body.template.php

Spacing +62 added lines, -62 removed lines

@@ -36,53 +36,53 @@ 
 						<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso')?></h2>
 						<h3 id="invoice-date"><?php _e('Date:', 'event_espresso')?> <span class="plain-text">[registration_date]</span></h3>
 						<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso')?> <span class="plain-text">[transaction_id]</span></h3>
-						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status();?></span></h3>
+						<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso')?> <span class="<?php echo $transaction->status_ID()?> plain-text"><?php echo $transaction->pretty_status(); ?></span></h3>
 					</div>
 				</td>
 			</tr>
 		</table>
 		<div class="events">
-		<?php foreach($events_for_txn as $event_id => $event){
-			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png';?>"><?php _e("Event Name:","event_espresso")?> <span class="plain-text"><?php echo $event->name();?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
-			<?php if (strlen($event->description()>1)){?><p class="event-description"><?php $event->description()?></p><?php }?>
+		<?php foreach ($events_for_txn as $event_id => $event) {
+			?><h3 class="section-title event-name"><img class="icon" src="<?php echo EE_IMAGES_URL.'calendar_year-24x24.png'; ?>"><?php _e("Event Name:", "event_espresso")?> <span class="plain-text"><?php echo $event->name(); ?></span> <span class="small-text link">[ <a href='<?php echo $event->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></h3>
+			<?php if (strlen($event->description() > 1)) {?><p class="event-description"><?php $event->description()?></p><?php }?>
 			<ul class="tickets-per-event">
-			<?php foreach($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item){
+			<?php foreach ($ticket_line_items_per_event[$event_id] as $line_item_id => $line_item) {
 				$ticket = $line_item->ticket();
-				$taxable_html = $ticket->taxable() ? '*': '';
+				$taxable_html = $ticket->taxable() ? '*' : '';
 				$subitems = $line_item->children();
-				$ticket_uses = $ticket->get_pretty('TKT_uses',  __("any", "event_espresso"));
+				$ticket_uses = $ticket->get_pretty('TKT_uses', __("any", "event_espresso"));
 			?>
 				<li class="event-ticket">
 					<div class="ticket-details">
 						<table class="invoice-amount">
 							<thead>
 								<tr class="header_row">
-									<th class="name-column"><?php _e("Ticket", "event_espresso");?></th>
-									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Quantity", "event_espresso");?></th>
-									<th class="number-column item_c"><?php _e("Price", "event_espresso");?></th>
-									<th class="number-column item_r"><?php _e("Total", "event_espresso");?></th>
+									<th class="name-column"><?php _e("Ticket", "event_espresso"); ?></th>
+									<th colspan="2" class="desc-column"><?php _e("Description", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Quantity", "event_espresso"); ?></th>
+									<th class="number-column item_c"><?php _e("Price", "event_espresso"); ?></th>
+									<th class="number-column item_r"><?php _e("Total", "event_espresso"); ?></th>
 								</tr>
 							</thead>
 							<tbody>
-								<?php if( count($subitems) < 2){?>
+								<?php if (count($subitems) < 2) {?>
 								<tr class="item">
 									<td><?php echo $line_item->name().$taxable_html?></td>
-									<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+									<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 									<td class="item_c"><?php echo $line_item->quantity()?></td>
 									<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 									<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 								</tr>
-								<?php }else{?>
+								<?php } else {?>
 									<tr class="item">
 										<td class="aln-left"><?php echo $line_item->name().$taxable_html?></td>
-										<td colspan="2"><?php echo $line_item->desc();?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
+										<td colspan="2"><?php echo $line_item->desc(); ?><p class="ticket-note"><?php echo sprintf(__('This ticket can be used once at %s of the dates/times below.', 'event_espresso'), $ticket_uses); ?></p></td>
 										<td class="item_c"><?php echo $line_item->quantity()?></td>
 										<td class="item_c"><?php echo $line_item->unit_price_no_code()?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
-									<?php foreach($subitems as $sub_line_item){
-										$is_percent = $sub_line_item->is_percent();?>
+									<?php foreach ($subitems as $sub_line_item) {
+										$is_percent = $sub_line_item->is_percent(); ?>
 										<tr class="subitem-row">
 											<td class="subitem"><?php echo $sub_line_item->name()?></td>
 											<td colspan="2"><?php echo $sub_line_item->desc()?></td>
@@ -93,7 +93,7 @@ 
 									<?php } ?>
 									<tr class="total_tr odd">
 										<td colspan="4"></td>
-										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso");?></td>
+										<td class="total" nowrap="nowrap"><?php _e("Ticket Total:", "event_espresso"); ?></td>
 										<td class="item_r"><?php echo $line_item->total_no_code()?></td>
 									</tr>
 								<?php }?>
@@ -104,22 +104,22 @@ 
 					<div class="reg-details-for-ticket">
 						<div class="ticket-time-and-place-details">
 							<div class="ticket-time-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png';?>"><?php echo _n("Date/Time:","Dates/Times:",count($ticket->datetimes()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'clock-16x16.png'; ?>"><?php echo _n("Date/Time:", "Dates/Times:", count($ticket->datetimes()), "event_espresso"); ?></h4>
 								<ul class="event-dates">
-									<?php foreach($ticket->datetimes_ordered() as $datetime){
+									<?php foreach ($ticket->datetimes_ordered() as $datetime) {
 										/* @var $datetime EE_Datetime */ ?>
 									<li><?php
-										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '' ;
-										echo sprintf(__("%s - %s (%s)", "event_espresso"),$datetime->start_date_and_time(),$datetime->end_date_and_time(),$datetime->get_timezone());
+										echo $datetime->name() ? '<b>'.$datetime->name().' </b>' : '';
+										echo sprintf(__("%s - %s (%s)", "event_espresso"), $datetime->start_date_and_time(), $datetime->end_date_and_time(), $datetime->get_timezone());
 										echo $datetime->description() ? '<p class="ticket-note">'.$datetime->description().'</p>' : '' ?></li>
 									<?php }?>
 								</ul>
 							</div>
-							<?php if ($event->venues()){?>
+							<?php if ($event->venues()) {?>
 							<div class="ticket-place-details">
-								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png';?>"><?php echo _n("Venue:","Venues:",count($event->venues()), "event_espresso");?></h4>
+								<h4 class="sub-section-title no-bottom-margin"><img class="icon" src="<?php echo EE_IMAGES_URL.'location-pin-16x16.png'; ?>"><?php echo _n("Venue:", "Venues:", count($event->venues()), "event_espresso"); ?></h4>
 								<ul class="event-venues">
-									<?php foreach($event->venues() as $venue){?>
+									<?php foreach ($event->venues() as $venue) {?>
 									<li><?php echo $venue->name()?> <span class="small-text">[ <a href='<?php echo $venue->get_permalink()?>'><?php _e('view', 'event_espresso'); ?></a> ]</span></li>
 									<?php } ?>
 								</ul>
@@ -127,34 +127,34 @@ 
 							<?php }?>
 						</div>
 						<div class="ticket-registrations-area">
-							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png';?>"><?php echo __("Registration Details", "event_espresso");?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
+							<h4 class="sub-section-title"><img class="icon" src="<?php echo EE_IMAGES_URL.'users-16x16.png'; ?>"><?php echo __("Registration Details", "event_espresso"); ?> <span class="small-text link">[ <a class="print_button noPrint" href="<?php echo $edit_reg_info_url; ?>"><?php _e('edit', 'event_espresso'); ?></a> ]</span></h4>
 							<ul class="ticket-registrations-list">
-								<?php foreach($registrations_per_line_item[$line_item_id] as $registration){
+								<?php foreach ($registrations_per_line_item[$line_item_id] as $registration) {
 									/* @var $registration EE_Registration */
 									$attendee = $registration->attendee();
-									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC')));?>
+									$answers = $registration->answers(array('order_by'=>array('Question.Question_Group_Question.QGQ_order'=>'ASC'))); ?>
 								<li class="ticket-registration">
 									<table class="registration-details">
 										<tr class="odd">
-											<th><?php echo 	_e("Registration Code:", "event_espresso");?></th>
-											<td><?php echo $registration->reg_code();?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
+											<th><?php echo 	_e("Registration Code:", "event_espresso"); ?></th>
+											<td><?php echo $registration->reg_code(); ?> - <span class="<?php echo $registration->status_ID()?>"><?php echo $registration->pretty_status()?></span></td>
 										</tr>
 										<?php
-										foreach($event->question_groups() as $question_group){
-											?><tr><th><?php $question_group->e('QSG_name');?></th><td></td></tr><?php
+										foreach ($event->question_groups() as $question_group) {
+											?><tr><th><?php $question_group->e('QSG_name'); ?></th><td></td></tr><?php
 											$has_personal_info = false;
-											foreach($question_group->questions() as $question){
-												if( in_array($question->system_ID(),$questions_to_skip)){
+											foreach ($question_group->questions() as $question) {
+												if (in_array($question->system_ID(), $questions_to_skip)) {
 													$has_personal_info = true;
 													continue;
 												}
 												?><tr>
 														<th><?php echo $question->display_text()?></th>
-														<td><?php echo $registration->answer_value_to_question($question);?></td>
+														<td><?php echo $registration->answer_value_to_question($question); ?></td>
 												</tr><?php
 											}
-											if($has_personal_info){
-												?><tr><th><?php	_e('Attendee', 'event_espresso');?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"),$attendee->full_name(),$attendee->email())?></td></tr><?php
+											if ($has_personal_info) {
+												?><tr><th><?php	_e('Attendee', 'event_espresso'); ?></th><td><?php echo sprintf(__('%s (%s)', "event_espresso"), $attendee->full_name(), $attendee->email())?></td></tr><?php
 											}
 										}
 										?>
@@ -171,21 +171,21 @@ 
 		<?php }?>
 		</div>
 		<div class="taxes">
-			<?php if ($tax_total_line_item && $tax_total_line_item->children()){?>
-				<h3 class="section-title"><?php _e("Taxes",'event_espresso')?></h3>
+			<?php if ($tax_total_line_item && $tax_total_line_item->children()) {?>
+				<h3 class="section-title"><?php _e("Taxes", 'event_espresso')?></h3>
 				<table class="invoice-amount">
 
 					<thead>
 						<tr class="header_row">
-							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso");?></th>
-							<th class="left"><?php _e('Description', 'event_espresso');?></th>
+							<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+							<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
 							<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
 							<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 						</tr>
 					</thead>
 					<tbody>
 						<?php
-						foreach($tax_total_line_item->children() as $child_tax){?>
+						foreach ($tax_total_line_item->children() as $child_tax) {?>
 						<tr>
 							<td><?php echo $child_tax->name()?></td>
 							<td><?php echo $child_tax->desc()?></td>
@@ -195,26 +195,26 @@ 
 						<?php } ?>
 						<tr class="total_tr odd">
 							<td class="total_tr" colspan="2"></td>
-							<td class="total"><?php	_e("Tax Total:", "event_espresso");?></td>
+							<td class="total"><?php	_e("Tax Total:", "event_espresso"); ?></td>
 							<td class="item_r"><?php echo $tax_total_line_item->total_no_code()?></td>
 						</tr>
 					</tbody>
 
 				</table>
 			<?php }?>
-			<p><?php _e("* taxable items", "event_espresso");?></p>
+			<p><?php _e("* taxable items", "event_espresso"); ?></p>
 		</div>
 		<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"),EEH_Template::format_currency($total_cost));?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), EEH_Template::format_currency($total_cost)); ?></h2>
 		</div>
 		<div class="payment-dv">
-			<h3 class="section-title"><?php _e("Payments",'event_espresso')?></h3>
+			<h3 class="section-title"><?php _e("Payments", 'event_espresso')?></h3>
 			<p>[instructions]</p>
 			<table class="invoice-amount">
 				<thead>
 					<tr class="header_row">
 						<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
-						<th class='left datetime_th'><?php _e("Date",'event_espresso')?></th>
+						<th class='left datetime_th'><?php _e("Date", 'event_espresso')?></th>
 						<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
 						<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
@@ -224,11 +224,11 @@ 
 				<tbody>
 					<?php
 					$c = false;
-					if(!empty($payments)){
+					if ( ! empty($payments)) {
 
-						foreach($payments as $payment){
+						foreach ($payments as $payment) {
 							/* @var $payment EE_Payment */?>
-						<tr class='item <?php echo (($c = !$c) ? ' odd' : '')?>'>
+						<tr class='item <?php echo (($c = ! $c) ? ' odd' : '')?>'>
 							<td><?php $payment->e('PAY_gateway')?></td>
 							<td><?php echo $payment->timestamp()?></td>
 							<td><?php $payment->e('PAY_txn_id_chq_nmbr')?></td>
@@ -237,17 +237,17 @@ 
 							<td class='item_r'><?php echo $payment->amount_no_code()?></td>
 						</tr>
 						<?php }
-					}else{?>
+					} else {?>
 						<tr class='item'>
-							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.",'event_espresso')?> </td>
+							<td class='aln-cntr' colspan="6"><?php _e("No approved payments have been received.", 'event_espresso')?> </td>
 						</tr>
 					<?php }
-					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if($amount_owed){?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso");}?></a></td></tr>
+					?><tr class="item" ><td class='aln-cntr' colspan="6"><?php if ($amount_owed) {?><a class="noPrint" href='<?php echo $retry_payment_url?>'><?php _e("Please make a payment.", "event_espresso"); }?></a></td></tr>
 				</tbody>
 				<tfoot>
 					<tr class='total_tr'><td colspan="4">&nbsp;</td>
-						<td class="item_r"><?php _e('Total Paid','event_espresso')?></td>
-						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd,false,false)?> </td>
+						<td class="item_r"><?php _e('Total Paid', 'event_espresso')?></td>
+						<td class="item_r"><?php echo EEH_Template::format_currency($amount_pd, false, false)?> </td>
 					</tr>
 					<?php //echo $discount; ?>
 					<tr class="total_tr odd">
@@ -259,20 +259,20 @@ 
 			</table>
 		</div>
 		<div class="additional-info-dv">
-			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso");?></h3>
+			<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 			<div class="additional-info">
-				<?php if($venues_for_events){?>
-				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso",count($venues_for_events));?></h2>
+				<?php if ($venues_for_events) {?>
+				<h2><?php echo _n("Venue Details:", "Venues Details:", "event_espresso", count($venues_for_events)); ?></h2>
 				<table class="venue-list">
-					<?php foreach($venues_for_events as $venue){?>
+					<?php foreach ($venues_for_events as $venue) {?>
 						<tr class="venue-details">
 							<td class="venue-details-part venue-address-dv">
 								<h3><a href='<?php echo $venue->get_permalink()?>'><?php
 									echo $venue->name()
 								?></a></h3>
 								<p><?php echo $venue->description()?></p>
-								<?php echo  EEH_Address::format($venue);?></td>
-							<?php if($venue->enable_for_gmap()){?>
+								<?php echo  EEH_Address::format($venue); ?></td>
+							<?php if ($venue->enable_for_gmap()) {?>
 								<td class="venue-details-part venue-image-dv"><?php echo EEH_Venue_View::espresso_google_static_map($venue)?></td>
 							<?php } ?>
 						</tr>

core/libraries/messages/defaults/default/html_receipt_content.template.php

Spacing +28 added lines, -28 removed lines

@@ -23,15 +23,15 @@ 
 			</td>
 			<td>
 				<div id="invoice-info">
-					<h2 id="invoice-hdr"><?php _e( 'Order Confirmation', 'event_espresso' ) ?></h2>
+					<h2 id="invoice-hdr"><?php _e('Order Confirmation', 'event_espresso') ?></h2>
 
-					<h3 id="invoice-date"><?php _e( 'Date:', 'event_espresso' ) ?>
+					<h3 id="invoice-date"><?php _e('Date:', 'event_espresso') ?>
 						<span class="plain-text">[PRIMARY_REGISTRANT_REGISTRATION_DATE]</span></h3>
 
-					<h3 id="invoice-txn-id"><?php _e( 'Transaction ID:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-id"><?php _e('Transaction ID:', 'event_espresso') ?>
 						<span class="plain-text">[TXN_ID]</span></h3>
 
-					<h3 id="invoice-txn-status"><?php _e( 'Status:', 'event_espresso' ) ?>
+					<h3 id="invoice-txn-status"><?php _e('Status:', 'event_espresso') ?>
 						<span class="[TXN_STATUS_ID] plain-text">[TXN_STATUS]</span></h3>
 				</div>
 			</td>
@@ -41,15 +41,15 @@ 
 		[EVENT_LIST]
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Additional Charges/Discounts", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Additional Charges/Discounts", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Quantity', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Unit Price', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Total', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Quantity', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Unit Price', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -60,15 +60,15 @@ 
 		</table>
 	</div>
 	<div class="taxes">
-		<h3 class="section-title"><?php _e( "Taxes", 'event_espresso' ) ?></h3>
-		<p><?php printf( __( '%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso' ), '<strong>', '</strong>' ); ?></p>
+		<h3 class="section-title"><?php _e("Taxes", 'event_espresso') ?></h3>
+		<p><?php printf(__('%s*%s Taxable items. The total amount collected for taxes is reflected in the total(s) below.', 'event_espresso'), '<strong>', '</strong>'); ?></p>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th class="left ticket_th"><?php _e( "Tax Name", "event_espresso" ); ?></th>
-					<th class="left"><?php _e( 'Description', 'event_espresso' ); ?></th>
-					<th class="event_th item_c"><?php _e( 'Rate', 'event_espresso' ); ?></th>
-					<th class="subtotal_th"><?php _e( 'Tax Amount', 'event_espresso' ); ?></th>
+					<th class="left ticket_th"><?php _e("Tax Name", "event_espresso"); ?></th>
+					<th class="left"><?php _e('Description', 'event_espresso'); ?></th>
+					<th class="event_th item_c"><?php _e('Rate', 'event_espresso'); ?></th>
+					<th class="subtotal_th"><?php _e('Tax Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -79,19 +79,19 @@ 
 		</table>
 	</div>
 	<div class="grand-total-dv">
-		<h2 class="grand-total"><?php printf( __( "Grand Total: %s", "event_espresso" ), '[TOTAL_COST]' ); ?></h2>
+		<h2 class="grand-total"><?php printf(__("Grand Total: %s", "event_espresso"), '[TOTAL_COST]'); ?></h2>
 	</div>
 	<div class="payment-dv">
-		<h3 class="section-title"><?php _e( "Payments", 'event_espresso' ) ?></h3>
+		<h3 class="section-title"><?php _e("Payments", 'event_espresso') ?></h3>
 		<table class="invoice-amount">
 			<thead>
 				<tr class="header_row">
-					<th><span class=""><?php _e( 'Payment Method', 'event_espresso' ); ?></span></th>
-					<th class='left datetime_th'><?php _e( "Date", 'event_espresso' ) ?></th>
-					<th><span class=""><?php _e( 'Transaction Id / Cheque #', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'P.O. / S.O.#', 'event_espresso' ); ?></span></th>
-					<th><span class=""><?php _e( 'Status', 'event_espresso' ); ?></span></th>
-					<th><?php _e( 'Amount', 'event_espresso' ); ?></th>
+					<th><span class=""><?php _e('Payment Method', 'event_espresso'); ?></span></th>
+					<th class='left datetime_th'><?php _e("Date", 'event_espresso') ?></th>
+					<th><span class=""><?php _e('Transaction Id / Cheque #', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('P.O. / S.O.#', 'event_espresso'); ?></span></th>
+					<th><span class=""><?php _e('Status', 'event_espresso'); ?></span></th>
+					<th><?php _e('Amount', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
@@ -105,21 +105,21 @@ 
 			<tfoot>
 				<tr class='total_tr'>
 					<td colspan="4">&nbsp;</td>
-					<td class="item_r"><?php _e( 'Total Paid', 'event_espresso' ) ?></td>
+					<td class="item_r"><?php _e('Total Paid', 'event_espresso') ?></td>
 					<td class="item_r">[TOTAL_AMOUNT_PAID]</td>
 				</tr>
 				<tr class="total_tr odd">
 					<td colspan="4">&nbsp;</td>
-					<td class="total" id="total_currency"><?php _e( 'Amount Owed:', 'event_espresso' ); ?></td>
+					<td class="total" id="total_currency"><?php _e('Amount Owed:', 'event_espresso'); ?></td>
 					<td class="total">[TOTAL_OWING]</td>
 				</tr>
 			</tfoot>
 		</table>
 	</div>
 	<div class="additional-info-dv">
-		<h3 class="section-title"><?php _e( "Additional Information:", "event_espresso" ); ?></h3>
+		<h3 class="section-title"><?php _e("Additional Information:", "event_espresso"); ?></h3>
 		<div class="additional-info">
-			<h2><?php _e( "Venue Details:", "event_espresso" ); ?></h2>
+			<h2><?php _e("Venue Details:", "event_espresso"); ?></h2>
 			<table class="venue-list">
 				<tr class="venue-details">
 					<td class="venue-details-part venue-address-dv">

core/db_models/EEM_Term_Relationship.model.php

Spacing +45 added lines, -45 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -24,18 +24,18 @@ 
 	 *
 	 * @param string $timezone
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __( 'Term Relationship', 'event_espresso' );
-		$this->plural_item = __( 'Term Relationships', 'event_espresso' );
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Term Relationship', 'event_espresso');
+		$this->plural_item = __('Term Relationships', 'event_espresso');
 		$this->_tables = array(
-			'Term_Relationship' => new EE_Primary_Table( 'term_relationships' ),
+			'Term_Relationship' => new EE_Primary_Table('term_relationships'),
 		);
-		$models_this_can_attach_to = array_keys( EE_Registry::instance()->cpt_models() );
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->cpt_models());
 		$this->_fields = array(
 			'Term_Relationship' => array(
 				'object_id'        => new EE_Foreign_Key_Int_Field(
 					'object_id',
-					__( 'Object(Post) ID', 'event_espresso' ),
+					__('Object(Post) ID', 'event_espresso'),
 					false,
 					0,
 					$models_this_can_attach_to
@@ -51,63 +51,63 @@ 
 					'Term_Taxonomy'
 				),
 				'term_order'       => new EE_Integer_Field(
-					'term_order', __( 'Term Order', 'event_espresso' ), false, 0
+					'term_order', __('Term Order', 'event_espresso'), false, 0
 				),
 			),
 		);
 		$this->_model_relations = array(
 			'Term_Taxonomy' => new EE_Belongs_To_Relation(),
 		);
-		foreach ( $models_this_can_attach_to as $model_name ) {
-			$this->_model_relations[ $model_name ] = new EE_Belongs_To_Relation();
+		foreach ($models_this_can_attach_to as $model_name) {
+			$this->_model_relations[$model_name] = new EE_Belongs_To_Relation();
 		}
 		$this->_indexes = array(
-			'PRIMARY' => new EE_Primary_Key_Index( array( 'object_id', 'term_taxonomy_id' ) ),
+			'PRIMARY' => new EE_Primary_Key_Index(array('object_id', 'term_taxonomy_id')),
 		);
 		$path_to_event_model = 'Event.';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Event_Related_Public(
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Event_Related_Public(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = new EE_Restriction_Generator_Event_Related_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = new EE_Restriction_Generator_Event_Related_Protected(
 			$path_to_event_model, EEM_Base::caps_edit
 		);
 		$path_to_tax_model = 'Term_Taxonomy.';
 		//add cap restrictions for editing term relations to the "ee_assign_*"
 		//and for deleting term relations too
-		$cap_contexts_affected = array( EEM_Base::caps_edit, EEM_Base::caps_delete );
-		foreach ( $cap_contexts_affected as $cap_context_affected ) {
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
+		$cap_contexts_affected = array(EEM_Base::caps_edit, EEM_Base::caps_delete);
+		foreach ($cap_contexts_affected as $cap_context_affected) {
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_event_category' => array(
+					$path_to_tax_model.'taxonomy*ee_assign_event_category' => array(
 						'!=',
 						'espresso_event_categories',
 					),
 				)
 			);
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_venue_category'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_venue_category' => array(
+					$path_to_tax_model.'taxonomy*ee_assign_venue_category' => array(
 						'!=',
 						'espresso_venue_categories',
 					),
 				)
 			);
-			$this->_cap_restrictions[ $cap_context_affected ]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
+			$this->_cap_restrictions[$cap_context_affected]['ee_assign_event_type'] = new EE_Default_Where_Conditions(
 				array(
-					$path_to_tax_model . 'taxonomy*ee_assign_event_type' => array( '!=', 'espresso_event_type' ),
+					$path_to_tax_model.'taxonomy*ee_assign_event_type' => array('!=', 'espresso_event_type'),
 				)
 			);
 		}
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 		add_filter(
 			'FHEE__Read__create_model_query_params',
-			array( 'EEM_Term_Relationship', 'rest_api_query_params' ),
+			array('EEM_Term_Relationship', 'rest_api_query_params'),
 			10,
 			3
 		);
@@ -122,12 +122,12 @@ 
 	 * @global wpdb $wpdb
 	 * @return int the number of rows affected
 	 */
-	public function update_term_taxonomy_counts( $term_taxonomy_id = null ) {
+	public function update_term_taxonomy_counts($term_taxonomy_id = null) {
 		//because this uses a subquery and sometimes assigning to column to be another column's
 		//value, we just write the SQL directly.
 		global $wpdb;
-		if ( $term_taxonomy_id ) {
-			$second_operand = $wpdb->prepare( '%d', $term_taxonomy_id );
+		if ($term_taxonomy_id) {
+			$second_operand = $wpdb->prepare('%d', $term_taxonomy_id);
 		} else {
 			$second_operand = 'tr.term_taxonomy_id';
 		}
@@ -152,10 +152,10 @@ 
 	 * @param array $field_n_values @see EEM_Base::insert
 	 * @return boolean
 	 */
-	public function insert( $field_n_values ) {
-		$return = parent::insert( $field_n_values );
-		if ( isset( $field_n_values['term_taxonomy_id'] ) ) {
-			$this->update_term_taxonomy_counts( $field_n_values['term_taxonomy_id'] );
+	public function insert($field_n_values) {
+		$return = parent::insert($field_n_values);
+		if (isset($field_n_values['term_taxonomy_id'])) {
+			$this->update_term_taxonomy_counts($field_n_values['term_taxonomy_id']);
 		}
 		return $return;
 	}
@@ -175,9 +175,9 @@ 
 	 *                                         could get out-of-sync with the database
 	 * @return int
 	 */
-	public function update( $fields_n_values, $query_params, $keep_model_objs_in_sync = true ) {
-		$count = parent::update( $fields_n_values, $query_params, $keep_model_objs_in_sync );
-		if ( $count ) {
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = true) {
+		$count = parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -193,9 +193,9 @@ 
 	 * @param boolean $allow_blocking
 	 * @return int @see EEM_Base::delete
 	 */
-	public function delete( $query_params, $allow_blocking = true ) {
-		$count = parent::delete( $query_params, $allow_blocking );
-		if ( $count ) {
+	public function delete($query_params, $allow_blocking = true) {
+		$count = parent::delete($query_params, $allow_blocking);
+		if ($count) {
 			$this->update_term_taxonomy_counts();
 		}
 		return $count;
@@ -212,11 +212,11 @@ 
 	 * @param EEM_Base $model
 	 * @return array
 	 */
-	public static function rest_api_query_params( $model_query_params, $querystring_query_params, $model ) {
-		if ( $model === EEM_Term_Relationship::instance() ) {
-			$taxonomies = get_taxonomies( array( 'show_in_rest' => true ) );
-			if ( ! empty( $taxonomies ) ) {
-				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array( 'IN', $taxonomies );
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model) {
+		if ($model === EEM_Term_Relationship::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if ( ! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
 			}
 		}
 		return $model_query_params;

core/db_models/EEM_Base.model.php

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;
@@ -1004,7 +1004,7 @@ 
 		$conditions_from_id = $this->parse_index_primary_key_string( $id );
 		if( $conditions_from_id === null ) {
 			$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 ) );
 		}
@@ -1031,7 +1031,7 @@ 
 		$items = $this->get_all($query_params);
 		if(empty($items)){
 			return null;
-		}else{
+		} else{
 			return array_shift($items);
 		}
 	}
@@ -1417,7 +1417,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;
 				}
@@ -1456,7 +1456,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();
@@ -1520,9 +1520,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());
 		}
@@ -1549,7 +1549,7 @@ 
 		$col = $this->get_col( $query_params, $field_to_select );
 		if( ! empty( $col ) ) {
 			return reset( $col );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -1676,7 +1676,7 @@ 
 
 			//		/echo "delete sql:$SQL";
 			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+		} else{
 			$rows_deleted = 0;
 		}
 
@@ -1720,7 +1720,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
@@ -1733,7 +1733,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);
 				}
 
@@ -1806,7 +1806,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?
@@ -1822,7 +1822,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)));
@@ -1846,10 +1846,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{
+		} else{
 			//there's no primary key
 			//if we're counting distinct items, and there's no primary key,
 			//we need to list out the columns for distinction;
@@ -1887,7 +1887,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();
@@ -1897,7 +1897,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;
 		}
 	}
@@ -1935,10 +1935,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' ),
@@ -2280,7 +2280,7 @@ 
 		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
 		if( $results ){
 			return array_shift($results);
-		}else{
+		} else{
 			return null;
 		}
 
@@ -2351,7 +2351,7 @@ 
 			 */
 			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
 			return $new_id;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -2413,9 +2413,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(
 					__(
@@ -2440,7 +2440,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);
 		}
 	}
@@ -2521,12 +2521,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);
@@ -2578,7 +2578,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else{
 			return $value;
 		}
 	}
@@ -2747,10 +2747,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){
@@ -3028,7 +3028,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));
 		}
 	}
@@ -3106,7 +3106,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;
 			}
 		}
@@ -3232,7 +3232,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));
 			}
@@ -3241,7 +3241,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' ),
@@ -3272,12 +3272,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;
 			}
@@ -3342,7 +3342,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
 		if($SQL){
 			return " WHERE ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 	}
@@ -3361,7 +3361,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
 		if($SQL){
 			return " HAVING ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 
@@ -3383,7 +3383,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));
 		}
 	}
@@ -3416,14 +3416,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));
 					}
 				}
@@ -3448,11 +3448,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)));
 		}
 	}
@@ -3469,7 +3469,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;
 		}
@@ -3654,7 +3654,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)));
 			}
@@ -3683,14 +3683,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;
 		}
 	}
@@ -3709,7 +3709,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)));
 		}
 	}
@@ -3780,7 +3780,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);
 				}
@@ -3893,7 +3893,7 @@ 
 		$fieldSettings = $this->field_settings(true);
 		if( isset($fieldSettings[$fieldName])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3907,7 +3907,7 @@ 
 		$relations = $this->relation_settings();
 		if(isset($relations[$relation_name])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3958,7 +3958,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;
 			}
 		}
@@ -4038,7 +4038,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){
@@ -4174,7 +4174,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;
@@ -4189,7 +4189,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 );
 		}
 
@@ -4302,7 +4302,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() ){
@@ -4332,7 +4332,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;
@@ -4366,7 +4366,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			return $this->get_one_by_ID( $id );
 		}
 	}
@@ -4401,7 +4401,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			$this->add_to_entity_map( $replacing_model_obj );
 			return $replacing_model_obj;
 		}
@@ -4546,13 +4546,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;
@@ -4700,9 +4700,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
@@ -4712,7 +4712,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);
@@ -4737,7 +4737,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;
 		}
 	}
@@ -4771,7 +4771,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))));
 		}
 	}
@@ -4976,7 +4976,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' ),

Spacing +982 added lines, -982 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;
@@ -614,24 +614,24 @@ 
 	 * @return EEM_Base|null (if the model was already instantiated, returns it, with 
 	 * all its properties reset; if it wasn't instantiated, returns null)
 	 */
-	public static function reset(  $timezone = NULL ){
-		if ( static::$_instance instanceof EEM_Base ) {
+	public static function reset($timezone = NULL) {
+		if (static::$_instance instanceof EEM_Base) {
 			//let's try to NOT swap out the current instance for a new one
 			//because if someone has a reference to it, we can't remove their reference
 			//so it's best to keep using the same reference, but change the original object
 			//reset all its properties to their original values as defined in the class
-			$r = new ReflectionClass( get_class( static::$_instance ) );
+			$r = new ReflectionClass(get_class(static::$_instance));
 			$static_properties = $r->getStaticProperties();
-			foreach( $r->getDefaultProperties() as $property => $value ) {
+			foreach ($r->getDefaultProperties() as $property => $value) {
 				//don't set instance to null like it was originally,
 				//but it's static anyways, and we're ignoring static properties (for now at least)
-				if( ! isset( $static_properties[ $property ] ) ) {
+				if ( ! isset($static_properties[$property])) {
 					static::$_instance->{$property} = $value;
 				}
 			}
 			//and then directly call its constructor again, like we would if we 
 			//were creating a new one
-			static::$_instance->__construct( $timezone );
+			static::$_instance->__construct($timezone);
 			return self::instance();
 		}
 		return null;
@@ -646,19 +646,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;
 	 }
 
@@ -791,10 +791,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));
 	}
@@ -805,10 +805,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;
 	}
@@ -821,19 +821,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;
 		}
 	}
@@ -847,7 +847,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;
 	}
 
@@ -859,13 +859,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;
 			}
 		}
@@ -887,17 +887,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));
 	}
 
 	/**
@@ -915,7 +915,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);
 	}
 
@@ -927,12 +927,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(
 							__(
@@ -944,24 +944,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;
@@ -976,7 +976,7 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function primary_key_name(){
+	public function primary_key_name() {
 		return $this->get_primary_key_field()->get_name();
 	}
 
@@ -988,14 +988,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')
 			)
 		);
 	}
@@ -1012,16 +1012,16 @@ 
 	 * @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();
 		}
-		$conditions_from_id = $this->parse_index_primary_key_string( $id );
-		if( $conditions_from_id === null ) {
-			$query_params[ 0 ][ $this->primary_key_name() ] = $id ;
-		}else{
+		$conditions_from_id = $this->parse_index_primary_key_string($id);
+		if ($conditions_from_id === null) {
+			$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;
 	}
@@ -1037,16 +1037,16 @@ 
 	 * @return EE_Base_Class|EE_Soft_Delete_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);
 		}
 	}
@@ -1069,8 +1069,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);
 	}
 
 
@@ -1091,8 +1091,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);
 	}
 
 
@@ -1113,9 +1113,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);
 	}
 
 
@@ -1137,9 +1137,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);
 	}
 
 
@@ -1160,42 +1160,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);
 		}
 	}
 
@@ -1206,18 +1206,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);
 			}
 		}
 	}
@@ -1232,9 +1232,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;
 				}
@@ -1242,8 +1242,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;
 	}
@@ -1261,19 +1261,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));
 	}
 
 
@@ -1297,25 +1297,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;
 		}
 	}
@@ -1337,17 +1337,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));
 	}
 
 
@@ -1357,7 +1357,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;
 	}
 
@@ -1393,9 +1393,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();
 		}
 		/**
@@ -1405,7 +1405,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
@@ -1413,10 +1413,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
@@ -1426,29 +1426,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;
 							}
 						}
@@ -1468,44 +1468,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.
 		 *
@@ -1514,8 +1514,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
 	}
 
 
@@ -1531,22 +1531,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));
 	}
 
 
@@ -1559,12 +1559,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;
 		}
 	}
@@ -1580,19 +1580,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);
 
 	}
 
@@ -1608,10 +1608,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
 			)
 		);
@@ -1627,10 +1627,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
 			)
 		);
@@ -1649,7 +1649,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);
 	}
 
@@ -1667,7 +1667,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
@@ -1676,31 +1676,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]);
 				}
 			}
 		}
@@ -1712,8 +1712,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
 	}
 
 
@@ -1731,28 +1731,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;
 				}
@@ -1772,75 +1772,75 @@ 
 	 * @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){
-					if ( $cpk_field instanceof EE_Model_Field_Base ){
+				foreach ($fields as $cpk_field) {
+					if ($cpk_field instanceof EE_Model_Field_Base) {
 						$values_for_each_cpk_for_a_row[] = $cpk_field->get_qualified_column()
 						                                   . "="
-						                                   . $delete_object[ $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)));
 		}
 	}
 
@@ -1856,34 +1856,34 @@ 
 	 * @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{
+		} else {
 			//there's no primary key
 			//if we're counting distinct items, and there's no primary key,
 			//we need to list out the columns for distinction;
 			//otherwise we can just use star
-			if( $distinct ) {
+			if ($distinct) {
 				$columns_to_use = array();
-				foreach( $this->get_combined_primary_key_fields() as $field_obj ) {
+				foreach ($this->get_combined_primary_key_fields() as $field_obj) {
 					$columns_to_use[] = $field_obj->get_qualified_column();
 				}
-				$column_to_count = implode(',', $columns_to_use );
+				$column_to_count = implode(',', $columns_to_use);
 			} else {
 				$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));
 	}
 
 
@@ -1896,24 +1896,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;
 		}
 	}
 
@@ -1928,37 +1928,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__,
@@ -1980,26 +1980,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 :
@@ -2007,11 +2007,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);
 
 		}
 
@@ -2027,18 +2027,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;
 	}
 
@@ -2051,16 +2051,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;
@@ -2075,7 +2075,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().
@@ -2088,7 +2088,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;
 	}
 
@@ -2097,8 +2097,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--;
 		}
@@ -2122,9 +2122,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);
 	}
 
 
@@ -2143,9 +2143,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);
 	}
 
 
@@ -2158,9 +2158,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);
 	}
 
 
@@ -2176,10 +2176,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);
 	}
 
 
@@ -2196,10 +2196,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);
 	}
 
 
@@ -2216,10 +2216,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);
 	}
 
 
@@ -2236,17 +2236,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);
 	}
 
 
@@ -2262,21 +2262,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);
 	}
 
 
@@ -2290,12 +2290,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;
 		}
 
@@ -2305,8 +2305,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));
 	}
 
 	/**
@@ -2314,14 +2314,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;
 	}
@@ -2342,19 +2342,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);
 				}
 			}
 			/**
@@ -2364,9 +2364,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;
 		}
 	}
@@ -2381,10 +2381,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(
 						__(
@@ -2394,8 +2394,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__,
@@ -2425,37 +2425,37 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class|array
 	 */
-	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);
 		}
 	}
@@ -2469,7 +2469,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;
 	}
@@ -2483,7 +2483,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)));
 	}
 
@@ -2503,45 +2503,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);
@@ -2560,15 +2560,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);
 	}
 
 
@@ -2580,9 +2580,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);
@@ -2593,7 +2593,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else {
 			return $value;
 		}
 	}
@@ -2603,13 +2603,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)));
 	}
 
 
@@ -2632,7 +2632,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;
 	}
 
@@ -2645,8 +2645,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;
 	}
 
 
@@ -2655,10 +2655,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;
 			}
 		}
@@ -2670,7 +2670,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];
 	}
 
@@ -2686,19 +2686,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,
@@ -2706,21 +2706,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,
@@ -2728,7 +2728,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,
@@ -2746,34 +2746,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);
 				}
@@ -2792,14 +2792,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;
@@ -2818,8 +2818,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(
@@ -2827,16 +2827,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(
@@ -2844,10 +2844,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(
 						__(
@@ -2855,16 +2855,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 {
@@ -2878,13 +2878,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],
@@ -2893,40 +2893,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']
 						)
 					);
@@ -2938,57 +2938,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(
 						__(
@@ -2996,16 +2996,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;
 	}
@@ -3020,17 +3020,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);
 	}
 
 	/**
@@ -3040,11 +3040,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));
 		}
 	}
 
@@ -3062,7 +3062,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',
@@ -3070,17 +3070,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(
@@ -3113,20 +3113,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
@@ -3143,8 +3143,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);
@@ -3158,8 +3158,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);
@@ -3175,16 +3175,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);
 	}
 
 	/**
@@ -3193,19 +3193,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'";
 				}
 			}
@@ -3235,65 +3235,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;
 			}
 		}
@@ -3303,7 +3303,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));
 
 	}
 
@@ -3322,26 +3322,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);
 	}
 
 
@@ -3353,11 +3353,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 '';
 		}
 	}
@@ -3372,11 +3372,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 '';
 		}
 
@@ -3390,16 +3390,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));
 		}
 	}
 
@@ -3412,41 +3412,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) : '';
 	}
 
 
@@ -3457,18 +3457,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)));
 		}
 	}
 
@@ -3480,11 +3480,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;
 		}
@@ -3499,12 +3499,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(
@@ -3513,27 +3513,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(
 						__(
@@ -3544,10 +3544,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(
 						__(
@@ -3560,13 +3560,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(
 					__(
@@ -3577,7 +3577,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(
 					__(
@@ -3595,7 +3595,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)
 				)
 			);
 		}
@@ -3611,12 +3611,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];
 	}
 
 
@@ -3633,26 +3633,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).")";
 	}
 
 
@@ -3664,16 +3664,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);
 		}
 	}
 
@@ -3685,27 +3685,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;
 		}
 	}
@@ -3719,13 +3719,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)));
 		}
 	}
 
@@ -3739,17 +3739,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;
@@ -3764,7 +3764,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;
@@ -3785,17 +3785,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);
 				}
@@ -3809,9 +3809,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();
@@ -3827,10 +3827,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");
 	}
@@ -3840,7 +3840,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;
 	}
 
@@ -3850,10 +3850,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;
 			}
 		}
@@ -3868,15 +3868,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))
 				)
 			);
 		}
@@ -3891,10 +3891,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];
 	}
@@ -3904,11 +3904,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;
 		}
 	}
@@ -3918,11 +3918,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;
 		}
 	}
@@ -3934,7 +3934,7 @@ 
 	 * @param $field_obj
 	 * @return boolean
 	 */
-	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;
 	}
 
@@ -3946,16 +3946,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;
@@ -3968,12 +3968,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;
 			}
 		}
@@ -3987,9 +3987,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;
 			}
 		}
@@ -4003,22 +4003,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];
 	}
 
 
@@ -4029,7 +4029,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();
 	}
@@ -4042,25 +4042,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;
 						}
 					}
 				}
@@ -4079,60 +4079,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);
 					}
 				}
@@ -4153,12 +4153,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;
 	}
@@ -4171,45 +4171,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;
 	}
 	/**
@@ -4217,8 +4217,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;
 	}
 
 
@@ -4240,21 +4240,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;
 		}
 	}
@@ -4268,13 +4268,13 @@ 
 	 * @param int|string $id the ID of the model object
 	 * @return boolean
 	 */
-	public function clear_entity_map( $id = null ) {
-		if ( empty( $id ) ) {
-			$this->_entity_map[ EEM_Base::$_model_query_blog_id ] = array();
+	public function clear_entity_map($id = null) {
+		if (empty($id)) {
+			$this->_entity_map[EEM_Base::$_model_query_blog_id] = array();
 			return true;
 		}
-		if ( isset( $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $id ] ) ) {
-			unset( $this->_entity_map[ EEM_Base::$_model_query_blog_id ][ $id ] );
+		if (isset($this->_entity_map[EEM_Base::$_model_query_blog_id][$id])) {
+			unset($this->_entity_map[EEM_Base::$_model_query_blog_id][$id]);
 			return true;
 		}
 		return false;
@@ -4290,8 +4290,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);
 	}
 
 
@@ -4304,23 +4304,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()
@@ -4340,15 +4340,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;
 	}
@@ -4364,25 +4364,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);
 		}
 	}
 
@@ -4400,24 +4400,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;
 		}
 	}
@@ -4430,7 +4430,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();
 	}
 
@@ -4443,8 +4443,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;
 	}
 
 
@@ -4471,13 +4471,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,
@@ -4486,7 +4486,7 @@ 
 			);
 		}
 
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -4504,28 +4504,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(
@@ -4535,12 +4535,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;
@@ -4556,19 +4556,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;
 	}
@@ -4591,14 +4591,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;
 	}
 
@@ -4606,17 +4606,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;
 			}
 		}
@@ -4634,13 +4634,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());
 	}
 
 
@@ -4654,7 +4654,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);
 	}
@@ -4669,13 +4669,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;
 			}
 		}
@@ -4692,10 +4692,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;
 			}
 		}
@@ -4711,23 +4711,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);
@@ -4743,16 +4743,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;
 		}
 	}
@@ -4768,10 +4768,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);
 	}
 
 
@@ -4782,12 +4782,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))));
 		}
 	}
 
@@ -4801,10 +4801,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;
@@ -4823,11 +4823,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__
@@ -4835,13 +4835,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',
@@ -4863,8 +4863,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);
 	}
 
 
@@ -4879,34 +4879,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;
 	}
 
@@ -4920,12 +4920,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;
@@ -4937,7 +4937,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);
 	}
 
 
@@ -4948,19 +4948,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()))
 			)
 		);
 
@@ -4971,7 +4971,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,
@@ -4987,17 +4987,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)
 				)
 			);
 		}

core/db_models/EEM_Term.model.php

Spacing +55 added lines, -55 removed lines

@@ -1,7 +1,7 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
-require_once( EE_MODELS . 'EEM_Base.model.php' );
+require_once(EE_MODELS.'EEM_Base.model.php');
 
 
 
@@ -25,65 +25,65 @@ 
 	 *
 	 * @param string $timezone
 	 */
-	protected function __construct( $timezone = null ) {
-		$this->singular_item = __( 'Term', 'event_espresso' );
-		$this->plural_item = __( 'Terms', 'event_espresso' );
+	protected function __construct($timezone = null) {
+		$this->singular_item = __('Term', 'event_espresso');
+		$this->plural_item = __('Terms', 'event_espresso');
 		$this->_tables = array(
-			'Term' => new EE_Primary_Table( 'terms', 'term_id' ),
+			'Term' => new EE_Primary_Table('terms', 'term_id'),
 		);
 		$this->_fields = array(
 			'Term' => array(
-				'term_id'    => new EE_Primary_Key_Int_Field( 'term_id', __( 'Term ID', 'event_espresso' ) ),
-				'name'       => new EE_Plain_Text_Field( 'name', __( 'Term Name', 'event_espresso' ), false, '' ),
-				'slug'       => new EE_Slug_Field( 'slug', __( 'Term Slug', 'event_espresso' ), false ),
-				'term_group' => new EE_Integer_Field( 'term_group', __( "Term Group", "event_espresso" ), false, 0 ),
+				'term_id'    => new EE_Primary_Key_Int_Field('term_id', __('Term ID', 'event_espresso')),
+				'name'       => new EE_Plain_Text_Field('name', __('Term Name', 'event_espresso'), false, ''),
+				'slug'       => new EE_Slug_Field('slug', __('Term Slug', 'event_espresso'), false),
+				'term_group' => new EE_Integer_Field('term_group', __("Term Group", "event_espresso"), false, 0),
 			),
 		);
 		$this->_model_relations = array(
 			'Term_Taxonomy' => new EE_Has_Many_Relation(),
 		);
 		$path_to_tax_model = 'Term_Taxonomy';
-		$this->_cap_restriction_generators[ EEM_Base::caps_read ] = new EE_Restriction_Generator_Public();
-		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] = new EE_Restriction_Generator_Taxonomy_Protected(
+		$this->_cap_restriction_generators[EEM_Base::caps_read] = new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[EEM_Base::caps_read_admin] = new EE_Restriction_Generator_Taxonomy_Protected(
 			$path_to_tax_model
 		);
-		$this->_cap_restriction_generators[ EEM_Base::caps_edit ] = false;
-		$this->_cap_restriction_generators[ EEM_Base::caps_delete ] = false;
-		$path_to_tax_model = $path_to_tax_model . '.';
+		$this->_cap_restriction_generators[EEM_Base::caps_edit] = false;
+		$this->_cap_restriction_generators[EEM_Base::caps_delete] = false;
+		$path_to_tax_model = $path_to_tax_model.'.';
 		//add cap restrictions for editing relating to the "ee_edit_*"
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_event_category' => array( '!=', 'espresso_event_categories' ),
+				$path_to_tax_model.'taxonomy*ee_edit_event_category' => array('!=', 'espresso_event_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_venue_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_venue_category' => array( '!=', 'espresso_venue_categories' ),
+				$path_to_tax_model.'taxonomy*ee_edit_venue_category' => array('!=', 'espresso_venue_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_edit ]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_edit]['ee_edit_event_type'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_edit_event_type' => array( '!=', 'espresso_event_type' ),
+				$path_to_tax_model.'taxonomy*ee_edit_event_type' => array('!=', 'espresso_event_type'),
 			)
 		);
 		//add cap restrictions for deleting relating to the "ee_deleting_*"
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_event_category' => array( '!=', 'espresso_event_categories' ),
+				$path_to_tax_model.'taxonomy*ee_delete_event_category' => array('!=', 'espresso_event_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_venue_category'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_venue_category' => array( '!=', 'espresso_venue_categories' ),
+				$path_to_tax_model.'taxonomy*ee_delete_venue_category' => array('!=', 'espresso_venue_categories'),
 			)
 		);
-		$this->_cap_restrictions[ EEM_Base::caps_delete ]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
+		$this->_cap_restrictions[EEM_Base::caps_delete]['ee_delete_event_type'] = new EE_Default_Where_Conditions(
 			array(
-				$path_to_tax_model . 'taxonomy*ee_delete_event_type' => array( '!=', 'espresso_event_type' ),
+				$path_to_tax_model.'taxonomy*ee_delete_event_type' => array('!=', 'espresso_event_type'),
 			)
 		);
-		parent::__construct( $timezone );
-		add_filter( 'FHEE__Read__create_model_query_params', array( 'EEM_Term', 'rest_api_query_params' ), 10, 3 );
+		parent::__construct($timezone);
+		add_filter('FHEE__Read__create_model_query_params', array('EEM_Term', 'rest_api_query_params'), 10, 3);
 	}
 
 
@@ -95,18 +95,18 @@ 
 	 * @param bool $show_uncategorized
 	 * @return \EE_Base_Class[]
 	 */
-	public function get_all_ee_categories( $show_uncategorized = false ) {
+	public function get_all_ee_categories($show_uncategorized = false) {
 		$where_params = array(
 			'Term_Taxonomy.taxonomy' => 'espresso_event_categories',
-			'NOT'                    => array( 'name' => __( 'Uncategorized', 'event_espresso' ) ),
+			'NOT'                    => array('name' => __('Uncategorized', 'event_espresso')),
 		);
-		if ( $show_uncategorized ) {
-			unset( $where_params['NOT'] );
+		if ($show_uncategorized) {
+			unset($where_params['NOT']);
 		}
 		return EEM_Term::instance()->get_all(
 			array(
 				$where_params,
-				'order_by' => array( 'name' => 'ASC' ),
+				'order_by' => array('name' => 'ASC'),
 			)
 		);
 	}
@@ -120,8 +120,8 @@ 
 	 * @param string $post_type
 	 * @return array
 	 */
-	public function get_all_CPT_post_tags( $post_type = '' ) {
-		switch ( $post_type ) {
+	public function get_all_CPT_post_tags($post_type = '') {
+		switch ($post_type) {
 			case 'espresso_events' :
 				return $this->get_all_event_post_tags();
 				break;
@@ -131,7 +131,7 @@ 
 			default :
 				$event_tags = $this->get_all_event_post_tags();
 				$venue_tags = $this->get_all_venue_post_tags();
-				return array_merge( $event_tags, $venue_tags );
+				return array_merge($event_tags, $venue_tags);
 		}
 	}
 
@@ -149,15 +149,15 @@ 
 					'Term_Taxonomy.taxonomy'        => 'post_tag',
 					'Term_Taxonomy.Event.post_type' => 'espresso_events',
 				),
-				'order_by'   => array( 'name' => 'ASC' ),
-				'force_join' => array( 'Term_Taxonomy.Event' ),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy.Event'),
 			)
 		);
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type ) ) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_events';
+			$post_tags[$key]->post_type[] = 'espresso_events';
 		}
 		return $post_tags;
 	}
@@ -176,15 +176,15 @@ 
 					'Term_Taxonomy.taxonomy'        => 'post_tag',
 					'Term_Taxonomy.Venue.post_type' => 'espresso_venues',
 				),
-				'order_by'   => array( 'name' => 'ASC' ),
-				'force_join' => array( 'Term_Taxonomy' ),
+				'order_by'   => array('name' => 'ASC'),
+				'force_join' => array('Term_Taxonomy'),
 			)
 		);
-		foreach ( $post_tags as $key => $post_tag ) {
-			if ( ! isset( $post_tags[ $key ]->post_type ) ) {
-				$post_tags[ $key ]->post_type = array();
+		foreach ($post_tags as $key => $post_tag) {
+			if ( ! isset($post_tags[$key]->post_type)) {
+				$post_tags[$key]->post_type = array();
 			}
-			$post_tags[ $key ]->post_type[] = 'espresso_venues';
+			$post_tags[$key]->post_type[] = 'espresso_venues';
 		}
 		return $post_tags;
 	}
@@ -200,11 +200,11 @@ 
 	 * @param EEM_Base $model
 	 * @return array
 	 */
-	public static function rest_api_query_params( $model_query_params, $querystring_query_params, $model ) {
-		if ( $model === EEM_Term::instance() ) {
-			$taxonomies = get_taxonomies( array( 'show_in_rest' => true ) );
-			if ( ! empty( $taxonomies ) ) {
-				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array( 'IN', $taxonomies );
+	public static function rest_api_query_params($model_query_params, $querystring_query_params, $model) {
+		if ($model === EEM_Term::instance()) {
+			$taxonomies = get_taxonomies(array('show_in_rest' => true));
+			if ( ! empty($taxonomies)) {
+				$model_query_params[0]['Term_Taxonomy.taxonomy'] = array('IN', $taxonomies);
 			}
 		}
 		return $model_query_params;