eventespresso / event-espresso-core

modules/single_page_checkout/inc/EE_Checkout.class.php

Indentation +15 added lines, -15 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_Checkout
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage    core
- * @author				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_Checkout
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage    core
+  * @author				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 class EE_Checkout {
 
 	/**
@@ -792,10 +792,10 @@ 
 	 */
 	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
 		return ! $this->revisit
-		       || $this->primary_revisit
-		       || (
-			       $this->revisit && $this->reg_url_link === $registration->reg_url_link()
-		       )
+			   || $this->primary_revisit
+			   || (
+				   $this->revisit && $this->reg_url_link === $registration->reg_url_link()
+			   )
 			? true
 			: false;
 	}

Doc Comments +5 added lines, -4 removed lines

@@ -251,7 +251,7 @@ 
 
 	/**
 	 * returns true if ANY reg status was updated during checkout
-	 * @return array
+	 * @return boolean
 	 */
 	public function any_reg_status_updated() {
 		foreach ( $this->reg_status_updated as $reg_status ) {
@@ -276,7 +276,7 @@ 
 
 	/**
 	 * @param $REG_ID
-	 * @param $reg_status
+	 * @param boolean $reg_status
 	 */
 	public function set_reg_status_updated( $REG_ID, $reg_status ) {
 		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
@@ -633,7 +633,7 @@ 
 	 * 	reset_reg_steps
 	 *
 	 * 	@access public
-	 * 	@return 	bool
+	 * 	@return 	boolean|null
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
@@ -748,7 +748,7 @@ 
 	 *    stores whether any updates were made to the TXN or it's related registrations
 	 *
 	 * @access public
-	 * @return    bool
+	 * @return    boolean|null
 	 * @throws \EE_Error
 	 */
 	public function track_transaction_and_registration_status_updates() {
@@ -1110,6 +1110,7 @@ 
 	 *
 	 * @param    string | int    $reg_cache_ID
 	 * @param    EE_Registration $registration
+	 * @param integer $reg_cache_ID
 	 * @return void
 	 * @throws \EE_Error
 	 */

Spacing +206 added lines, -206 removed lines

@@ -242,9 +242,9 @@ 
 		$this->reg_page_base_url = EE_Registry::instance()->CFG->core->reg_page_url();
 		$this->thank_you_page_url = EE_Registry::instance()->CFG->core->thank_you_page_url();
 		$this->cancel_page_url = EE_Registry::instance()->CFG->core->cancel_page_url();
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', TRUE );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', TRUE);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->ajax;
-		$this->reg_cache_where_params = array( 'order_by' => array( 'REG_count' => 'ASC' ));
+		$this->reg_cache_where_params = array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -254,8 +254,8 @@ 
 	 * @return array
 	 */
 	public function any_reg_status_updated() {
-		foreach ( $this->reg_status_updated as $reg_status ) {
-			if ( $reg_status ) {
+		foreach ($this->reg_status_updated as $reg_status) {
+			if ($reg_status) {
 				return true;
 			}
 		}
@@ -268,8 +268,8 @@ 
 	 * @param $REG_ID
 	 * @return array
 	 */
-	public function reg_status_updated( $REG_ID ) {
-		return isset( $this->reg_status_updated[ $REG_ID ] ) ? $this->reg_status_updated[ $REG_ID ] : false;
+	public function reg_status_updated($REG_ID) {
+		return isset($this->reg_status_updated[$REG_ID]) ? $this->reg_status_updated[$REG_ID] : false;
 	}
 
 
@@ -278,8 +278,8 @@ 
 	 * @param $REG_ID
 	 * @param $reg_status
 	 */
-	public function set_reg_status_updated( $REG_ID, $reg_status ) {
-		$this->reg_status_updated[ $REG_ID ] = filter_var( $reg_status, FILTER_VALIDATE_BOOLEAN );
+	public function set_reg_status_updated($REG_ID, $reg_status) {
+		$this->reg_status_updated[$REG_ID] = filter_var($reg_status, FILTER_VALIDATE_BOOLEAN);
 	}
 
 
@@ -300,7 +300,7 @@ 
 	 * can ONLY be set by the  Finalize_Registration reg step
 	 */
 	public function set_exit_spco() {
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
 			$this->exit_spco = true;
 		}
 	}
@@ -317,12 +317,12 @@ 
 	 */
 	public function reset_for_current_request() {
 		$this->process_form_submission = FALSE;
-		$this->continue_reg = apply_filters( 'FHEE__EE_Checkout___construct___continue_reg', true );
+		$this->continue_reg = apply_filters('FHEE__EE_Checkout___construct___continue_reg', true);
 		$this->admin_request = is_admin() && ! EE_Registry::instance()->REQ->front_ajax;
 		$this->continue_reg = true;
 		$this->redirect = false;
 		// don't reset the cached redirect form if we're about to be asked to display it !!!
-		if ( EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' ) !== 'redirect_form' ) {
+		if (EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step') !== 'redirect_form') {
 			$this->redirect_form = '';
 		}
 		$this->redirect_url = '';
@@ -339,8 +339,8 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_obj
 	 * @return    void
 	 */
-	public function add_reg_step( EE_SPCO_Reg_Step $reg_step_obj ) {
-		$this->reg_steps[ $reg_step_obj->slug()  ] = $reg_step_obj;
+	public function add_reg_step(EE_SPCO_Reg_Step $reg_step_obj) {
+		$this->reg_steps[$reg_step_obj->slug()] = $reg_step_obj;
 	}
 
 
@@ -356,22 +356,22 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function skip_reg_step( $reg_step_slug = '' ) {
-		$step_to_skip = $this->find_reg_step( $reg_step_slug );
-		if ( $step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step() ) {
-			$step_to_skip->set_is_current_step( false );
+	public function skip_reg_step($reg_step_slug = '') {
+		$step_to_skip = $this->find_reg_step($reg_step_slug);
+		if ($step_to_skip instanceof EE_SPCO_Reg_Step && $step_to_skip->is_current_step()) {
+			$step_to_skip->set_is_current_step(false);
 			$step_to_skip->set_completed();
 			// advance to the next step
-			$this->set_current_step( $this->next_step->slug() );
+			$this->set_current_step($this->next_step->slug());
 			// also reset the step param in the request in case any other code references that directly
-			EE_Registry::instance()->REQ->set( 'step', $this->current_step->slug() );
+			EE_Registry::instance()->REQ->set('step', $this->current_step->slug());
 			// since we are skipping a step and setting the current step to be what was previously the next step,
 			// we need to check that the next step is now correct, and not still set to the current step.
-			if ( $this->current_step->slug() === $this->next_step->slug() ) {
+			if ($this->current_step->slug() === $this->next_step->slug()) {
 				// correctly setup the next step
 				$this->set_next_step();
 			}
-			$this->set_reg_step_initiated( $this->current_step );
+			$this->set_reg_step_initiated($this->current_step);
 		}
 	}
 
@@ -385,16 +385,16 @@ 
 	 * @param bool   $reset whether to reset reg steps after removal
 	 * @throws EE_Error
 	 */
-	public function remove_reg_step( $reg_step_slug = '', $reset = true ) {
-		unset( $this->reg_steps[ $reg_step_slug  ] );
-		if ( $this->transaction instanceof EE_Transaction ) {
+	public function remove_reg_step($reg_step_slug = '', $reset = true) {
+		unset($this->reg_steps[$reg_step_slug]);
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// now remove reg step from TXN and save
-			$transaction_processor->remove_reg_step( $this->transaction, $reg_step_slug );
+			$transaction_processor->remove_reg_step($this->transaction, $reg_step_slug);
 			$this->transaction->save();
 		}
-		if ( $reset ) {
+		if ($reset) {
 			$this->reset_reg_steps();
 		}
 	}
@@ -409,9 +409,9 @@ 
 	 * @param int    $order
 	 * @return    void
 	 */
-	public function set_reg_step_order( $reg_step_slug = '', $order = 100 ) {
-		if ( isset( $this->reg_steps[ $reg_step_slug  ] )) {
-			$this->reg_steps[ $reg_step_slug ]->set_order( $order );
+	public function set_reg_step_order($reg_step_slug = '', $order = 100) {
+		if (isset($this->reg_steps[$reg_step_slug])) {
+			$this->reg_steps[$reg_step_slug]->set_order($order);
 		}
 	}
 
@@ -424,25 +424,25 @@ 
 	 * @param string $current_step
 	 * @return    void
 	 */
-	public function set_current_step( $current_step ) {
+	public function set_current_step($current_step) {
 		// grab what step we're on
-		$this->current_step = isset( $this->reg_steps[ $current_step ] ) ? $this->reg_steps[ $current_step ] : reset( $this->reg_steps );
+		$this->current_step = isset($this->reg_steps[$current_step]) ? $this->reg_steps[$current_step] : reset($this->reg_steps);
 		// verify instance
-		if ( $this->current_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->current_step instanceof EE_SPCO_Reg_Step) {
 			// we don't want to repeat completed steps if this is the first time through SPCO
-			if ( $this->continue_reg && ! $this->revisit && $this->current_step->completed() ) {
+			if ($this->continue_reg && ! $this->revisit && $this->current_step->completed()) {
 				// so advance to the next step
 				$this->set_next_step();
-				if ( $this->next_step instanceof EE_SPCO_Reg_Step ) {
+				if ($this->next_step instanceof EE_SPCO_Reg_Step) {
 					// and attempt to set it as the current step
-					$this->set_current_step( $this->next_step->slug() );
+					$this->set_current_step($this->next_step->slug());
 				}
 				return;
 			}
-			$this->current_step->set_is_current_step( TRUE );
+			$this->current_step->set_is_current_step(TRUE);
 		} else {
 			EE_Error::add_error(
-				__( 'The current step could not be set.', 'event_espresso' ),
+				__('The current step could not be set.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -459,20 +459,20 @@ 
 	 */
 	public function set_next_step() {
 		// set pointer to start of array
-		reset( $this->reg_steps );
+		reset($this->reg_steps);
 		// if there is more than one step
-		if ( count( $this->reg_steps ) > 1 ) {
+		if (count($this->reg_steps) > 1) {
 			// advance to the current step and set pointer
-			while ( key( $this->reg_steps ) !== $this->current_step->slug() && key( $this->reg_steps ) !== '' ) {
-				next( $this->reg_steps );
+			while (key($this->reg_steps) !== $this->current_step->slug() && key($this->reg_steps) !== '') {
+				next($this->reg_steps);
 			}
 		}
 		// advance one more spot ( if it exists )
-		$this->next_step = next( $this->reg_steps );
+		$this->next_step = next($this->reg_steps);
 		// verify instance
-		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step  : NULL;
+		$this->next_step = $this->next_step instanceof EE_SPCO_Reg_Step ? $this->next_step : NULL;
 		// then back to current step to reset
-		prev( $this->reg_steps );
+		prev($this->reg_steps);
 	}
 
 
@@ -486,8 +486,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_next_reg_step() {
-		$next = next( $this->reg_steps );
-		prev( $this->reg_steps );
+		$next = next($this->reg_steps);
+		prev($this->reg_steps);
 		return $next instanceof EE_SPCO_Reg_Step ? $next : null;
 	}
 
@@ -502,8 +502,8 @@ 
 	 *  @return 	EE_SPCO_Reg_Step | null
 	 */
 	public function get_prev_reg_step() {
-		$prev = prev( $this->reg_steps );
-		next( $this->reg_steps );
+		$prev = prev($this->reg_steps);
+		next($this->reg_steps);
 		return $prev instanceof EE_SPCO_Reg_Step ? $prev : null;
 	}
 
@@ -516,8 +516,8 @@ 
 	 * @return void
 	 */
 	public function sort_reg_steps() {
-		$reg_step_sorting_callback = apply_filters( 'FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback' );
-		uasort( $this->reg_steps, array( $this, $reg_step_sorting_callback ));
+		$reg_step_sorting_callback = apply_filters('FHEE__EE_Checkout__sort_reg_steps__reg_step_sorting_callback', 'reg_step_sorting_callback');
+		uasort($this->reg_steps, array($this, $reg_step_sorting_callback));
 	}
 
 
@@ -530,19 +530,19 @@ 
 	 * @param string $reg_step_slug
 	 * @return EE_SPCO_Reg_Step|null
 	 */
-	public function find_reg_step( $reg_step_slug = '' ) {
-		if ( ! empty( $reg_step_slug ) ) {
+	public function find_reg_step($reg_step_slug = '') {
+		if ( ! empty($reg_step_slug)) {
 			// copy reg step array
 			$reg_steps = $this->reg_steps;
 			// set pointer to start of array
-			reset( $reg_steps );
+			reset($reg_steps);
 			// if there is more than one step
-			if ( count( $reg_steps ) > 1 ) {
+			if (count($reg_steps) > 1) {
 				// advance to the current step and set pointer
-				while ( key( $reg_steps ) !== $reg_step_slug && key( $reg_steps ) !== '' ) {
-					next( $reg_steps );
+				while (key($reg_steps) !== $reg_step_slug && key($reg_steps) !== '') {
+					next($reg_steps);
 				}
-				return current( $reg_steps );
+				return current($reg_steps);
 			}
 		}
 		return null;
@@ -558,17 +558,17 @@ 
 	 * @param EE_SPCO_Reg_Step $reg_step_B
 	 * @return array()
 	 */
-	public function reg_step_sorting_callback( EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B ) {
+	public function reg_step_sorting_callback(EE_SPCO_Reg_Step $reg_step_A, EE_SPCO_Reg_Step $reg_step_B) {
 		// send finalize_registration step to the end of the array
-		if ( $reg_step_A->slug() === 'finalize_registration' ) {
+		if ($reg_step_A->slug() === 'finalize_registration') {
 			return 1;
-		} else if ( $reg_step_B->slug() === 'finalize_registration' ) {
+		} else if ($reg_step_B->slug() === 'finalize_registration') {
 			return -1;
 		}
-		if ( $reg_step_A->order() === $reg_step_B->order() ) {
+		if ($reg_step_A->order() === $reg_step_B->order()) {
 			return 0;
 		}
-		return ( $reg_step_A->order() > $reg_step_B->order() ) ? 1 : -1;
+		return ($reg_step_A->order() > $reg_step_B->order()) ? 1 : -1;
 	}
 
 
@@ -580,7 +580,7 @@ 
 	 * @param    EE_SPCO_Reg_Step $reg_step
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( EE_SPCO_Reg_Step $reg_step ) {
+	public function set_reg_step_initiated(EE_SPCO_Reg_Step $reg_step) {
 		// call set_reg_step_initiated ???
 		if (
 			// first time visiting SPCO ?
@@ -593,13 +593,13 @@ 
 			)
 		) {
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// set the start time for this reg step
-			if ( ! $transaction_processor->set_reg_step_initiated( $this->transaction, $reg_step->slug() ) ) {
-				if ( WP_DEBUG ) {
+			if ( ! $transaction_processor->set_reg_step_initiated($this->transaction, $reg_step->slug())) {
+				if (WP_DEBUG) {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The "%1$s" registration step was not initialized properly.', 'event_espresso' ),
+							__('The "%1$s" registration step was not initialized properly.', 'event_espresso'),
 							$reg_step->name()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -618,10 +618,10 @@ 
 	 * 	@return 	void
 	 */
 	public function set_reg_step_JSON_info() {
-		EE_Registry::$i18n_js_strings[ 'reg_steps' ] = array();
+		EE_Registry::$i18n_js_strings['reg_steps'] = array();
 		// pass basic reg step data to JS
-		foreach ( $this->reg_steps as $reg_step ) {
-			EE_Registry::$i18n_js_strings[ 'reg_steps' ][] = $reg_step->slug();
+		foreach ($this->reg_steps as $reg_step) {
+			EE_Registry::$i18n_js_strings['reg_steps'][] = $reg_step->slug();
 		}
 		// reset reg step html
 //		$this->json_response->set_reg_step_html( '' );
@@ -637,7 +637,7 @@ 
 	 */
 	public function reset_reg_steps() {
 		$this->sort_reg_steps();
-		$this->set_current_step( EE_Registry::instance()->REQ->get( 'step' ));
+		$this->set_current_step(EE_Registry::instance()->REQ->get('step'));
 		$this->set_next_step();
 		// the text that appears on the reg step form submit button
 		$this->current_step->set_submit_button_text();
@@ -654,9 +654,9 @@ 
 	 */
 	public function get_registration_time_limit() {
 
-		$registration_time_limit = (float)( EE_Registry::instance()	->SSN->expiration() - time() );
+		$registration_time_limit = (float) (EE_Registry::instance()	->SSN->expiration() - time());
 		$time_limit_format = $registration_time_limit > 60 * MINUTE_IN_SECONDS ? 'H:i:s' : 'i:s';
-		$registration_time_limit = gmdate( $time_limit_format, $registration_time_limit );
+		$registration_time_limit = gmdate($time_limit_format, $registration_time_limit);
 		return apply_filters(
 			'FHEE__EE_Checkout__get_registration_time_limit__registration_time_limit',
 			$registration_time_limit
@@ -676,7 +676,7 @@ 
 		//		overpaid TXN
 		//		free TXN ( total = 0.00 )
 		// then payment required is TRUE
-		return ! ( $this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free() ) ? TRUE : FALSE;
+		return ! ($this->admin_request || $this->transaction->is_completed() || $this->transaction->is_overpaid() || $this->transaction->is_free()) ? TRUE : FALSE;
 	}
 
 
@@ -688,12 +688,12 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( $transaction ) {
-		$session = EE_Registry::instance()->load_core( 'Session' );
-		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn( $transaction, $session ) : null;
+	public function get_cart_for_transaction($transaction) {
+		$session = EE_Registry::instance()->load_core('Session');
+		$cart = $transaction instanceof EE_Transaction ? EE_Cart::get_cart_from_txn($transaction, $session) : null;
 		// verify cart
-		if ( ! $cart instanceof EE_Cart ) {
-			$cart = EE_Registry::instance()->load_core( 'Cart' );
+		if ( ! $cart instanceof EE_Cart) {
+			$cart = EE_Registry::instance()->load_core('Cart');
 		}
 
 		return $cart;
@@ -709,8 +709,8 @@ 
 	 */
 	public function initialize_txn_reg_steps_array() {
 		$txn_reg_steps_array = array();
-		foreach ( $this->reg_steps as $reg_step ) {
-			$txn_reg_steps_array[ $reg_step->slug() ] = FALSE;
+		foreach ($this->reg_steps as $reg_step) {
+			$txn_reg_steps_array[$reg_step->slug()] = FALSE;
 		}
 		return $txn_reg_steps_array;
 	}
@@ -727,15 +727,15 @@ 
 	public function update_txn_reg_steps_array() {
 		$updated = false;
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		foreach ( $this->reg_steps as $reg_step ) {
-			if ( $reg_step->completed() ) {
-				$updated = $transaction_processor->set_reg_step_completed( $this->transaction, $reg_step->slug() )
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		foreach ($this->reg_steps as $reg_step) {
+			if ($reg_step->completed()) {
+				$updated = $transaction_processor->set_reg_step_completed($this->transaction, $reg_step->slug())
 					? true
 					: $updated;
 			}
 		}
-		if ( $updated ) {
+		if ($updated) {
 			$this->transaction->save();
 		}
 		return $updated;
@@ -751,14 +751,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public function stash_transaction_and_checkout() {
-		if ( ! $this->revisit ) {
+		if ( ! $this->revisit) {
 			$this->update_txn_reg_steps_array();
 		}
 		$this->track_transaction_and_registration_status_updates();
 		// save all data to the db, but suppress errors
 		//$this->save_all_data( FALSE );
 		// cache the checkout in the session
-		EE_Registry::instance()->SSN->set_checkout( $this );
+		EE_Registry::instance()->SSN->set_checkout($this);
 	}
 
 
@@ -773,21 +773,21 @@ 
 	 */
 	public function track_transaction_and_registration_status_updates() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			/** @type EE_Transaction_Payments $transaction_payments */
-			$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+			$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// has there been a TXN status change during this checkout?
-			if ( $transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated() ) {
+			if ($transaction_payments->txn_status_updated() || $transaction_processor->txn_status_updated()) {
 				$this->txn_status_updated = true;
 			}
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $registration ) {
-				if ( $registration_processor->reg_status_updated( $registration->ID() ) ) {
-					$this->set_reg_status_updated( $registration->ID(), true );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as $registration) {
+				if ($registration_processor->reg_status_updated($registration->ID())) {
+					$this->set_reg_status_updated($registration->ID(), true);
 				}
 			}
 		}
@@ -808,7 +808,7 @@ 
 	 * @return    bool
 	 * @throws \EE_Error
 	 */
-	public function visit_allows_processing_of_this_registration( EE_Registration $registration ) {
+	public function visit_allows_processing_of_this_registration(EE_Registration $registration) {
 		return ! $this->revisit
 		       || $this->primary_revisit
 		       || (
@@ -841,18 +841,18 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function save_all_data( $show_errors = TRUE ) {
+	public function save_all_data($show_errors = TRUE) {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction ) {
+		if ($this->transaction instanceof EE_Transaction) {
 			// save to ensure that TXN has ID
 			$this->transaction->save();
 			// grab the saved registrations from the transaction
-			foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as  $registration ) {
-				$this->_save_registration( $registration, $show_errors );
+			foreach ($this->transaction->registrations($this->reg_cache_where_params) as  $registration) {
+				$this->_save_registration($registration, $show_errors);
 			}
 		} else {
-			if ( $show_errors ) {
-				EE_Error::add_error( __( 'A valid Transaction was not found when attempting to save your registration information.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			if ($show_errors) {
+				EE_Error::add_error(__('A valid Transaction was not found when attempting to save your registration information.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			}
 			return FALSE;
 		}
@@ -869,32 +869,32 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration( $registration, $show_errors = TRUE  ) {
+	private function _save_registration($registration, $show_errors = TRUE) {
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// should this registration be processed during this visit ?
-			if ( $this->visit_allows_processing_of_this_registration( $registration ) ) {
+			if ($this->visit_allows_processing_of_this_registration($registration)) {
 				//set TXN ID
-				if ( ! $registration->transaction_ID() ) {
-					$registration->set_transaction_id( $this->transaction->ID() );
+				if ( ! $registration->transaction_ID()) {
+					$registration->set_transaction_id($this->transaction->ID());
 				}
 				// verify and save the attendee
-				$this->_save_registration_attendee( $registration, $show_errors );
+				$this->_save_registration_attendee($registration, $show_errors);
 				// save answers to reg form questions
-				$this->_save_registration_answers( $registration, $show_errors );
+				$this->_save_registration_answers($registration, $show_errors);
 				// save changes
 				$registration->save();
 				// update txn cache
-				if ( ! $this->transaction->update_cache_after_object_save( 'Registration', $registration )) {
-					if ( $show_errors ) {
-						EE_Error::add_error( __( 'The newly saved Registration object could not be cached on the Transaction.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+				if ( ! $this->transaction->update_cache_after_object_save('Registration', $registration)) {
+					if ($show_errors) {
+						EE_Error::add_error(__('The newly saved Registration object could not be cached on the Transaction.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 					}
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
-					__( 'An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso' ),
+					__('An invalid Registration object was discovered when attempting to save your registration information.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -911,25 +911,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_attendee( $registration, $show_errors = TRUE ) {
-		if ( $registration->attendee() instanceof EE_Attendee ) {
+	private function _save_registration_attendee($registration, $show_errors = TRUE) {
+		if ($registration->attendee() instanceof EE_Attendee) {
 			// save so that ATT has ID
 			$registration->attendee()->save();
-			if ( ! $registration->update_cache_after_object_save( 'Attendee', $registration->attendee() ) ) {
-				if ( $show_errors ) {
+			if ( ! $registration->update_cache_after_object_save('Attendee', $registration->attendee())) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'The newly saved Attendee object could not be cached on the registration.', 'event_espresso' ),
+						__('The newly saved Attendee object could not be cached on the registration.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
 			}
 		} else {
-			if ( $show_errors ) {
+			if ($show_errors) {
 				EE_Error::add_error(
 					sprintf(
 						'%1$s||%1$s $attendee = %2$s',
-						__( 'Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso' ),
-						var_export( $registration->attendee(), true )
+						__('Either no Attendee information was found, or an invalid Attendee object was discovered when attempting to save your registration information.', 'event_espresso'),
+						var_export($registration->attendee(), true)
 					),
 					__FILE__, __FUNCTION__, __LINE__
 				);
@@ -947,25 +947,25 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	private function _save_registration_answers( $registration, $show_errors = TRUE ) {
+	private function _save_registration_answers($registration, $show_errors = TRUE) {
 		// now save the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				$answer->set_registration( $registration->ID() );
+			if ($answer instanceof EE_Answer) {
+				$answer->set_registration($registration->ID());
 				$answer->save();
-				if ( ! $registration->update_cache_after_object_save( 'Answer', $answer, $cache_key )) {
-					if ( $show_errors ) {
+				if ( ! $registration->update_cache_after_object_save('Answer', $answer, $cache_key)) {
+					if ($show_errors) {
 						EE_Error::add_error(
-							__( 'The newly saved Answer object could not be cached on the registration.', 'event_espresso' ),
+							__('The newly saved Answer object could not be cached on the registration.', 'event_espresso'),
 							__FILE__, __FUNCTION__, __LINE__
 						);
 					}
 				}
 			} else {
-				if ( $show_errors ) {
+				if ($show_errors) {
 					EE_Error::add_error(
-						__( 'An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso' ),
+						__('An invalid Answer object was discovered when attempting to save your registration information.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
@@ -984,7 +984,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function refresh_all_entities( $from_db = false ) {
+	public function refresh_all_entities($from_db = false) {
 		$from_db = $this->current_step->is_final_step() || $this->action === 'process_gateway_response'
 			? true
 			: $from_db;
@@ -1008,11 +1008,11 @@ 
 	 */
 	protected function refresh_from_db() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// pull fresh TXN data from the db
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db( $this->transaction->ID() );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_from_db($this->transaction->ID());
 			// update EE_Checkout's cached primary_attendee object
-			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db( $this->transaction );
+			$this->primary_attendee_obj = $this->_refresh_primary_attendee_obj_from_db($this->transaction);
 			// update EE_Checkout's cached payment object
 			$payment = $this->transaction->last_payment();
 			$this->payment = $payment instanceof EE_Payment ? $payment : $this->payment;
@@ -1020,9 +1020,9 @@ 
 			$payment_method = $this->payment instanceof EE_Payment ? $this->payment->payment_method() : null;
 			$this->payment_method = $payment_method instanceof EE_Payment_Method ? $payment_method : $this->payment_method;
 			//now refresh the cart, based on the TXN
-			$this->cart = $this->get_cart_for_transaction( $this->transaction );
+			$this->cart = $this->get_cart_for_transaction($this->transaction);
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return TRUE;
@@ -1037,21 +1037,21 @@ 
 	 * @return  EE_Attendee | null
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_primary_attendee_obj_from_db( EE_Transaction $transaction ) {
+	protected function _refresh_primary_attendee_obj_from_db(EE_Transaction $transaction) {
 
 		$primary_attendee_obj = null;
 		// grab the saved registrations from the transaction
-		foreach ( $transaction->registrations( $this->reg_cache_where_params, true ) as $registration ) {
+		foreach ($transaction->registrations($this->reg_cache_where_params, true) as $registration) {
 			// verify object
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				$attendee = $registration->attendee();
 				// verify object && maybe cache primary_attendee_obj ?
-				if ( $attendee instanceof EE_Attendee&& $registration->is_primary_registrant() ) {
+				if ($attendee instanceof EE_Attendee && $registration->is_primary_registrant()) {
 					$primary_attendee_obj = $attendee;
 				}
 			} else {
 				EE_Error::add_error(
-						__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+						__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1072,45 +1072,45 @@ 
 	 */
 	protected function refresh_entity_map() {
 		// verify the transaction
-		if ( $this->transaction instanceof EE_Transaction && $this->transaction->ID() ) {
+		if ($this->transaction instanceof EE_Transaction && $this->transaction->ID()) {
 			// never cache payment info
-			$this->transaction->clear_cache( 'Payment' );
+			$this->transaction->clear_cache('Payment');
 			/** @type EE_Transaction_Processor $transaction_processor */
-			$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+			$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 			// is the Payment Options Reg Step completed ?
-			if ( $transaction_processor->reg_step_completed( $this->transaction, 'payment_options' ) ) {
+			if ($transaction_processor->reg_step_completed($this->transaction, 'payment_options')) {
 				// then check for payments and update TXN accordingly
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
-				$transaction_payments->calculate_total_payments_and_update_status( $this->transaction );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
+				$transaction_payments->calculate_total_payments_and_update_status($this->transaction);
 			}
 			// grab the saved registrations from the transaction
 			foreach (
-				$this->transaction->registrations( $this->reg_cache_where_params ) as $reg_cache_ID => $registration
+				$this->transaction->registrations($this->reg_cache_where_params) as $reg_cache_ID => $registration
 			) {
-				$this->_refresh_registration( $reg_cache_ID, $registration );
+				$this->_refresh_registration($reg_cache_ID, $registration);
 			}
 			// make sure our cached TXN is added to the model entity mapper
-			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with( $this->transaction->ID(), $this->transaction );
+			$this->transaction = $this->transaction->get_model()->refresh_entity_map_with($this->transaction->ID(), $this->transaction);
 
 		} else {
-			EE_Error::add_error( __( 'A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('A valid Transaction was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		// verify and update the cart because inaccurate totals are not so much fun
-		if ( $this->cart instanceof EE_Cart ) {
+		if ($this->cart instanceof EE_Cart) {
 			$grand_total = $this->cart->get_grand_total();
-			if ( $grand_total instanceof EE_Line_Item && $grand_total->ID() ) {
+			if ($grand_total instanceof EE_Line_Item && $grand_total->ID()) {
 				$grand_total->recalculate_total_including_taxes();
 				$grand_total = $grand_total->get_model()->refresh_entity_map_with(
 					$this->cart->get_grand_total()->ID(),
 					$this->cart->get_grand_total()
 				);
 			}
-			if ( $grand_total instanceof EE_Line_Item ) {
-				$this->cart = EE_Cart::instance( $grand_total );
+			if ($grand_total instanceof EE_Line_Item) {
+				$this->cart = EE_Cart::instance($grand_total);
 			} else {
-				EE_Error::add_error( __( 'A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+				EE_Error::add_error(__('A valid Cart was not found when attempting to update the model entity mapper.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1127,19 +1127,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration( $reg_cache_ID, $registration ) {
+	protected function _refresh_registration($reg_cache_ID, $registration) {
 
 		// verify object
-		if ( $registration instanceof EE_Registration ) {
+		if ($registration instanceof EE_Registration) {
 			// update the entity mapper attendee
-			$this->_refresh_registration_attendee( $registration );
+			$this->_refresh_registration_attendee($registration);
 			// update the entity mapper answers for reg form questions
-			$this->_refresh_registration_answers( $registration );
+			$this->_refresh_registration_answers($registration);
 			// make sure the cached registration is added to the model entity mapper
-			$registration->get_model()->refresh_entity_map_with( $reg_cache_ID, $registration );
+			$registration->get_model()->refresh_entity_map_with($reg_cache_ID, $registration);
 		} else {
 			EE_Error::add_error(
-				__( 'An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+				__('An invalid Registration object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 		}
@@ -1154,15 +1154,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_attendee( $registration ) {
+	protected function _refresh_registration_attendee($registration) {
 
 		$attendee = $registration->attendee();
 		// verify object
-		if ( $attendee instanceof EE_Attendee && $attendee->ID() ) {
+		if ($attendee instanceof EE_Attendee && $attendee->ID()) {
 			// make sure the cached attendee is added to the model entity mapper
-			$registration->attendee()->get_model()->refresh_entity_map_with( $attendee->ID(), $attendee );
+			$registration->attendee()->get_model()->refresh_entity_map_with($attendee->ID(), $attendee);
 			// maybe cache primary_attendee_obj ?
-			if ( $registration->is_primary_registrant() ) {
+			if ($registration->is_primary_registrant()) {
 				$this->primary_attendee_obj = $attendee;
 			}
 		}
@@ -1177,19 +1177,19 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _refresh_registration_answers( $registration ) {
+	protected function _refresh_registration_answers($registration) {
 
 		// now update the answers
-		foreach ( $registration->answers() as $cache_key => $answer ) {
+		foreach ($registration->answers() as $cache_key => $answer) {
 			// verify object
-			if ( $answer instanceof EE_Answer ) {
-				if ( $answer->ID() ) {
+			if ($answer instanceof EE_Answer) {
+				if ($answer->ID()) {
 					// make sure the cached answer is added to the model entity mapper
-					$answer->get_model()->refresh_entity_map_with( $answer->ID(), $answer );
+					$answer->get_model()->refresh_entity_map_with($answer->ID(), $answer);
 				}
 			} else {
 				EE_Error::add_error(
-					__( 'An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso' ),
+					__('An invalid Answer object was discovered when attempting to update the model entity mapper.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 			}
@@ -1204,7 +1204,7 @@ 
 	 * this will reinstate the EE_Checkout object on each EE_SPCO_Reg_Step object
 	 */
 	public function __wakeup() {
-		foreach ( $this->reg_steps as $reg_step ) {
+		foreach ($this->reg_steps as $reg_step) {
 			$reg_step->checkout = $this;
 		}
 	}
@@ -1221,12 +1221,12 @@ 
 	 * @param bool   $display_request
 	 * @throws \EE_Error
 	 */
-	public function log( $class = '', $func = '', $line = '', $info = array(), $display_request = false ) {
+	public function log($class = '', $func = '', $line = '', $info = array(), $display_request = false) {
 		$disabled = true;
-		if ( WP_DEBUG && ! $disabled ) {
-			$debug_data = get_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), array() );
+		if (WP_DEBUG && ! $disabled) {
+			$debug_data = get_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), array());
 			$default_data = array(
-				$class 		=> $func . '() : ' . $line,
+				$class 		=> $func.'() : '.$line,
 				'request->step' 		=> $this->step,
 				'request->action' 	=> $this->action,
 				'current_step->slug' => $this->current_step instanceof EE_SPCO_Reg_Step ?
@@ -1238,24 +1238,24 @@ 
 				'reg_url_link' => $this->reg_url_link,
 				'REQ' => $display_request ? $_REQUEST : '',
 			);
-			if ( $this->transaction instanceof EE_Transaction ) {
-				$default_data[ 'TXN_status' ] 		= $this->transaction->status_ID();
-				$default_data[ 'TXN_reg_steps' ] 	= $this->transaction->reg_steps();
-				foreach ( $this->transaction->registrations( $this->reg_cache_where_params ) as $REG_ID => $registration ) {
-					$default_data[ 'registrations' ][ $REG_ID ] = $registration->status_ID();
+			if ($this->transaction instanceof EE_Transaction) {
+				$default_data['TXN_status'] = $this->transaction->status_ID();
+				$default_data['TXN_reg_steps'] = $this->transaction->reg_steps();
+				foreach ($this->transaction->registrations($this->reg_cache_where_params) as $REG_ID => $registration) {
+					$default_data['registrations'][$REG_ID] = $registration->status_ID();
 				}
-				if ( $this->transaction->ID() ) {
-					$TXN_ID = 'EE_Transaction: ' . $this->transaction->ID();
+				if ($this->transaction->ID()) {
+					$TXN_ID = 'EE_Transaction: '.$this->transaction->ID();
 					// don't serialize objects
-					$info = $this->_strip_objects( $info );
-					if ( ! isset( $debug_data[ $TXN_ID ] ) ) {
-						$debug_data[ $TXN_ID ] = array();
+					$info = $this->_strip_objects($info);
+					if ( ! isset($debug_data[$TXN_ID])) {
+						$debug_data[$TXN_ID] = array();
 					}
-					$debug_data[ $TXN_ID ][ microtime() ] = array_merge(
+					$debug_data[$TXN_ID][microtime()] = array_merge(
 						$default_data,
 						$info
 					);
-					update_option( 'EE_DEBUG_SPCO_' . EE_Session::instance()->id(), $debug_data );
+					update_option('EE_DEBUG_SPCO_'.EE_Session::instance()->id(), $debug_data);
 				}
 			}
 		}
@@ -1268,23 +1268,23 @@ 
 	 * @param array $info
 	 * @return array
 	 */
-	public function _strip_objects( $info = array() ) {
-		foreach ( (array)$info as $key => $value ) {
-			if ( is_array( $value )) {
-				$info[ $key ] = $this->_strip_objects( $value );
-			} else if ( is_object( $value ) ) {
-				$object_class = get_class( $value );
-				$info[ $object_class ] = array();
-				$info[ $object_class ][ 'ID' ] = method_exists( $value, 'ID' ) ? $value->ID() : 0;
-				if ( method_exists( $value, 'status' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status();
-				} else if ( method_exists( $value, 'status_ID' ) ) {
-					$info[ $object_class ][ 'status' ] = $value->status_ID();
+	public function _strip_objects($info = array()) {
+		foreach ((array) $info as $key => $value) {
+			if (is_array($value)) {
+				$info[$key] = $this->_strip_objects($value);
+			} else if (is_object($value)) {
+				$object_class = get_class($value);
+				$info[$object_class] = array();
+				$info[$object_class]['ID'] = method_exists($value, 'ID') ? $value->ID() : 0;
+				if (method_exists($value, 'status')) {
+					$info[$object_class]['status'] = $value->status();
+				} else if (method_exists($value, 'status_ID')) {
+					$info[$object_class]['status'] = $value->status_ID();
 				}
-				unset( $info[ $key ] );
+				unset($info[$key]);
 			}
 		}
-		return (array)$info;
+		return (array) $info;
 	}
 
 

modules/single_page_checkout/EED_Single_Page_Checkout.module.php

Indentation +2 added lines, -2 removed lines

@@ -817,12 +817,12 @@
 			if ( $registration instanceof EE_Registration ) {
 				// we display all attendee info for the primary registrant
 				if ( $this->checkout->reg_url_link === $registration->reg_url_link()
-				     && $registration->is_primary_registrant()
+					 && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
 				} else if ( $this->checkout->revisit
-				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
+							&& $this->checkout->reg_url_link !== $registration->reg_url_link()
 				) {
 					// but hide info if it doesn't belong to you
 					$transaction->clear_cache( 'Registration', $registration->ID() );

Spacing +262 added lines, -262 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'); }
 /**
  * Single Page Checkout (SPCO)
  *
@@ -38,8 +38,8 @@ 
 	 * @return EED_Single_Page_Checkout
 	 */
 	public static function instance() {
-		add_filter( 'EED_Single_Page_Checkout__SPCO_active', '__return_true' );
-		return parent::get_instance( __CLASS__ );
+		add_filter('EED_Single_Page_Checkout__SPCO_active', '__return_true');
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -84,22 +84,22 @@ 
 	 */
 	public static function set_hooks_admin() {
 		EED_Single_Page_Checkout::set_definitions();
-		if ( defined( 'DOING_AJAX' )) {
+		if (defined('DOING_AJAX')) {
 			// going to start an output buffer in case anything gets accidentally output that might disrupt our JSON response
 			ob_start();
 			EED_Single_Page_Checkout::load_request_handler();
 			EED_Single_Page_Checkout::load_reg_steps();
 		} else {
 			// hook into the top of pre_get_posts to set the reg step routing, which gives other modules or plugins a chance to modify the reg steps, but just before the routes get called
-			add_action( 'pre_get_posts', array( 'EED_Single_Page_Checkout', 'load_reg_steps' ), 1 );
+			add_action('pre_get_posts', array('EED_Single_Page_Checkout', 'load_reg_steps'), 1);
 		}
 		// set ajax hooks
-		add_action( 'wp_ajax_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_nopriv_process_reg_step', array( 'EED_Single_Page_Checkout', 'process_reg_step' ));
-		add_action( 'wp_ajax_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_nopriv_display_spco_reg_step', array( 'EED_Single_Page_Checkout', 'display_reg_step' ));
-		add_action( 'wp_ajax_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
-		add_action( 'wp_ajax_nopriv_update_reg_step', array( 'EED_Single_Page_Checkout', 'update_reg_step' ));
+		add_action('wp_ajax_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_nopriv_process_reg_step', array('EED_Single_Page_Checkout', 'process_reg_step'));
+		add_action('wp_ajax_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_nopriv_display_spco_reg_step', array('EED_Single_Page_Checkout', 'display_reg_step'));
+		add_action('wp_ajax_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
+		add_action('wp_ajax_nopriv_update_reg_step', array('EED_Single_Page_Checkout', 'update_reg_step'));
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @param string $ajax_action
 	 * @throws \EE_Error
 	 */
-	public static function process_ajax_request( $ajax_action ) {
-		EE_Registry::instance()->REQ->set( 'action', $ajax_action );
+	public static function process_ajax_request($ajax_action) {
+		EE_Registry::instance()->REQ->set('action', $ajax_action);
 		EED_Single_Page_Checkout::instance()->_initialize();
 	}
 
@@ -123,7 +123,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function display_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'display_spco_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('display_spco_reg_step');
 	}
 
 
@@ -134,7 +134,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function process_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'process_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('process_reg_step');
 	}
 
 
@@ -145,7 +145,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_reg_step() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_reg_step' );
+		EED_Single_Page_Checkout::process_ajax_request('update_reg_step');
 	}
 
 
@@ -158,7 +158,7 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function update_checkout() {
-		EED_Single_Page_Checkout::process_ajax_request( 'update_checkout' );
+		EED_Single_Page_Checkout::process_ajax_request('update_checkout');
 	}
 
 
@@ -171,8 +171,8 @@ 
 	 */
 	public static function load_request_handler() {
 		// load core Request_Handler class
-		if ( ! isset( EE_Registry::instance()->REQ )) {
-			EE_Registry::instance()->load_core( 'Request_Handler' );
+		if ( ! isset(EE_Registry::instance()->REQ)) {
+			EE_Registry::instance()->load_core('Request_Handler');
 		}
 	}
 
@@ -186,14 +186,14 @@ 
 	 * @throws \EE_Error
 	 */
 	public static function set_definitions() {
-		define( 'SPCO_BASE_PATH', rtrim( str_replace( array( '\\', '/' ), DS, plugin_dir_path( __FILE__ )), DS ) . DS );
-		define( 'SPCO_CSS_URL', plugin_dir_url( __FILE__ ) . 'css' . DS );
-		define( 'SPCO_IMG_URL', plugin_dir_url( __FILE__ ) . 'img' . DS );
-		define( 'SPCO_JS_URL', plugin_dir_url( __FILE__ ) . 'js' . DS );
-		define( 'SPCO_INC_PATH', SPCO_BASE_PATH . 'inc' . DS );
-		define( 'SPCO_REG_STEPS_PATH', SPCO_BASE_PATH . 'reg_steps' . DS );
-		define( 'SPCO_TEMPLATES_PATH', SPCO_BASE_PATH . 'templates' . DS );
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( SPCO_BASE_PATH, TRUE );
+		define('SPCO_BASE_PATH', rtrim(str_replace(array('\\', '/'), DS, plugin_dir_path(__FILE__)), DS).DS);
+		define('SPCO_CSS_URL', plugin_dir_url(__FILE__).'css'.DS);
+		define('SPCO_IMG_URL', plugin_dir_url(__FILE__).'img'.DS);
+		define('SPCO_JS_URL', plugin_dir_url(__FILE__).'js'.DS);
+		define('SPCO_INC_PATH', SPCO_BASE_PATH.'inc'.DS);
+		define('SPCO_REG_STEPS_PATH', SPCO_BASE_PATH.'reg_steps'.DS);
+		define('SPCO_TEMPLATES_PATH', SPCO_BASE_PATH.'templates'.DS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(SPCO_BASE_PATH, TRUE);
 	}
 
 
@@ -208,7 +208,7 @@ 
 	 */
 	public static function load_reg_steps() {
 		static $reg_steps_loaded = FALSE;
-		if ( $reg_steps_loaded ) {
+		if ($reg_steps_loaded) {
 			return;
 		}
 		// filter list of reg_steps
@@ -217,24 +217,24 @@ 
 			EED_Single_Page_Checkout::get_reg_steps()
 		);
 		// sort by key (order)
-		ksort( $reg_steps_to_load );
+		ksort($reg_steps_to_load);
 		// loop through folders
-		foreach ( $reg_steps_to_load as $order => $reg_step ) {
+		foreach ($reg_steps_to_load as $order => $reg_step) {
 			// we need a
-			if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+			if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 				// copy over to the reg_steps_array
-				EED_Single_Page_Checkout::$_reg_steps_array[ $order ] = $reg_step;
+				EED_Single_Page_Checkout::$_reg_steps_array[$order] = $reg_step;
 				// register custom key route for each reg step
 				// ie: step=>"slug" - this is the entire reason we load the reg steps array now
-				EE_Config::register_route( $reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step' );
+				EE_Config::register_route($reg_step['slug'], 'EED_Single_Page_Checkout', 'run', 'step');
 				// add AJAX or other hooks
-				if ( isset( $reg_step['has_hooks'] ) && $reg_step['has_hooks'] ) {
+				if (isset($reg_step['has_hooks']) && $reg_step['has_hooks']) {
 					// setup autoloaders if necessary
-					if ( ! class_exists( $reg_step['class_name'] )) {
-						EEH_Autoloader::register_autoloaders_for_each_file_in_folder( $reg_step['file_path'], TRUE );
+					if ( ! class_exists($reg_step['class_name'])) {
+						EEH_Autoloader::register_autoloaders_for_each_file_in_folder($reg_step['file_path'], TRUE);
 					}
-					if ( is_callable( $reg_step['class_name'], 'set_hooks' )) {
-						call_user_func( array( $reg_step['class_name'], 'set_hooks' ));
+					if (is_callable($reg_step['class_name'], 'set_hooks')) {
+						call_user_func(array($reg_step['class_name'], 'set_hooks'));
 					}
 				}
 			}
@@ -253,28 +253,28 @@ 
 	 */
 	public static function get_reg_steps() {
 		$reg_steps = EE_Registry::instance()->CFG->registration->reg_steps;
-		if ( empty( $reg_steps )) {
+		if (empty($reg_steps)) {
 			$reg_steps = array(
 				10 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'attendee_information',
+					'file_path' => SPCO_REG_STEPS_PATH.'attendee_information',
 					'class_name' => 'EE_SPCO_Reg_Step_Attendee_Information',
 					'slug' => 'attendee_information',
 					'has_hooks' => FALSE
 				),
 				20 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'registration_confirmation',
+					'file_path' => SPCO_REG_STEPS_PATH.'registration_confirmation',
 					'class_name' => 'EE_SPCO_Reg_Step_Registration_Confirmation',
 					'slug' => 'registration_confirmation',
 					'has_hooks' => FALSE
 				),
 				30 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'payment_options',
+					'file_path' => SPCO_REG_STEPS_PATH.'payment_options',
 					'class_name' => 'EE_SPCO_Reg_Step_Payment_Options',
 					'slug' => 'payment_options',
 					'has_hooks' => TRUE
 				),
 				999 => array(
-					'file_path' => SPCO_REG_STEPS_PATH . 'finalize_registration',
+					'file_path' => SPCO_REG_STEPS_PATH.'finalize_registration',
 					'class_name' => 'EE_SPCO_Reg_Step_Finalize_Registration',
 					'slug' => 'finalize_registration',
 					'has_hooks' => FALSE
@@ -295,9 +295,9 @@ 
 	 */
 	public static function registration_checkout_for_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'display_spco_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', false );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'display_spco_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', false);
 		EED_Single_Page_Checkout::instance()->_initialize();
 		EED_Single_Page_Checkout::instance()->_display_spco_reg_form();
 		return EE_Registry::instance()->REQ->get_output();
@@ -314,15 +314,15 @@ 
 	 */
 	public static function process_registration_from_admin() {
 		EED_Single_Page_Checkout::load_reg_steps();
-		EE_Registry::instance()->REQ->set( 'step', 'attendee_information' );
-		EE_Registry::instance()->REQ->set( 'action', 'process_reg_step' );
-		EE_Registry::instance()->REQ->set( 'process_form_submission', true );
+		EE_Registry::instance()->REQ->set('step', 'attendee_information');
+		EE_Registry::instance()->REQ->set('action', 'process_reg_step');
+		EE_Registry::instance()->REQ->set('process_form_submission', true);
 		EED_Single_Page_Checkout::instance()->_initialize();
-		if ( EED_Single_Page_Checkout::instance()->checkout->current_step->completed() ) {
-			$final_reg_step = end( EED_Single_Page_Checkout::instance()->checkout->reg_steps );
-			if ( $final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration ) {
-				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated( $final_reg_step );
-				if ( $final_reg_step->process_reg_step() ) {
+		if (EED_Single_Page_Checkout::instance()->checkout->current_step->completed()) {
+			$final_reg_step = end(EED_Single_Page_Checkout::instance()->checkout->reg_steps);
+			if ($final_reg_step instanceof EE_SPCO_Reg_Step_Finalize_Registration) {
+				EED_Single_Page_Checkout::instance()->checkout->set_reg_step_initiated($final_reg_step);
+				if ($final_reg_step->process_reg_step()) {
 					$final_reg_step->set_completed();
 					EED_Single_Page_Checkout::instance()->checkout->update_txn_reg_steps_array();
 					return EED_Single_Page_Checkout::instance()->checkout->transaction;
@@ -342,11 +342,11 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public function run( $WP_Query ) {
+	public function run($WP_Query) {
 		if (
 			$WP_Query instanceof WP_Query
 			&& $WP_Query->is_main_query()
-			&& apply_filters( 'FHEE__EED_Single_Page_Checkout__run', true )
+			&& apply_filters('FHEE__EED_Single_Page_Checkout__run', true)
 		) {
 			$this->_initialize();
 		}
@@ -362,8 +362,8 @@ 
 	 * @return    void
 	 * @throws \EE_Error
 	 */
-	public static function init( $WP_Query ) {
-		EED_Single_Page_Checkout::instance()->run( $WP_Query );
+	public static function init($WP_Query) {
+		EED_Single_Page_Checkout::instance()->run($WP_Query);
 	}
 
 
@@ -377,36 +377,36 @@ 
 	 */
 	private function _initialize() {
 		// ensure SPCO doesn't run twice
-		if ( EED_Single_Page_Checkout::$_initialized ) {
+		if (EED_Single_Page_Checkout::$_initialized) {
 			return;
 		}
 		try {
 			// setup the EE_Checkout object
 			$this->checkout = $this->_initialize_checkout();
 			// filter checkout
-			$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout );
+			$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize__checkout', $this->checkout);
 			// get the $_GET
 			$this->_get_request_vars();
 			// filter continue_reg
-			$this->checkout->continue_reg = apply_filters( 'FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout );
+			$this->checkout->continue_reg = apply_filters('FHEE__EED_Single_Page_Checkout__init___continue_reg', TRUE, $this->checkout);
 			// load the reg steps array
-			if ( ! $this->_load_and_instantiate_reg_steps() ) {
+			if ( ! $this->_load_and_instantiate_reg_steps()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
 			// set the current step
-			$this->checkout->set_current_step( $this->checkout->step );
+			$this->checkout->set_current_step($this->checkout->step);
 			// and the next step
 			$this->checkout->set_next_step();
 			// was there already a valid transaction in the checkout from the session ?
-			if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+			if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 				// get transaction from db or session
 				$this->checkout->transaction = $this->checkout->reg_url_link && ! is_admin()
 					? $this->_get_transaction_and_cart_for_previous_visit()
 					: $this->_get_cart_for_current_session_and_setup_new_transaction();
-				if ( ! $this->checkout->transaction instanceof EE_Transaction ) {
+				if ( ! $this->checkout->transaction instanceof EE_Transaction) {
 					EE_Error::add_error(
-						__( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ),
+						__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 					// add some style and make it dance
@@ -416,10 +416,10 @@ 
 					return;
 				}
 				// and the registrations for the transaction
-				$this->_get_registrations( $this->checkout->transaction );
+				$this->_get_registrations($this->checkout->transaction);
 			}
 			// verify that everything has been setup correctly
-			if ( ! $this->_final_verifications() ) {
+			if ( ! $this->_final_verifications()) {
 				EED_Single_Page_Checkout::$_initialized = true;
 				return;
 			}
@@ -444,9 +444,9 @@ 
 			// set no cache headers and constants
 			EE_System::do_not_cache();
 			// add anchor
-			add_action( 'loop_start', array( $this, 'set_checkout_anchor' ), 1 );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			add_action('loop_start', array($this, 'set_checkout_anchor'), 1);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 	}
 
@@ -464,20 +464,20 @@ 
 		// look in session for existing checkout
 		$checkout = EE_Registry::instance()->SSN->checkout();
 		// verify
-		if ( ! $checkout instanceof EE_Checkout ) {
+		if ( ! $checkout instanceof EE_Checkout) {
 			// instantiate EE_Checkout object for handling the properties of the current checkout process
-			$checkout = EE_Registry::instance()->load_file( SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE  );
+			$checkout = EE_Registry::instance()->load_file(SPCO_INC_PATH, 'EE_Checkout', 'class', array(), FALSE);
 		} else {
-			if ( $checkout->current_step->is_final_step() && $checkout->exit_spco() === true )  {
+			if ($checkout->current_step->is_final_step() && $checkout->exit_spco() === true) {
 				$this->unlock_transaction();
-				wp_safe_redirect( $checkout->redirect_url );
+				wp_safe_redirect($checkout->redirect_url);
 				exit();
 			}
 		}
-		$checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout );
+		$checkout = apply_filters('FHEE__EED_Single_Page_Checkout___initialize_checkout__checkout', $checkout);
 		// verify again
-		if ( ! $checkout instanceof EE_Checkout ) {
-			throw new EE_Error( __( 'The EE_Checkout class could not be loaded.', 'event_espresso' ) );
+		if ( ! $checkout instanceof EE_Checkout) {
+			throw new EE_Error(__('The EE_Checkout class could not be loaded.', 'event_espresso'));
 		}
 		// reset anything that needs a clean slate for each request
 		$checkout->reset_for_current_request();
@@ -497,24 +497,24 @@ 
 		// load classes
 		EED_Single_Page_Checkout::load_request_handler();
 		//make sure this request is marked as belonging to EE
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
 		// which step is being requested ?
-		$this->checkout->step = EE_Registry::instance()->REQ->get( 'step', $this->_get_first_step() );
+		$this->checkout->step = EE_Registry::instance()->REQ->get('step', $this->_get_first_step());
 		// which step is being edited ?
-		$this->checkout->edit_step = EE_Registry::instance()->REQ->get( 'edit_step', '' );
+		$this->checkout->edit_step = EE_Registry::instance()->REQ->get('edit_step', '');
 		// and what we're doing on the current step
-		$this->checkout->action = EE_Registry::instance()->REQ->get( 'action', 'display_spco_reg_step' );
+		$this->checkout->action = EE_Registry::instance()->REQ->get('action', 'display_spco_reg_step');
 		// returning to edit ?
-		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get( 'e_reg_url_link', '' );
+		$this->checkout->reg_url_link = EE_Registry::instance()->REQ->get('e_reg_url_link', '');
 		// or some other kind of revisit ?
-		$this->checkout->revisit = EE_Registry::instance()->REQ->get( 'revisit', FALSE );
+		$this->checkout->revisit = EE_Registry::instance()->REQ->get('revisit', FALSE);
 		// and whether or not to generate a reg form for this request
-		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get( 'generate_reg_form', TRUE ); 		// TRUE 	FALSE
+		$this->checkout->generate_reg_form = EE_Registry::instance()->REQ->get('generate_reg_form', TRUE); // TRUE 	FALSE
 		// and whether or not to process a reg form submission for this request
-		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get( 'process_form_submission', FALSE ); 		// TRUE 	FALSE
+		$this->checkout->process_form_submission = EE_Registry::instance()->REQ->get('process_form_submission', FALSE); // TRUE 	FALSE
 		$this->checkout->process_form_submission = $this->checkout->action !== 'display_spco_reg_step'
 			? $this->checkout->process_form_submission
-			: FALSE; 		// TRUE 	FALSE
+			: FALSE; // TRUE 	FALSE
 		// $this->_display_request_vars();
 	}
 
@@ -527,17 +527,17 @@ 
 	 * @return    void
 	 */
 	protected function _display_request_vars() {
-		if ( ! WP_DEBUG ) {
+		if ( ! WP_DEBUG) {
 			return;
 		}
-		EEH_Debug_Tools::printr( $_REQUEST, '$_REQUEST', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->step, '$this->checkout->step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->action, '$this->checkout->action', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__ );
-		EEH_Debug_Tools::printr( $this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__ );
+		EEH_Debug_Tools::printr($_REQUEST, '$_REQUEST', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->step, '$this->checkout->step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->edit_step, '$this->checkout->edit_step', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->action, '$this->checkout->action', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->reg_url_link, '$this->checkout->reg_url_link', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->revisit, '$this->checkout->revisit', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->generate_reg_form, '$this->checkout->generate_reg_form', __FILE__, __LINE__);
+		EEH_Debug_Tools::printr($this->checkout->process_form_submission, '$this->checkout->process_form_submission', __FILE__, __LINE__);
 	}
 
 
@@ -551,8 +551,8 @@ 
 	 * @return    array
 	 */
 	private function _get_first_step() {
-		$first_step = reset( EED_Single_Page_Checkout::$_reg_steps_array );
-		return isset( $first_step['slug'] ) ? $first_step['slug'] : 'attendee_information';
+		$first_step = reset(EED_Single_Page_Checkout::$_reg_steps_array);
+		return isset($first_step['slug']) ? $first_step['slug'] : 'attendee_information';
 	}
 
 
@@ -568,27 +568,27 @@ 
 	private function _load_and_instantiate_reg_steps() {
 		// have reg_steps already been instantiated ?
 		if (
-			empty( $this->checkout->reg_steps ) ||
-			apply_filters( 'FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout )
+			empty($this->checkout->reg_steps) ||
+			apply_filters('FHEE__Single_Page_Checkout__load_reg_steps__reload_reg_steps', false, $this->checkout)
 		) {
 			// if not, then loop through raw reg steps array
-			foreach ( EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step ) {
-				if ( ! $this->_load_and_instantiate_reg_step( $reg_step, $order )) {
+			foreach (EED_Single_Page_Checkout::$_reg_steps_array as $order => $reg_step) {
+				if ( ! $this->_load_and_instantiate_reg_step($reg_step, $order)) {
 					return false;
 				}
 			}
 			EE_Registry::instance()->CFG->registration->skip_reg_confirmation = TRUE;
 			EE_Registry::instance()->CFG->registration->reg_confirmation_last = TRUE;
 			// skip the registration_confirmation page ?
-			if ( EE_Registry::instance()->CFG->registration->skip_reg_confirmation ) {
+			if (EE_Registry::instance()->CFG->registration->skip_reg_confirmation) {
 				// just remove it from the reg steps array
-				$this->checkout->remove_reg_step( 'registration_confirmation', false );
+				$this->checkout->remove_reg_step('registration_confirmation', false);
 			} else if (
-				isset( $this->checkout->reg_steps['registration_confirmation'] )
+				isset($this->checkout->reg_steps['registration_confirmation'])
 				&& EE_Registry::instance()->CFG->registration->reg_confirmation_last
 			) {
 				// set the order to something big like 100
-				$this->checkout->set_reg_step_order( 'registration_confirmation', 100 );
+				$this->checkout->set_reg_step_order('registration_confirmation', 100);
 			}
 			// filter the array for good luck
 			$this->checkout->reg_steps = apply_filters(
@@ -598,13 +598,13 @@ 
 			// finally re-sort based on the reg step class order properties
 			$this->checkout->sort_reg_steps();
 		} else {
-			foreach ( $this->checkout->reg_steps as $reg_step ) {
+			foreach ($this->checkout->reg_steps as $reg_step) {
 				// set all current step stati to FALSE
-				$reg_step->set_is_current_step( FALSE );
+				$reg_step->set_is_current_step(FALSE);
 			}
 		}
-		if ( empty( $this->checkout->reg_steps )) {
-			EE_Error::add_error( __( 'No Reg Steps were loaded..', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+		if (empty($this->checkout->reg_steps)) {
+			EE_Error::add_error(__('No Reg Steps were loaded..', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 			// make reg step details available to JS
@@ -622,10 +622,10 @@ 
 	 * @param int   $order
 	 * @return bool
 	 */
-	private function _load_and_instantiate_reg_step( $reg_step = array(), $order = 0 ) {
+	private function _load_and_instantiate_reg_step($reg_step = array(), $order = 0) {
 
 		// we need a file_path, class_name, and slug to add a reg step
-		if ( isset( $reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'] )) {
+		if (isset($reg_step['file_path'], $reg_step['class_name'], $reg_step['slug'])) {
 			// if editing a specific step, but this is NOT that step... (and it's not the 'finalize_registration' step)
 			if (
 				$this->checkout->reg_url_link
@@ -643,26 +643,26 @@ 
 				FALSE
 			);
 			// did we gets the goods ?
-			if ( $reg_step_obj instanceof EE_SPCO_Reg_Step ) {
+			if ($reg_step_obj instanceof EE_SPCO_Reg_Step) {
 				// set reg step order based on config
-				$reg_step_obj->set_order( $order );
+				$reg_step_obj->set_order($order);
 				// add instantiated reg step object to the master reg steps array
-				$this->checkout->add_reg_step( $reg_step_obj );
+				$this->checkout->add_reg_step($reg_step_obj);
 			} else {
 				EE_Error::add_error(
-					__( 'The current step could not be set.', 'event_espresso' ),
+					__('The current step could not be set.', 'event_espresso'),
 					__FILE__, __FUNCTION__, __LINE__
 				);
 				return false;
 			}
 		} else {
-			if ( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				EE_Error::add_error(
 					sprintf(
-						__( 'A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso' ),
-						isset( $reg_step['file_path'] ) ? $reg_step['file_path'] : '',
-						isset( $reg_step['class_name'] ) ? $reg_step['class_name'] : '',
-						isset( $reg_step['slug'] ) ? $reg_step['slug'] : '',
+						__('A registration step could not be loaded. One or more of the following data points is invalid:%4$s%5$sFile Path: %1$s%6$s%5$sClass Name: %2$s%6$s%5$sSlug: %3$s%6$s%7$s', 'event_espresso'),
+						isset($reg_step['file_path']) ? $reg_step['file_path'] : '',
+						isset($reg_step['class_name']) ? $reg_step['class_name'] : '',
+						isset($reg_step['slug']) ? $reg_step['slug'] : '',
 						'<ul>',
 						'<li>',
 						'</li>',
@@ -686,16 +686,16 @@ 
 	 */
 	private function _get_transaction_and_cart_for_previous_visit() {
 		/** @var $TXN_model EEM_Transaction */
-		$TXN_model = EE_Registry::instance()->load_model( 'Transaction' );
+		$TXN_model = EE_Registry::instance()->load_model('Transaction');
 		// because the reg_url_link is present in the request, this is a return visit to SPCO, so we'll get the transaction data from the db
-		$transaction = $TXN_model->get_transaction_from_reg_url_link( $this->checkout->reg_url_link );
+		$transaction = $TXN_model->get_transaction_from_reg_url_link($this->checkout->reg_url_link);
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// and get the cart that was used for that transaction
-			$this->checkout->cart = $this->_get_cart_for_transaction( $transaction );
+			$this->checkout->cart = $this->_get_cart_for_transaction($transaction);
 			return $transaction;
 		} else {
-			EE_Error::add_error( __( 'Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__);
+			EE_Error::add_error(__('Your Registration and Transaction information could not be retrieved from the db.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return NULL;
 		}
 	}
@@ -709,8 +709,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	private function _get_cart_for_transaction( $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	private function _get_cart_for_transaction($transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -722,8 +722,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return EE_Cart
 	 */
-	public function get_cart_for_transaction( EE_Transaction $transaction ) {
-		return $this->checkout->get_cart_for_transaction( $transaction );
+	public function get_cart_for_transaction(EE_Transaction $transaction) {
+		return $this->checkout->get_cart_for_transaction($transaction);
 	}
 
 
@@ -739,17 +739,17 @@ 
 	private function _get_cart_for_current_session_and_setup_new_transaction() {
 		//  if there's no transaction, then this is the FIRST visit to SPCO
 		// so load up the cart ( passing nothing for the TXN because it doesn't exist yet )
-		$this->checkout->cart = $this->_get_cart_for_transaction( NULL );
+		$this->checkout->cart = $this->_get_cart_for_transaction(NULL);
 		// and then create a new transaction
 		$transaction = $this->_initialize_transaction();
 		// verify transaction
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			// save it so that we have an ID for other objects to use
 			$transaction->save();
 			// and save TXN data to the cart
-			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn( $transaction->ID() );
+			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn($transaction->ID());
 		} else {
-			EE_Error::add_error( __( 'A Valid Transaction could not be initialized.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('A Valid Transaction could not be initialized.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $transaction;
 	}
@@ -769,15 +769,15 @@ 
 			// grab the cart grand total
 			$cart_total = $this->checkout->cart->get_cart_grand_total();
 			// create new TXN
-			return EE_Transaction::new_instance( array(
+			return EE_Transaction::new_instance(array(
 				'TXN_timestamp' 	=> time(),
 				'TXN_reg_steps' 		=> $this->checkout->initialize_txn_reg_steps_array(),
 				'TXN_total' 				=> $cart_total > 0 ? $cart_total : 0,
 				'TXN_paid' 				=> 0,
 				'STS_ID' 					=> EEM_Transaction::failed_status_code,
 			));
-		} catch( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return NULL;
 	}
@@ -792,38 +792,38 @@ 
 	 * @return EE_Cart
 	 * @throws \EE_Error
 	 */
-	private function _get_registrations( EE_Transaction $transaction ) {
+	private function _get_registrations(EE_Transaction $transaction) {
 		// first step: grab the registrants  { : o
-		$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, true );
+		$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, true);
 		// verify registrations have been set
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// if no cached registrations, then check the db
-			$registrations = $transaction->registrations( $this->checkout->reg_cache_where_params, false );
+			$registrations = $transaction->registrations($this->checkout->reg_cache_where_params, false);
 			// still nothing ? well as long as this isn't a revisit
-			if ( empty( $registrations ) && ! $this->checkout->revisit ) {
+			if (empty($registrations) && ! $this->checkout->revisit) {
 				// generate new registrations from scratch
-				$registrations = $this->_initialize_registrations( $transaction );
+				$registrations = $this->_initialize_registrations($transaction);
 			}
 		}
 		// sort by their original registration order
-		usort( $registrations, array( 'EED_Single_Page_Checkout', 'sort_registrations_by_REG_count' ));
+		usort($registrations, array('EED_Single_Page_Checkout', 'sort_registrations_by_REG_count'));
 		// then loop thru the array
-		foreach ( $registrations as $registration ) {
+		foreach ($registrations as $registration) {
 			// verify each registration
-			if ( $registration instanceof EE_Registration ) {
+			if ($registration instanceof EE_Registration) {
 				// we display all attendee info for the primary registrant
-				if ( $this->checkout->reg_url_link === $registration->reg_url_link()
+				if ($this->checkout->reg_url_link === $registration->reg_url_link()
 				     && $registration->is_primary_registrant()
 				) {
 					$this->checkout->primary_revisit = true;
 					break;
-				} else if ( $this->checkout->revisit
+				} else if ($this->checkout->revisit
 				            && $this->checkout->reg_url_link !== $registration->reg_url_link()
 				) {
 					// but hide info if it doesn't belong to you
-					$transaction->clear_cache( 'Registration', $registration->ID() );
+					$transaction->clear_cache('Registration', $registration->ID());
 				}
-				$this->checkout->set_reg_status_updated( $registration->ID(), false );
+				$this->checkout->set_reg_status_updated($registration->ID(), false);
 			}
 		}
 	}
@@ -838,17 +838,17 @@ 
 	 * @return    array
 	 * @throws \EE_Error
 	 */
-	private function _initialize_registrations( EE_Transaction $transaction ) {
+	private function _initialize_registrations(EE_Transaction $transaction) {
 		$att_nmbr = 0;
 		$registrations = array();
-		if ( $transaction instanceof EE_Transaction ) {
+		if ($transaction instanceof EE_Transaction) {
 			/** @type EE_Registration_Processor $registration_processor */
-			$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+			$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 			$this->checkout->total_ticket_count = $this->checkout->cart->all_ticket_quantity_count();
 			// now let's add the cart items to the $transaction
-			foreach ( $this->checkout->cart->get_tickets() as $line_item ) {
+			foreach ($this->checkout->cart->get_tickets() as $line_item) {
 				//do the following for each ticket of this type they selected
-				for ( $x = 1; $x <= $line_item->quantity(); $x++ ) {
+				for ($x = 1; $x <= $line_item->quantity(); $x++) {
 					$att_nmbr++;
 					$registration = $registration_processor->generate_ONE_registration_from_line_item(
 						$line_item,
@@ -856,12 +856,12 @@ 
 						$att_nmbr,
 						$this->checkout->total_ticket_count
 					);
-					if ( $registration instanceof EE_Registration ) {
-						$registrations[ $registration->ID() ] = $registration;
+					if ($registration instanceof EE_Registration) {
+						$registrations[$registration->ID()] = $registration;
 					}
 				}
 			}
-			$registration_processor->fix_reg_final_price_rounding_issue( $transaction );
+			$registration_processor->fix_reg_final_price_rounding_issue($transaction);
 		}
 		return $registrations;
 	}
@@ -876,12 +876,12 @@ 
 	 * @param EE_Registration $reg_B
 	 * @return array()
 	 */
-	public static function sort_registrations_by_REG_count( EE_Registration $reg_A, EE_Registration $reg_B ) {
+	public static function sort_registrations_by_REG_count(EE_Registration $reg_A, EE_Registration $reg_B) {
 		// this shouldn't ever happen within the same TXN, but oh well
-		if ( $reg_A->count() === $reg_B->count() ) {
+		if ($reg_A->count() === $reg_B->count()) {
 			return 0;
 		}
-		return ( $reg_A->count() > $reg_B->count() ) ? 1 : -1;
+		return ($reg_A->count() > $reg_B->count()) ? 1 : -1;
 	}
 
 
@@ -896,21 +896,21 @@ 
 	 */
 	private function _final_verifications() {
 		// filter checkout
-		$this->checkout = apply_filters( 'FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout );
+		$this->checkout = apply_filters('FHEE__EED_Single_Page_Checkout___final_verifications__checkout', $this->checkout);
 		//verify that current step is still set correctly
-		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step ) {
-			EE_Error::add_error( __( 'We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $this->checkout->current_step instanceof EE_SPCO_Reg_Step) {
+			EE_Error::add_error(__('We\'re sorry but the registration process can not proceed because one or more registration steps were not setup correctly. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// if returning to SPCO, then verify that primary registrant is set
-		if ( ! empty( $this->checkout->reg_url_link )) {
+		if ( ! empty($this->checkout->reg_url_link)) {
 			$valid_registrant = $this->checkout->transaction->primary_registration();
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the primary registrant for this transaction. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 			$valid_registrant = null;
-			foreach ( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) as $registration ) {
+			foreach ($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params) as $registration) {
 				if (
 					$registration instanceof EE_Registration
 					&& $registration->reg_url_link() === $this->checkout->reg_url_link
@@ -918,14 +918,14 @@ 
 					$valid_registrant = $registration;
 				}
 			}
-			if ( ! $valid_registrant instanceof EE_Registration ) {
-				EE_Error::add_error( __( 'We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			if ( ! $valid_registrant instanceof EE_Registration) {
+				EE_Error::add_error(__('We\'re sorry but there appears to be an error with the "reg_url_link" or the transaction itself. Please refresh the page and try again or contact support.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
 		// now that things have been kinda sufficiently verified,
 		// let's add the checkout to the session so that's available other systems
-		EE_Registry::instance()->SSN->set_checkout( $this->checkout );
+		EE_Registry::instance()->SSN->set_checkout($this->checkout);
 		return true;
 	}
 
@@ -940,28 +940,28 @@ 
 	 * @param bool $reinitializing
 	 * @throws \EE_Error
 	 */
-	private function _initialize_reg_steps( $reinitializing = false ) {
-		$this->checkout->set_reg_step_initiated( $this->checkout->current_step );
+	private function _initialize_reg_steps($reinitializing = false) {
+		$this->checkout->set_reg_step_initiated($this->checkout->current_step);
 		// loop thru all steps to call their individual "initialize" methods and set i18n strings for JS
-		foreach ( $this->checkout->reg_steps as $reg_step ) {
-			if ( ! $reg_step->initialize_reg_step() ) {
+		foreach ($this->checkout->reg_steps as $reg_step) {
+			if ( ! $reg_step->initialize_reg_step()) {
 				// if not initialized then maybe this step is being removed...
-				if ( ! $reinitializing && $reg_step->is_current_step() ) {
+				if ( ! $reinitializing && $reg_step->is_current_step()) {
 					// if it was the current step, then we need to start over here
-					$this->_initialize_reg_steps( true );
+					$this->_initialize_reg_steps(true);
 					return;
 				}
 				continue;
 			}
 			// i18n
 			$reg_step->translate_js_strings();
-			if ( $reg_step->is_current_step() ) {
+			if ($reg_step->is_current_step()) {
 				// the text that appears on the reg step form submit button
 				$reg_step->set_submit_button_text();
 			}
 		}
 		// dynamically creates hook point like: AHEE__Single_Page_Checkout___initialize_reg_step__attendee_information
-		do_action( "AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step );
+		do_action("AHEE__Single_Page_Checkout___initialize_reg_step__{$this->checkout->current_step->slug()}", $this->checkout->current_step);
 	}
 
 
@@ -974,43 +974,43 @@ 
 	 */
 	private function _check_form_submission() {
 		//does this request require the reg form to be generated ?
-		if ( $this->checkout->generate_reg_form ) {
+		if ($this->checkout->generate_reg_form) {
 			// ever heard that song by Blue Rodeo ?
 			try {
 				$this->checkout->current_step->reg_form = $this->checkout->current_step->generate_reg_form();
 				// if not displaying a form, then check for form submission
-				if ( $this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted() ) {
+				if ($this->checkout->process_form_submission && $this->checkout->current_step->reg_form->was_submitted()) {
 					// clear out any old data in case this step is being run again
-					$this->checkout->current_step->set_valid_data( array() );
+					$this->checkout->current_step->set_valid_data(array());
 					// capture submitted form data
 					$this->checkout->current_step->reg_form->receive_form_submission(
-						apply_filters( 'FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout )
+						apply_filters('FHEE__Single_Page_Checkout___check_form_submission__request_params', EE_Registry::instance()->REQ->params(), $this->checkout)
 					);
 					// validate submitted form data
-					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid() ) {
+					if ( ! $this->checkout->continue_reg && ! $this->checkout->current_step->reg_form->is_valid()) {
 						// thou shall not pass !!!
 						$this->checkout->continue_reg = FALSE;
 						// any form validation errors?
-						if ( $this->checkout->current_step->reg_form->submission_error_message() !== '' ) {
+						if ($this->checkout->current_step->reg_form->submission_error_message() !== '') {
 							$submission_error_messages = array();
 							// bad, bad, bad registrant
-							foreach( $this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error ){
-								if ( $validation_error instanceof EE_Validation_Error ) {
+							foreach ($this->checkout->current_step->reg_form->get_validation_errors_accumulated() as $validation_error) {
+								if ($validation_error instanceof EE_Validation_Error) {
 									$submission_error_messages[] = sprintf(
-										__( '%s : %s', 'event_espresso' ),
+										__('%s : %s', 'event_espresso'),
 										$validation_error->get_form_section()->html_label_text(),
 										$validation_error->getMessage()
 									);
 								}
 							}
-							EE_Error::add_error( implode( '<br />', $submission_error_messages ), __FILE__, __FUNCTION__, __LINE__ );
+							EE_Error::add_error(implode('<br />', $submission_error_messages), __FILE__, __FUNCTION__, __LINE__);
 						}
 						// well not really... what will happen is we'll just get redirected back to redo the current step
 						$this->go_to_next_step();
 						return;
 					}
 				}
-			} catch( EE_Error $e ) {
+			} catch (EE_Error $e) {
 				$e->get_error();
 			}
 		}
@@ -1027,22 +1027,22 @@ 
 	 */
 	private function _process_form_action() {
 		// what cha wanna do?
-		switch( $this->checkout->action ) {
+		switch ($this->checkout->action) {
 			// AJAX next step reg form
 			case 'display_spco_reg_step' :
 				$this->checkout->redirect = FALSE;
-				if ( EE_Registry::instance()->REQ->ajax ) {
-					$this->checkout->json_response->set_reg_step_html( $this->checkout->current_step->display_reg_form() );
+				if (EE_Registry::instance()->REQ->ajax) {
+					$this->checkout->json_response->set_reg_step_html($this->checkout->current_step->display_reg_form());
 				}
 				break;
 
 			default :
 				// meh... do one of those other steps first
-				if ( ! empty( $this->checkout->action ) && is_callable( array( $this->checkout->current_step, $this->checkout->action ))) {
+				if ( ! empty($this->checkout->action) && is_callable(array($this->checkout->current_step, $this->checkout->action))) {
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__before_attendee_information__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__before_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 					// call action on current step
-					if ( call_user_func( array( $this->checkout->current_step, $this->checkout->action )) ) {
+					if (call_user_func(array($this->checkout->current_step, $this->checkout->action))) {
 						// good registrant, you get to proceed
 						if (
 							$this->checkout->current_step->success_message() !== ''
@@ -1053,7 +1053,7 @@ 
 						) {
 								EE_Error::add_success(
 									$this->checkout->current_step->success_message()
-									. '<br />' . $this->checkout->next_step->_instructions()
+									. '<br />'.$this->checkout->next_step->_instructions()
 								);
 
 						}
@@ -1061,12 +1061,12 @@ 
 						$this->_setup_redirect();
 					}
 					// dynamically creates hook point like: AHEE__Single_Page_Checkout__after_payment_options__process_reg_step
-					do_action( "AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step );
+					do_action("AHEE__Single_Page_Checkout__after_{$this->checkout->current_step->slug()}__{$this->checkout->action}", $this->checkout->current_step);
 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso' ),
+							__('The requested form action "%s" does not exist for the current "%s" registration step.', 'event_espresso'),
 							$this->checkout->action,
 							$this->checkout->current_step->name()
 						),
@@ -1092,10 +1092,10 @@ 
 	public function add_styles_and_scripts() {
 		// i18n
 		$this->translate_js_strings();
-		if ( $this->checkout->admin_request ) {
-			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10 );
+		if ($this->checkout->admin_request) {
+			add_action('admin_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		} else {
-			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles_and_scripts' ), 10 );
+			add_action('wp_enqueue_scripts', array($this, 'enqueue_styles_and_scripts'), 10);
 		}
 	}
 
@@ -1111,42 +1111,42 @@ 
 		EE_Registry::$i18n_js_strings['revisit'] = $this->checkout->revisit;
 		EE_Registry::$i18n_js_strings['e_reg_url_link'] = $this->checkout->reg_url_link;
 		EE_Registry::$i18n_js_strings['server_error'] = __('An unknown error occurred on the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['invalid_json_response'] = __( 'An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['validation_error'] = __( 'There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __( 'There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['invalid_json_response'] = __('An invalid response was returned from the server while attempting to process your request. Please refresh the page and try again or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['validation_error'] = __('There appears to be a problem with the form validation configuration! Please check the admin settings or contact support.', 'event_espresso');
+		EE_Registry::$i18n_js_strings['invalid_payment_method'] = __('There appears to be a problem with the payment method configuration! Please refresh the page and try again or contact support.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['reg_step_error'] = __('This registration step could not be completed. Please refresh the page and try again.', 'event_espresso');
 		EE_Registry::$i18n_js_strings['invalid_coupon'] = __('We\'re sorry but that coupon code does not appear to be valid. If this is incorrect, please contact the site administrator.', 'event_espresso');
-		EE_Registry::$i18n_js_strings['process_registration'] = sprintf( __( 'Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso' ), '<br/>', '<br/>' );
-		EE_Registry::$i18n_js_strings['language'] = get_bloginfo( 'language' );
+		EE_Registry::$i18n_js_strings['process_registration'] = sprintf(__('Please wait while we process your registration.%sDo not refresh the page or navigate away while this is happening.%sThank you for your patience.', 'event_espresso'), '<br/>', '<br/>');
+		EE_Registry::$i18n_js_strings['language'] = get_bloginfo('language');
 		EE_Registry::$i18n_js_strings['EESID'] = EE_Registry::instance()->SSN->id();
 		EE_Registry::$i18n_js_strings['currency'] = EE_Registry::instance()->CFG->currency;
 		EE_Registry::$i18n_js_strings['datepicker_yearRange'] = '-150:+20';
-		EE_Registry::$i18n_js_strings['timer_years'] = __( 'years', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_months'] = __( 'months', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_weeks'] = __( 'weeks', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_days'] = __( 'days', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hours'] = __( 'hours', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minutes'] = __( 'minutes', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_seconds'] = __( 'seconds', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_year'] = __( 'year', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_month'] = __( 'month', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_week'] = __( 'week', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_day'] = __( 'day', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_hour'] = __( 'hour', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_minute'] = __( 'minute', 'event_espresso' );
-		EE_Registry::$i18n_js_strings['timer_second'] = __( 'second', 'event_espresso' );
+		EE_Registry::$i18n_js_strings['timer_years'] = __('years', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_months'] = __('months', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_weeks'] = __('weeks', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_days'] = __('days', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hours'] = __('hours', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minutes'] = __('minutes', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_seconds'] = __('seconds', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_year'] = __('year', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_month'] = __('month', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_week'] = __('week', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_day'] = __('day', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_hour'] = __('hour', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_minute'] = __('minute', 'event_espresso');
+		EE_Registry::$i18n_js_strings['timer_second'] = __('second', 'event_espresso');
 		EE_Registry::$i18n_js_strings['registration_expiration_notice'] = sprintf(
-			__( '%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso' ),
+			__('%1$sWe\'re sorry, but your registration time has expired.%2$s%3$s%4$sIf you still wish to complete your registration, please return to the %5$sEvent List%6$sEvent List%7$s and reselect your tickets if available. Please except our apologies for any inconvenience this may have caused.%8$s', 'event_espresso'),
 			'<h4 class="important-notice">',
 			'</h4>',
 			'<br />',
 			'<p>',
-			'<a href="'. get_post_type_archive_link( 'espresso_events' ) . '" title="',
+			'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 			'">',
 			'</a>',
 			'</p>'
 		);
-		EE_Registry::$i18n_js_strings[ 'ajax_submit' ] = apply_filters( 'FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true );
+		EE_Registry::$i18n_js_strings['ajax_submit'] = apply_filters('FHEE__Single_Page_Checkout__translate_js_strings__ajax_submit', true);
 	}
 
 
@@ -1159,25 +1159,25 @@ 
 	 */
 	public function enqueue_styles_and_scripts() {
 		// load css
-		wp_register_style( 'single_page_checkout', SPCO_CSS_URL . 'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'single_page_checkout' );
+		wp_register_style('single_page_checkout', SPCO_CSS_URL.'single_page_checkout.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('single_page_checkout');
 		// load JS
-		wp_register_script( 'jquery_plugin', EE_THIRD_PARTY_URL . 'jquery	.plugin.min.js', array( 'jquery' ), '1.0.1', TRUE );
-		wp_register_script( 'jquery_countdown', EE_THIRD_PARTY_URL . 'jquery	.countdown.min.js', array( 'jquery_plugin' ), '2.0.2', TRUE );
-		wp_register_script( 'single_page_checkout', SPCO_JS_URL . 'single_page_checkout.js', array( 'espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown' ), EVENT_ESPRESSO_VERSION, TRUE );
-		wp_enqueue_script( 'single_page_checkout' );
+		wp_register_script('jquery_plugin', EE_THIRD_PARTY_URL.'jquery	.plugin.min.js', array('jquery'), '1.0.1', TRUE);
+		wp_register_script('jquery_countdown', EE_THIRD_PARTY_URL.'jquery	.countdown.min.js', array('jquery_plugin'), '2.0.2', TRUE);
+		wp_register_script('single_page_checkout', SPCO_JS_URL.'single_page_checkout.js', array('espresso_core', 'underscore', 'ee_form_section_validation', 'jquery_countdown'), EVENT_ESPRESSO_VERSION, TRUE);
+		wp_enqueue_script('single_page_checkout');
 
 		/**
 		 * global action hook for enqueueing styles and scripts with
 		 * spco calls.
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts', $this);
 
 		/**
 		 * dynamic action hook for enqueueing styles and scripts with spco calls.
 		 * The hook will end up being something like AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__attendee_information
 		 */
-		do_action( 'AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__' . $this->checkout->current_step->slug(), $this );
+		do_action('AHEE__EED_Single_Page_Checkout__enqueue_styles_and_scripts__'.$this->checkout->current_step->slug(), $this);
 
 		// add css and JS for current step
 		$this->checkout->current_step->enqueue_styles_and_scripts();
@@ -1194,19 +1194,19 @@ 
 	 */
 	private function _display_spco_reg_form() {
 		// if registering via the admin, just display the reg form for the current step
-		if ( $this->checkout->admin_request ) {
-			EE_Registry::instance()->REQ->add_output( $this->checkout->current_step->display_reg_form() );
+		if ($this->checkout->admin_request) {
+			EE_Registry::instance()->REQ->add_output($this->checkout->current_step->display_reg_form());
 		} else {
 			// add powered by EE msg
-			add_action( 'AHEE__SPCO__reg_form_footer', array( 'EED_Single_Page_Checkout', 'display_registration_footer' ));
+			add_action('AHEE__SPCO__reg_form_footer', array('EED_Single_Page_Checkout', 'display_registration_footer'));
 
-			$empty_cart = count( $this->checkout->transaction->registrations( $this->checkout->reg_cache_where_params ) ) < 1 ? true : false;
+			$empty_cart = count($this->checkout->transaction->registrations($this->checkout->reg_cache_where_params)) < 1 ? true : false;
 			$cookies_not_set_msg = '';
-			if ( $empty_cart && ! isset( $_COOKIE[ 'ee_cookie_test' ] ) ) {
+			if ($empty_cart && ! isset($_COOKIE['ee_cookie_test'])) {
 				$cookies_not_set_msg = apply_filters(
 					'FHEE__Single_Page_Checkout__display_spco_reg_form__cookies_not_set_msg',
 					sprintf(
-						__( '%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso' ),
+						__('%1$s%3$sIt appears your browser is not currently set to accept Cookies%4$s%5$sIn order to register for events, you need to enable cookies.%7$sIf you require assistance, then click the following link to learn how to %8$senable cookies%9$s%6$s%2$s', 'event_espresso'),
 						'<div class="ee-attention">',
 						'</div>',
 						'<h6 class="important-notice">',
@@ -1226,7 +1226,7 @@ 
 					'layout_strategy' =>
 						new EE_Template_Layout(
 							array(
-								'layout_template_file' 			=> SPCO_TEMPLATES_PATH . 'registration_page_wrapper.template.php',
+								'layout_template_file' 			=> SPCO_TEMPLATES_PATH.'registration_page_wrapper.template.php',
 								'template_args' => array(
 									'empty_cart' 		=> $empty_cart,
 									'revisit' 				=> $this->checkout->revisit,
@@ -1235,8 +1235,8 @@ 
 									'empty_msg' 		=> apply_filters(
 										'FHEE__Single_Page_Checkout__display_spco_reg_form__empty_msg',
 										sprintf(
-											__( 'You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso' ),
-											'<a href="' . get_post_type_archive_link( 'espresso_events' ) . '" title="',
+											__('You need to %1$sReturn to Events list%2$sselect at least one event%3$s before you can proceed with the registration process.', 'event_espresso'),
+											'<a href="'.get_post_type_archive_link('espresso_events').'" title="',
 											'">',
 											'</a>'
 										)
@@ -1244,14 +1244,14 @@ 
 									'cookies_not_set_msg' 		=> $cookies_not_set_msg,
 									'registration_time_limit' 	=> $this->checkout->get_registration_time_limit(),
 									'session_expiration' 			=>
-										gmdate( 'M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) )
+										gmdate('M d, Y H:i:s', EE_Registry::instance()->SSN->expiration() + (get_option('gmt_offset') * HOUR_IN_SECONDS))
 							)
 						)
 					)
 				)
 			);
 			// load template and add to output sent that gets filtered into the_content()
-			EE_Registry::instance()->REQ->add_output( $this->checkout->registration_form->get_html_and_js() );
+			EE_Registry::instance()->REQ->add_output($this->checkout->registration_form->get_html_and_js());
 		}
 	}
 
@@ -1265,8 +1265,8 @@ 
 	 * @internal  param string $label
 	 * @return        string
 	 */
-	public function add_extra_finalize_registration_inputs( $next_step ) {
-		if ( $next_step === 'finalize_registration' ) {
+	public function add_extra_finalize_registration_inputs($next_step) {
+		if ($next_step === 'finalize_registration') {
 			echo '<div id="spco-extra-finalize_registration-inputs-dv"></div>';
 		}
 	}
@@ -1280,18 +1280,18 @@ 
 	 *  @return 	string
 	 */
 	public static function display_registration_footer() {
-		if ( apply_filters( 'FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer ) ) {
-			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty( EE_Registry::instance()->CFG->admin->affiliate_id ) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
-			$url = add_query_arg( array( 'ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id ), 'https://eventespresso.com/' );
-			$url = apply_filters( 'FHEE__EE_Front_Controller__registration_footer__url', $url );
+		if (apply_filters('FHEE__EE_Front__Controller__show_reg_footer', EE_Registry::instance()->CFG->admin->show_reg_footer)) {
+			EE_Registry::instance()->CFG->admin->affiliate_id = ! empty(EE_Registry::instance()->CFG->admin->affiliate_id) ? EE_Registry::instance()->CFG->admin->affiliate_id : 'default';
+			$url = add_query_arg(array('ap_id' => EE_Registry::instance()->CFG->admin->affiliate_id), 'https://eventespresso.com/');
+			$url = apply_filters('FHEE__EE_Front_Controller__registration_footer__url', $url);
 			echo apply_filters(
 				'FHEE__EE_Front_Controller__display_registration_footer',
 				sprintf(
-					__( '%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso' ),
-					'<div id="espresso-registration-footer-dv"><a href="' . $url . '" title="',
+					__('%1$sEvent Registration Powered by Event Espresso%2$sEvent Registration and Ticketing%3$s Powered by %4$sEvent Espresso - Event Registration and Management System for WordPress%5$sEvent Espresso%6$s', 'event_espresso'),
+					'<div id="espresso-registration-footer-dv"><a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a>',
-					'<a href="' . $url . '" title="',
+					'<a href="'.$url.'" title="',
 					'" target="_blank">',
 					'</a></div>'
 				)
@@ -1322,12 +1322,12 @@ 
 	 * @return 	array
 	 */
 	private function _setup_redirect() {
-		if ( $this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ($this->checkout->continue_reg && $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			$this->checkout->redirect = TRUE;
-			if ( empty( $this->checkout->redirect_url )) {
+			if (empty($this->checkout->redirect_url)) {
 				$this->checkout->redirect_url = $this->checkout->next_step->reg_step_url();
 			}
-			$this->checkout->redirect_url = apply_filters( 'FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout );
+			$this->checkout->redirect_url = apply_filters('FHEE__EED_Single_Page_Checkout___setup_redirect__checkout_redirect_url', $this->checkout->redirect_url, $this->checkout);
 		}
 	}
 
@@ -1341,9 +1341,9 @@ 
 	 * @throws \EE_Error
 	 */
 	public function go_to_next_step() {
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// capture contents of output buffer we started earlier in the request, and insert into JSON response
-			$this->checkout->json_response->set_unexpected_errors( ob_get_clean() );
+			$this->checkout->json_response->set_unexpected_errors(ob_get_clean());
 		}
 		$this->unlock_transaction();
 		// just return for these conditions
@@ -1372,7 +1372,7 @@ 
 	 */
 	protected function _handle_json_response() {
 		// if this is an ajax request
-		if ( EE_Registry::instance()->REQ->ajax ) {
+		if (EE_Registry::instance()->REQ->ajax) {
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1385,7 +1385,7 @@ 
 			$this->checkout->json_response->set_registration_time_limit(
 				$this->checkout->get_registration_time_limit()
 			);
-			$this->checkout->json_response->set_payment_amount( $this->checkout->amount_owing );
+			$this->checkout->json_response->set_payment_amount($this->checkout->amount_owing);
 			// just send the ajax (
 			$json_response = apply_filters(
 				'FHEE__EE_Single_Page_Checkout__JSON_response',
@@ -1406,9 +1406,9 @@ 
 	 */
 	protected function _handle_html_redirects() {
 		// going somewhere ?
-		if ( $this->checkout->redirect && ! empty( $this->checkout->redirect_url ) ) {
+		if ($this->checkout->redirect && ! empty($this->checkout->redirect_url)) {
 			// store notices in a transient
-			EE_Error::get_notices( false, true, true );
+			EE_Error::get_notices(false, true, true);
 			// DEBUG LOG
 			//$this->checkout->log(
 			//	__CLASS__, __FUNCTION__, __LINE__,
@@ -1418,7 +1418,7 @@ 
 			//		'headers_list'    => headers_list(),
 			//	)
 			//);
-			wp_safe_redirect( $this->checkout->redirect_url );
+			wp_safe_redirect($this->checkout->redirect_url);
 			exit();
 		}
 	}

modules/single_page_checkout/reg_steps/finalize_registration/EE_SPCO_Reg_Step_Finalize_Registration.class.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 		if (
 			! (
 				$this->checkout->payment_method instanceof EE_Payment_Method
-		        && $this->checkout->payment_method->is_off_site()
+				&& $this->checkout->payment_method->is_off_site()
 			)
 		) {
 			// mark this reg step as completed

Spacing +30 added lines, -30 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');
 }
 
 
@@ -22,9 +22,9 @@ 
 	 * @param    EE_Checkout $checkout
 	 * @return    \EE_SPCO_Reg_Step_Finalize_Registration
 	 */
-	public function __construct( EE_Checkout $checkout ) {
+	public function __construct(EE_Checkout $checkout) {
 		$this->_slug = 'finalize_registration';
-		$this->_name = __( 'Finalize Registration', 'event_espresso' );
+		$this->_name = __('Finalize Registration', 'event_espresso');
 		$this->_submit_button_text = $this->_name;
 		$this->_template = '';
 		$this->checkout = $checkout;
@@ -47,7 +47,7 @@ 
 	 */
 	public function initialize_reg_step() {
 		// there's actually no reg form to process if this is the final step
-		if ( $this->is_current_step() ) {
+		if ($this->is_current_step()) {
 			$this->checkout->step = $_REQUEST['step'] = $this->slug();
 			$this->checkout->action = $_REQUEST['action'] = 'process_reg_step';
 			$this->checkout->generate_reg_form = false;
@@ -73,7 +73,7 @@ 
 	 */
 	public function process_reg_step() {
 		// ensure all data gets refreshed from the db
-		$this->checkout->refresh_all_entities( true );
+		$this->checkout->refresh_all_entities(true);
 		// ensures that all details and statuses for transaction, registration, and payments are updated
 		$txn_update_params = $this->_finalize_transaction();
 		// DEBUG LOG
@@ -102,13 +102,13 @@ 
 			$txn_update_params
 		);
 		// check if transaction has a primary registrant and that it has a related Attendee object
-		if ( ! $this->_validate_primary_registrant() ) {
+		if ( ! $this->_validate_primary_registrant()) {
 			return false;
 		}
 		// you don't have to go home but you can't stay here !
 		$this->checkout->redirect = true;
 		$this->checkout->continue_reg = true;
-		$this->checkout->json_response->set_redirect_url( $this->checkout->redirect_url );
+		$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
 		if (
 			! (
 				$this->checkout->payment_method instanceof EE_Payment_Method
@@ -133,26 +133,26 @@ 
 	 */
 	protected function _finalize_transaction() {
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		//set revisit flag in txn processor
-		$transaction_processor->set_revisit( $this->checkout->revisit );
+		$transaction_processor->set_revisit($this->checkout->revisit);
 		// at this point we'll consider a TXN to not have been abandoned
-		$transaction_processor->toggle_abandoned_transaction_status( $this->checkout->transaction );
-		if ( $this->checkout->cart instanceof EE_Cart ) {
+		$transaction_processor->toggle_abandoned_transaction_status($this->checkout->transaction);
+		if ($this->checkout->cart instanceof EE_Cart) {
 			// save TXN data to the cart
 			$this->checkout->cart->get_grand_total()->save_this_and_descendants_to_txn(
 				$this->checkout->transaction->ID()
 			);
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $this->checkout->transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($this->checkout->transaction, false);
 		// maybe send messages
 		$this->_trigger_notifications();
 		// this will result in the base session properties getting saved to the TXN_Session_data field
 		$this->checkout->transaction->set_txn_session_data(
-			EE_Registry::instance()->SSN->get_session_data( null, true )
+			EE_Registry::instance()->SSN->get_session_data(null, true)
 		);
 		// update the TXN if payment conditions have changed
 		return $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
@@ -174,30 +174,30 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _trigger_notifications() {
-		if ( $this->checkout->payment_method instanceof EE_Payment_Method ) {
-			$is_revisit = filter_var( $this->checkout->revisit, FILTER_VALIDATE_BOOLEAN );
-			if ( $this->checkout->payment_method->is_off_site() ) {
+		if ($this->checkout->payment_method instanceof EE_Payment_Method) {
+			$is_revisit = filter_var($this->checkout->revisit, FILTER_VALIDATE_BOOLEAN);
+			if ($this->checkout->payment_method->is_off_site()) {
 				$gateway = $this->checkout->payment_method->type_obj()->get_gateway();
 				// If the selected method of payment used an off-site gateway...
-				if ( $gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request() ) {
+				if ($gateway instanceof EE_Offsite_Gateway && $gateway->uses_separate_IPN_request()) {
 					// do NOT trigger notifications because it was already done during the IPN
-					remove_all_filters( 'FHEE__EED_Messages___maybe_registration__deliver_notifications' );
+					remove_all_filters('FHEE__EED_Messages___maybe_registration__deliver_notifications');
 					add_filter(
 						'FHEE__EED_Messages___maybe_registration__deliver_notifications',
 						'__return_false',
 						15
 					);
-				} else if ( ! $is_revisit ) {
-					add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				} else if ( ! $is_revisit) {
+					add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 				}
 			} else if (
 				// if SPCO revisit and TXN status has changed due to a payment
-				$is_revisit && ( $this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated() )
+				$is_revisit && ($this->checkout->txn_status_updated || $this->checkout->any_reg_status_updated())
 			) {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
-			} else if ( ! $is_revisit ) {
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10 );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
+			} else if ( ! $is_revisit) {
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true', 10);
 			}
 		}
 	}
@@ -211,9 +211,9 @@ 
 	 * @throws \EE_Error
 	 */
 	protected function _validate_primary_registrant() {
-		if ( ! $this->checkout->transaction_has_primary_registrant() ) {
+		if ( ! $this->checkout->transaction_has_primary_registrant()) {
 			EE_Error::add_error(
-				__( 'A valid Primary Registration for this Transaction could not be found.', 'event_espresso' ),
+				__('A valid Primary Registration for this Transaction could not be found.', 'event_espresso'),
 				__FILE__,
 				__FUNCTION__,
 				__LINE__
@@ -224,7 +224,7 @@ 
 		}
 		// setup URL for redirect
 		$this->checkout->redirect_url = add_query_arg(
-			array( 'e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link() ),
+			array('e_reg_url_link' => $this->checkout->transaction->primary_registration()->reg_url_link()),
 			$this->checkout->thank_you_page_url
 		);
 		return true;
@@ -237,7 +237,7 @@ 
 	 */
 	public function update_reg_step() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FILE__,
+			__CLASS__.'::'.__FILE__,
 			__(
 				'Can not call update_reg_step() on the Finalize Registration reg step.',
 				'event_espresso'

core/interfaces/EEI_Interfaces.php

Indentation +22 added lines, -22 removed lines

@@ -310,23 +310,23 @@ 
 	 * @param float $amount
 	 * @param string $name
 	 * @param string $description
-         * @param string $code
-         * @param boolean $add_to_existing_line_item if true and a duplicate line item with
-         *  the same code is found, $amount will be added onto it; otherwise will simply
-         *  set the taxes to match $amount
+	 * @param string $code
+	 * @param boolean $add_to_existing_line_item if true and a duplicate line item with
+	 *  the same code is found, $amount will be added onto it; otherwise will simply
+	 *  set the taxes to match $amount
 	 * @return EE_Line_Item the new tax created
 	 */
 	public function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name  = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false );
 
-         /**
-         * Makes all the line items which are children of $line_item taxable (or not).
-         * Does NOT save the line items
-         * @param EE_Line_Item $line_item
-         * @param boolean $taxable
-         * @param string $code_substring_for_whitelist if this string is part of the line item's code
-         *  it will be whitelisted (ie, except from becoming taxable)
-         */
-        public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
+		 /**
+		  * Makes all the line items which are children of $line_item taxable (or not).
+		  * Does NOT save the line items
+		  * @param EE_Line_Item $line_item
+		  * @param boolean $taxable
+		  * @param string $code_substring_for_whitelist if this string is part of the line item's code
+		  *  it will be whitelisted (ie, except from becoming taxable)
+		  */
+		public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
 
 	/**
 	 * Adds a simple item ( unrelated to any other model object) to the total line item,
@@ -356,15 +356,15 @@ 
  */
 interface EEHI_Money{
 		/**
-	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
-	 * This should be used to compare floats instead of normal '==' because floats
-	 * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
-	 * but actually differ by 0.00000001.
-	 * @param float $float1
-	 * @param float $float2
-	 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
-	 * @return boolean whether the equation is true or false
-	 */
+		 * For comparing floats. Default operator is '=', but see the $operator below for all options.
+		 * This should be used to compare floats instead of normal '==' because floats
+		 * are inherently imprecise, and so you can sometimes have two floats that appear to be identical
+		 * but actually differ by 0.00000001.
+		 * @param float $float1
+		 * @param float $float2
+		 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
+		 * @return boolean whether the equation is true or false
+		 */
 	public function compare_floats( $float1, $float2, $operator='=' );
 }
 

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
 /**
  * Interface EEI_Base
  */
-interface EEI_Base{
+interface EEI_Base {
 	/**
 	 * gets the unique ID of the model object. If it hasn't been saved yet
 	 * to the database, this should be 0 or NULL
@@ -32,7 +32,7 @@ 
 	 * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row)
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL);
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL);
 
 	/**
 	 * Adds a new extra meta record. If $unique is set to TRUE, we'll first double-check
@@ -43,7 +43,7 @@ 
 	 * @param boolean $unique
 	 * @return boolean
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false);
+	public function add_extra_meta($meta_key, $meta_value, $unique = false);
 
 	/**
 	 * Deletes all the extra meta rows for this record as specified by key. If $meta_value
@@ -52,7 +52,7 @@ 
 	 * @param string $meta_value
 	 * @return int number of extra meta rows deleted
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL);
+	public function delete_extra_meta($meta_key, $meta_value = NULL);
 
 	/**
 	 * Gets the extra meta with the given meta key. If you specify "single" we just return 1, otherwise
@@ -63,7 +63,7 @@ 
 	 * @param mixed $default if we don't find anything, what should we return?
 	 * @return mixed single value if $single; array if ! $single
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL);
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL);
 }
 
 
@@ -90,7 +90,7 @@ 
 	 * @param 	EE_Response $response
 	 * @return 	EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response );
+	public function handle_request(EE_Request $request, EE_Response $response);
 }
 
 
@@ -106,7 +106,7 @@ 
 	 * @param EE_Request $request
 	 * @param EE_Response $response
 	 */
-	public function handle_response( EE_Request $request, EE_Response $response );
+	public function handle_response(EE_Request $request, EE_Response $response);
 }
 
 
@@ -286,7 +286,7 @@ 
 	 * @param string $country
 	 * @param string $CNT_ISO
 	 */
-	public function format( $address, $address2, $city, $state, $zip, $country, $CNT_ISO );
+	public function format($address, $address2, $city, $state, $zip, $country, $CNT_ISO);
 }
 
 
@@ -296,13 +296,13 @@ 
 /**
  * Interface EEHI_Line_Item
  */
-interface EEHI_Line_Item{
+interface EEHI_Line_Item {
 	/**
 	 * Adds an item to the purchase in the right spot
 	 * @param EE_Line_Item $total_line_item
 	 * @param EE_Line_Item $line_item
 	 */
-	public function add_item( EE_Line_Item $total_line_item, EE_Line_Item $line_item );
+	public function add_item(EE_Line_Item $total_line_item, EE_Line_Item $line_item);
 	/**
 	 * Overwrites the previous tax by clearing out the old taxes, and creates a new
 	 * tax and updates the total line item accordingly
@@ -316,7 +316,7 @@ 
          *  set the taxes to match $amount
 	 * @return EE_Line_Item the new tax created
 	 */
-	public function set_total_tax_to( EE_Line_Item $total_line_item, $amount, $name  = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false );
+	public function set_total_tax_to(EE_Line_Item $total_line_item, $amount, $name = NULL, $description = NULL, $code = NULL, $add_to_existing_line_item = false);
 
          /**
          * Makes all the line items which are children of $line_item taxable (or not).
@@ -326,7 +326,7 @@ 
          * @param string $code_substring_for_whitelist if this string is part of the line item's code
          *  it will be whitelisted (ie, except from becoming taxable)
          */
-        public static function set_line_items_taxable( EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null );
+        public static function set_line_items_taxable(EE_Line_Item $line_item, $taxable = true, $code_substring_for_whitelist = null);
 
 	/**
 	 * Adds a simple item ( unrelated to any other model object) to the total line item,
@@ -340,21 +340,21 @@ 
 	 * @param boolean $code if set to a value, ensures there is only one line item with that code
 	 * @return boolean success
 	 */
-	public function add_unrelated_item( EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = null );
+	public function add_unrelated_item(EE_Line_Item $total_line_item, $name, $unit_price, $description = '', $quantity = 1, $taxable = FALSE, $code = null);
 
 	/**
 	 * Gets the line item for the taxes subtotal
 	 * @param EE_Line_Item $total_line_item of type EEM_Line_Item::type_total
 	 * @return \EE_Line_Item
 	 */
-	public static function get_taxes_subtotal( EE_Line_Item $total_line_item );
+	public static function get_taxes_subtotal(EE_Line_Item $total_line_item);
 }
 
 
 /**
  * Money-related helper
  */
-interface EEHI_Money{
+interface EEHI_Money {
 		/**
 	 * For comparing floats. Default operator is '=', but see the $operator below for all options.
 	 * This should be used to compare floats instead of normal '==' because floats
@@ -365,13 +365,13 @@ 
 	 * @param string $operator  The operator. Valid options are =, <=, <, >=, >, <>, eq, lt, lte, gt, gte, ne
 	 * @return boolean whether the equation is true or false
 	 */
-	public function compare_floats( $float1, $float2, $operator='=' );
+	public function compare_floats($float1, $float2, $operator = '=');
 }
 
 /**
  * Interface EEHI_Template
  */
-interface EEHI_Template{
+interface EEHI_Template {
 
 	/**
 	 * EEH_Template::format_currency
@@ -384,7 +384,7 @@ 
 	 * @param string   $cur_code_span_class
 	 * @return string the html output for the formatted money value
 	 */
-	public static function format_currency( $amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code' );
+	public static function format_currency($amount = NULL, $return_raw = FALSE, $display_code = TRUE, $CNT_ISO = '', $cur_code_span_class = 'currency-code');
 }
 
 
@@ -399,7 +399,7 @@ 
 	 * @param array $options
 	 * @return mixed
 	 */
-	public function display_line_item( EE_Line_Item $line_item, $options = array() );
+	public function display_line_item(EE_Line_Item $line_item, $options = array());
 
 }
 
@@ -416,7 +416,7 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_file_exists_and_is_writable( $full_file_path = '' );
+	public static function ensure_file_exists_and_is_writable($full_file_path = '');
 
 	/**
 	 * ensure_folder_exists_and_is_writable
@@ -425,7 +425,7 @@ 
 	 * @throws EE_Error
 	 * @return bool
 	 */
-	public static function ensure_folder_exists_and_is_writable( $folder = '' );
+	public static function ensure_folder_exists_and_is_writable($folder = '');
 }
 
 // End of file EEI_Interfaces.php

core/business/EE_Transaction_Processor.class.php

Indentation +2 added lines, -3 removed lines

@@ -7,8 +7,7 @@ 
  * the interaction of EE_Transaction and EE_Registration model objects
  * Provides methods for manipulating and processing changes to an EE_Transaction
  * and it's related EE_Registrations with regards to the checkout/registration process
-
-*
+ *
 *@package     Event Espresso
  * @subpackage 	core
  * @author      Brent Christensen
@@ -704,7 +703,7 @@ 
 						foreach ( $available_payment_methods as $available_payment_method ) {
 							if (
 								$available_payment_method instanceof EE_Payment_Method
-							    && $available_payment_method->open_by_default()
+								&& $available_payment_method->open_by_default()
 							) {
 								$PMD_ID = $available_payment_method->ID();
 								break;

Spacing +90 added lines, -90 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 
 /**
  * Class EE_Transaction_Processor
@@ -52,10 +52,10 @@ 
 	 * @param array $registration_query_params
 	 *@return EE_Transaction_Processor instance
 	 */
-	public static function instance( $registration_query_params = array() ) {
+	public static function instance($registration_query_params = array()) {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Processor ) {
-			self::$_instance = new self( $registration_query_params );
+		if ( ! self::$_instance instanceof EE_Transaction_Processor) {
+			self::$_instance = new self($registration_query_params);
 		}
 		return self::$_instance;
 	}
@@ -66,9 +66,9 @@ 
 	 * @param array $registration_query_params
 	 * @return EE_Transaction_Processor
 	 */
-	private function __construct( $registration_query_params = array() ) {
+	private function __construct($registration_query_params = array()) {
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 	}
 
 
@@ -77,8 +77,8 @@ 
 	 * @access private
 	 * @param array $registration_query_params
 	 */
-	private function _set_registration_query_params( $registration_query_params ) {
-		$this->_registration_query_params = ! empty( $registration_query_params ) ? $registration_query_params : array( 'order_by' => array( 'REG_count' => 'ASC' ));
+	private function _set_registration_query_params($registration_query_params) {
+		$this->_registration_query_params = ! empty($registration_query_params) ? $registration_query_params : array('order_by' => array('REG_count' => 'ASC'));
 	}
 
 
@@ -95,9 +95,9 @@ 
 	/**
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -116,7 +116,7 @@ 
 	/**
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		$this->_new_txn_status = $new_txn_status;
 	}
 
@@ -147,17 +147,17 @@ 
 	 * @param bool   $check_all
 	 * @return boolean | int
 	 */
-	private function _reg_steps_completed( EE_Transaction $transaction, $reg_step_slug = '', $check_all = TRUE ) {
+	private function _reg_steps_completed(EE_Transaction $transaction, $reg_step_slug = '', $check_all = TRUE) {
 		$reg_steps = $transaction->reg_steps();
-		if ( ! is_array( $reg_steps ) || empty( $reg_steps )) {
+		if ( ! is_array($reg_steps) || empty($reg_steps)) {
 			return false;
 		}
 		// loop thru reg steps array)
-		foreach ( $reg_steps as $slug => $reg_step_completed ) {
+		foreach ($reg_steps as $slug => $reg_step_completed) {
 			// if NOT checking ALL steps (only checking one step)
-			if ( ! $check_all ) {
+			if ( ! $check_all) {
 				// and this is the one
-				if ( $slug === $reg_step_slug ) {
+				if ($slug === $reg_step_slug) {
 					return $reg_step_completed;
 				} else {
 					// skip to next reg step in loop
@@ -165,7 +165,7 @@ 
 				}
 			}
 			// $check_all must be true, else we would never have gotten to this point
-			if ( $slug === $reg_step_slug ) {
+			if ($slug === $reg_step_slug) {
 				// if we reach this point, then we are testing either:
 				// all_reg_steps_completed_except() or
 				// all_reg_steps_completed_except_final_step(),
@@ -174,7 +174,7 @@ 
 				// ie: "is everything completed except the final step?"
 				// "that is correct... the final step is not completed, but all others are."
 				return $reg_step_completed !== true ? true : false;
-			} else if ( $reg_step_completed !== true ) {
+			} else if ($reg_step_completed !== true) {
 				// if any reg step is NOT completed, then ALL steps are not completed
 				return false;
 			}
@@ -195,8 +195,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction );
+	public function all_reg_steps_completed(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction);
 	}
 
 
@@ -213,8 +213,8 @@ 
 	 * @param string $exception
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except( EE_Transaction $transaction, $exception = '' ) {
-		return $this->_reg_steps_completed( $transaction, $exception );
+	public function all_reg_steps_completed_except(EE_Transaction $transaction, $exception = '') {
+		return $this->_reg_steps_completed($transaction, $exception);
 	}
 
 
@@ -230,8 +230,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function all_reg_steps_completed_except_final_step( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction, 'finalize_registration' );
+	public function all_reg_steps_completed_except_final_step(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction, 'finalize_registration');
 	}
 
 
@@ -248,8 +248,8 @@ 
 	 * @param string $reg_step_slug
 	 * @return boolean | int
 	 */
-	public function reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_reg_steps_completed( $transaction, $reg_step_slug, FALSE );
+	public function reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_reg_steps_completed($transaction, $reg_step_slug, FALSE);
 	}
 
 
@@ -265,8 +265,8 @@ 
 	 * @param EE_Transaction $transaction
 	 * @return boolean | int
 	 */
-	public function final_reg_step_completed( EE_Transaction $transaction ) {
-		return $this->_reg_steps_completed( $transaction, 'finalize_registration', FALSE );
+	public function final_reg_step_completed(EE_Transaction $transaction) {
+		return $this->_reg_steps_completed($transaction, 'finalize_registration', FALSE);
 	}
 
 
@@ -281,8 +281,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_initiated( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, time() );
+	public function set_reg_step_initiated(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, time());
 	}
 
 
@@ -297,8 +297,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, true );
+	public function set_reg_step_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, true);
 	}
 
 
@@ -313,8 +313,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function set_reg_step_not_completed( EE_Transaction $transaction, $reg_step_slug ) {
-		return $this->_set_reg_step_completed_status( $transaction, $reg_step_slug, false );
+	public function set_reg_step_not_completed(EE_Transaction $transaction, $reg_step_slug) {
+		return $this->_set_reg_step_completed_status($transaction, $reg_step_slug, false);
 	}
 
 
@@ -330,37 +330,37 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	private function _set_reg_step_completed_status( EE_Transaction $transaction, $reg_step_slug, $status ) {
+	private function _set_reg_step_completed_status(EE_Transaction $transaction, $reg_step_slug, $status) {
 		// validate status
-		$status = is_bool( $status ) || is_int( $status ) ? $status : false;
+		$status = is_bool($status) || is_int($status) ? $status : false;
 		// get reg steps array
 		$txn_reg_steps = $transaction->reg_steps();
 		// if reg step does NOT exist
-		if ( ! isset( $txn_reg_steps[ $reg_step_slug ] )) {
+		if ( ! isset($txn_reg_steps[$reg_step_slug])) {
 			return false;
 		}
 		// if  we're trying to complete a step that is already completed
-		if ( $txn_reg_steps[ $reg_step_slug ] === true ) {
+		if ($txn_reg_steps[$reg_step_slug] === true) {
 			return true;
 		}
 		// if  we're trying to complete a step that hasn't even started
-		if ( $status === true && $txn_reg_steps[ $reg_step_slug ] === false ) {
+		if ($status === true && $txn_reg_steps[$reg_step_slug] === false) {
 			return false;
 		}
 		// if current status value matches the incoming value (no change)
 		// type casting as int means values should collapse to either 0, 1, or a timestamp like 1234567890
-		if ( (int)$txn_reg_steps[ $reg_step_slug ] === (int)$status ) {
+		if ((int) $txn_reg_steps[$reg_step_slug] === (int) $status) {
 			// this will happen in cases where multiple AJAX requests occur during the same step
 			return true;
 		}
 		// if we're trying to set a start time, but it has already been set...
-		if ( is_numeric( $status ) && is_numeric( $txn_reg_steps[ $reg_step_slug ] )) {
+		if (is_numeric($status) && is_numeric($txn_reg_steps[$reg_step_slug])) {
 			// skip the update below, but don't return FALSE so that errors won't be displayed
 			return true;
 		}
 		// update completed status
-		$txn_reg_steps[ $reg_step_slug ] = $status;
-		$transaction->set_reg_steps( $txn_reg_steps );
+		$txn_reg_steps[$reg_step_slug] = $status;
+		$transaction->set_reg_steps($txn_reg_steps);
 		$transaction->save();
 		// DEBUG LOG
 		//$this->log(
@@ -386,11 +386,11 @@ 
 	 * @param string $reg_step_slug
 	 * @return void
 	 */
-	public function remove_reg_step( EE_Transaction $transaction, $reg_step_slug ) {
+	public function remove_reg_step(EE_Transaction $transaction, $reg_step_slug) {
 		// get reg steps array
 		$txn_reg_steps = $transaction->reg_steps();
-		unset( $txn_reg_steps[ $reg_step_slug ] );
-		$transaction->set_reg_steps( $txn_reg_steps );
+		unset($txn_reg_steps[$reg_step_slug]);
+		$transaction->set_reg_steps($txn_reg_steps);
 	}
 
 
@@ -405,15 +405,15 @@ 
 	 * @return    boolean
 	 * @throws \EE_Error
 	 */
-	public function toggle_failed_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_failed_transaction_status(EE_Transaction $transaction) {
 		$existing_txn_status = $transaction->status_ID();
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $existing_txn_status );
+		$this->set_old_txn_status($existing_txn_status);
 		// if TXN status is still set as "failed"...
-		if ( $existing_txn_status === EEM_Transaction::failed_status_code ) {
+		if ($existing_txn_status === EEM_Transaction::failed_status_code) {
 			// set incoming TXN_Status
-			$this->set_new_txn_status( EEM_Transaction::abandoned_status_code );
-			$transaction->set_status( EEM_Transaction::abandoned_status_code );
+			$this->set_new_txn_status(EEM_Transaction::abandoned_status_code);
+			$transaction->set_status(EEM_Transaction::abandoned_status_code);
 			$transaction->save();
 			return TRUE;
 		}
@@ -430,27 +430,27 @@ 
 	 * @param  EE_Transaction $transaction
 	 * @return boolean
 	 */
-	public function toggle_abandoned_transaction_status( EE_Transaction $transaction ) {
+	public function toggle_abandoned_transaction_status(EE_Transaction $transaction) {
 		// set incoming TXN_Status
-		$this->set_old_txn_status( $transaction->status_ID() );
+		$this->set_old_txn_status($transaction->status_ID());
 		// if TXN status has not been updated already due to a payment, and is still set as "failed" or "abandoned"...
 		$txn_status = $transaction->status_ID();
 		if (
 			$txn_status === EEM_Transaction::failed_status_code
 			|| $txn_status === EEM_Transaction::abandoned_status_code
 		) {
-			$this->set_new_txn_status( EEM_Transaction::incomplete_status_code );
+			$this->set_new_txn_status(EEM_Transaction::incomplete_status_code);
 			// if a contact record for the primary registrant has been created
 			if (
 				$transaction->primary_registration() instanceof EE_Registration
 				&& $transaction->primary_registration()->attendee() instanceof EE_Attendee
 			) {
-				$transaction->set_status( EEM_Transaction::incomplete_status_code );
-				$this->set_new_txn_status( EEM_Transaction::incomplete_status_code );
+				$transaction->set_status(EEM_Transaction::incomplete_status_code);
+				$this->set_new_txn_status(EEM_Transaction::incomplete_status_code);
 			} else {
 				// no contact record? yer abandoned!
-				$transaction->set_status( EEM_Transaction::abandoned_status_code );
-				$this->set_new_txn_status( EEM_Transaction::abandoned_status_code );
+				$transaction->set_status(EEM_Transaction::abandoned_status_code);
+				$this->set_new_txn_status(EEM_Transaction::abandoned_status_code);
 			}
 			return TRUE;
 		}
@@ -483,10 +483,10 @@ 
 		);
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
-			array( 'manually_updated' 	=> true )
+			array('manually_updated' 	=> true)
 		);
 		do_action(
 			'AHEE__EE_Transaction_Processor__manually_update_registration_statuses',
@@ -573,16 +573,16 @@ 
 		$registration_query_params = array()
 	) {
 		// set incoming TXN_Status, and consider it new since old status should have been set
-		$this->set_new_txn_status( $transaction->status_ID() );
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, $transaction->status_ID(), '$transaction->status_ID()' );
+		$this->set_new_txn_status($transaction->status_ID());
+		do_action('AHEE_log', __FILE__, __FUNCTION__, $transaction->status_ID(), '$transaction->status_ID()');
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// get final reg step status
-		$finalized = $this->final_reg_step_completed( $transaction );
+		$finalized = $this->final_reg_step_completed($transaction);
 		// if the 'finalize_registration' step has been initiated (has a timestamp)
 		// but has not yet been fully completed (TRUE)
-		if ( is_int( $finalized ) && $finalized !== false && $finalized !== true ) {
-			$this->set_reg_step_completed( $transaction, 'finalize_registration' );
+		if (is_int($finalized) && $finalized !== false && $finalized !== true) {
+			$this->set_reg_step_completed($transaction, 'finalize_registration');
 			$finalized = true;
 		}
 		$transaction->save();
@@ -605,7 +605,7 @@ 
 
 		// send messages
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		$registration_processor->trigger_registration_update_notifications(
 			$transaction->primary_registration(),
 			$update_params
@@ -641,22 +641,22 @@ 
 	) {
 		$response = false;
 		/** @type EE_Registration_Processor $registration_processor */
-		$registration_processor = EE_Registry::instance()->load_class( 'Registration_Processor' );
+		$registration_processor = EE_Registry::instance()->load_class('Registration_Processor');
 		// check that method exists
-		if ( ! method_exists( $registration_processor, $method_name )) {
-			throw new EE_Error( __( 'Method does not exist.', 'event_espresso' ));
+		if ( ! method_exists($registration_processor, $method_name)) {
+			throw new EE_Error(__('Method does not exist.', 'event_espresso'));
 		}
 		// make sure some query params are set for retrieving registrations
-		$this->_set_registration_query_params( $registration_query_params );
+		$this->_set_registration_query_params($registration_query_params);
 		// loop through cached registrations
-		foreach ( $transaction->registrations( $this->_registration_query_params ) as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
-				if ( $additional_param ) {
-					$response = $registration_processor->{$method_name}( $registration, $additional_param )
+		foreach ($transaction->registrations($this->_registration_query_params) as $registration) {
+			if ($registration instanceof EE_Registration) {
+				if ($additional_param) {
+					$response = $registration_processor->{$method_name}($registration, $additional_param)
 						? true
 						: $response;
 				} else {
-					$response = $registration_processor->{$method_name}( $registration )
+					$response = $registration_processor->{$method_name}($registration)
 						? true
 						: $response;
 				}
@@ -683,28 +683,28 @@ 
 	public function set_transaction_payment_method_based_on_registration_statuses(
 		EE_Registration $edited_registration
 	) {
-		if ( $edited_registration instanceof EE_Registration ) {
+		if ($edited_registration instanceof EE_Registration) {
 			$transaction = $edited_registration->transaction();
-			if ( $transaction instanceof EE_Transaction ) {
+			if ($transaction instanceof EE_Transaction) {
 				$all_not_approved = true;
-				foreach ( $transaction->registrations() as $registration ) {
-					if ( $registration instanceof EE_Registration ) {
+				foreach ($transaction->registrations() as $registration) {
+					if ($registration instanceof EE_Registration) {
 						// if any REG != "Not Approved" then toggle to false
 						$all_not_approved = $registration->is_not_approved() ? $all_not_approved : false;
 					}
 				}
 				// if ALL Registrations are "Not Approved"
-				if ( $all_not_approved ) {
-					$transaction->set_payment_method_ID( null );
+				if ($all_not_approved) {
+					$transaction->set_payment_method_ID(null);
 					$transaction->save();
 				} else {
 					$available_payment_methods = EEM_Payment_Method::instance()->get_all_for_transaction(
 						$transaction,
 						EEM_Payment_Method::scope_cart
 					);
-					if ( ! empty( $available_payment_methods ) ) {
+					if ( ! empty($available_payment_methods)) {
 						$PMD_ID = 0;
-						foreach ( $available_payment_methods as $available_payment_method ) {
+						foreach ($available_payment_methods as $available_payment_method) {
 							if (
 								$available_payment_method instanceof EE_Payment_Method
 							    && $available_payment_method->open_by_default()
@@ -713,22 +713,22 @@ 
 								break;
 							}
 						}
-						if ( ! $PMD_ID ) {
-							$first_payment_method = reset( $available_payment_methods );
-							if ( $first_payment_method instanceof EE_Payment_Method ) {
+						if ( ! $PMD_ID) {
+							$first_payment_method = reset($available_payment_methods);
+							if ($first_payment_method instanceof EE_Payment_Method) {
 								$PMD_ID = $first_payment_method->ID();
 							} else {
 								EE_Error::add_error(
-									__( 'A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso' ),
+									__('A valid Payment Method could not be determined. Please ensure that at least one Payment Method is activated.', 'event_espresso'),
 									__FILE__, __LINE__, __FUNCTION__
 								);
 							}
 						}
-						$transaction->set_payment_method_ID( $PMD_ID );
+						$transaction->set_payment_method_ID($PMD_ID);
 						$transaction->save();
 					} else {
 						EE_Error::add_error(
-							__( 'Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso' ),
+							__('Please activate at least one Payment Method in order for things to operate correctly.', 'event_espresso'),
 							__FILE__, __LINE__, __FUNCTION__
 						);
 					}

core/libraries/payment_methods/EE_Gateway.lib.php

Spacing +30 added lines, -30 removed lines

@@ -15,7 +15,7 @@ 
  * @subpackage		core/libraries/payment_methods
  * @author			Mike Nelson
  */
-abstract class EE_Gateway{
+abstract class EE_Gateway {
 	/**
 	 * a constant used as a possible value for $_currencies_supported to indicate
 	 * that ALL currencies are supported by this gateway
@@ -93,7 +93,7 @@ 
 	/**
 	 * @return EE_Gateway
 	 */
-	public function __construct(){
+	public function __construct() {
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * beginning again)
 	 * @return array
 	 */
-	public function __sleep(){
+	public function __sleep() {
 		$properties = get_object_vars($this);
-		unset( $properties[ '_pay_model' ], $properties[ '_pay_log' ] );
+		unset($properties['_pay_model'], $properties['_pay_log']);
 		return array_keys($properties);
 	}
 	/**
@@ -115,7 +115,7 @@ 
 	 * see $_supports_sending_refunds
 	 * @return boolean
 	 */
-	public function supports_sending_refunds(){
+	public function supports_sending_refunds() {
 		return $this->_supports_sending_refunds;
 	}
 	/**
@@ -123,7 +123,7 @@ 
 	 * see $_supports_receiving_refunds
 	 * @return boolean
 	 */
-	public function supports_receiving_refunds(){
+	public function supports_receiving_refunds() {
 		return $this->_supports_receiving_refunds;
 	}
 
@@ -138,7 +138,7 @@ 
 	 * @return EE_Payment for the refund
 	 * @throws EE_Error
 	 */
-	public function do_direct_refund( EE_Payment $payment, $refund_info = null ) {
+	public function do_direct_refund(EE_Payment $payment, $refund_info = null) {
 		return NULL;
 	}
 
@@ -149,8 +149,8 @@ 
 	 * etc
 	 * @param array $settings_array
 	 */
-	public function set_settings($settings_array){
-		foreach($settings_array as $name => $value){
+	public function set_settings($settings_array) {
+		foreach ($settings_array as $name => $value) {
 			$property_name = "_".$name;
 			$this->{$property_name} = $value;
 		}
@@ -159,14 +159,14 @@ 
 	 * See this class description
 	 * @param EEMI_Payment $payment_model
 	 */
-	public function set_payment_model($payment_model){
+	public function set_payment_model($payment_model) {
 		$this->_pay_model = $payment_model;
 	}
 	/**
 	 * See this class description
 	 * @param EEMI_Payment_Log $payment_log_model
 	 */
-	public function set_payment_log($payment_log_model){
+	public function set_payment_log($payment_log_model) {
 		$this->_pay_log = $payment_log_model;
 	}
 
@@ -174,7 +174,7 @@ 
 	 * See this class description
 	 * @param EEHI_Template $template_helper
 	 */
-	public function set_template_helper($template_helper){
+	public function set_template_helper($template_helper) {
 		$this->_template = $template_helper;
 	}
 
@@ -182,7 +182,7 @@ 
 	 * See this class description
 	 * @param EEHI_Line_Item $line_item_helper
 	 */
-	public function set_line_item_helper( $line_item_helper ){
+	public function set_line_item_helper($line_item_helper) {
 		$this->_line_item = $line_item_helper;
 	}
 
@@ -190,7 +190,7 @@ 
 	 * See this class description
 	 * @param EEHI_Money $money_helper
 	 */
-	public function set_money_helper( $money_helper ){
+	public function set_money_helper($money_helper) {
 		$this->_money = $money_helper;
 	}
 
@@ -199,23 +199,23 @@ 
 	 * @param $message
 	 * @param $payment
 	 */
-	public function log($message,$payment){
-		if($payment instanceof EEI_Payment){
-			$type='Payment';
+	public function log($message, $payment) {
+		if ($payment instanceof EEI_Payment) {
+			$type = 'Payment';
 			$id = $payment->ID();
-		}else{
+		} else {
 			$type = 'Payment_Method';
 			$id = $this->_ID;
 		}
-		$this->_pay_log->gateway_log($message,$id,$type);
+		$this->_pay_log->gateway_log($message, $id, $type);
 	}
 	/**
 	 * Formats the amount so it can generally be sent to gateways
 	 * @param float $amount
 	 * @return string
 	 */
-	public function format_currency($amount){
-		return number_format( $amount, 2, '.', '' );
+	public function format_currency($amount) {
+		return number_format($amount, 2, '.', '');
 //		return $this->_template->format_currency($amount, true);
 	}
 
@@ -224,7 +224,7 @@ 
 	 * or a string indicating they're all supported (EE_gateway::all_currencies_supported)
 	 * @return mixed array or string
 	 */
-	public function currencies_supported(){
+	public function currencies_supported() {
 		return $this->_currencies_supported;
 	}
 
@@ -236,14 +236,14 @@ 
 	 * @param EE_Transaction  $transaction
 	 * @return float
 	 */
-	protected function _sum_items_and_taxes( EE_Transaction  $transaction){
+	protected function _sum_items_and_taxes(EE_Transaction  $transaction) {
 		$total_line_item = $transaction->total_line_item();
 		$total = 0;
-		foreach($total_line_item->get_items() as $item_line_item ){
-			$total += max( $item_line_item->total(), 0 );
+		foreach ($total_line_item->get_items() as $item_line_item) {
+			$total += max($item_line_item->total(), 0);
 		}
-		foreach($total_line_item->tax_descendants() as $tax_line_item ){
-			$total += max( $tax_line_item->total(), 0 );
+		foreach ($total_line_item->tax_descendants() as $tax_line_item) {
+			$total += max($tax_line_item->total(), 0);
 		}
 		return $total;
 	}
@@ -254,9 +254,9 @@ 
 	 * @param EEI_Payment $payment
 	 * @return boolean
 	 */
-	protected function _can_easily_itemize_transaction_for( EEI_Payment $payment ){
+	protected function _can_easily_itemize_transaction_for(EEI_Payment $payment) {
 		return  $this->_money->compare_floats(
-					$this->_sum_items_and_taxes( $payment->transaction() ),
+					$this->_sum_items_and_taxes($payment->transaction()),
 					$payment->transaction()->total() ) &&
 				$this->_money->compare_floats(
 					$payment->amount(),
@@ -274,7 +274,7 @@ 
 	 * @param EE_Payment $payment
 	 * @return void
 	 */
-	public function update_txn_based_on_payment( $payment ){
+	public function update_txn_based_on_payment($payment) {
 		//maybe update the transaction or line items or registrations
 		//but most gateways don't need to do this, because they only update the payment
 	}

core/EE_Payment_Processor.core.php

Indentation +2 added lines, -4 removed lines

@@ -13,9 +13,9 @@ 
  */
 class EE_Payment_Processor extends EE_Processor_Base {
 	/**
-     * 	@var EE_Payment_Processor $_instance
+	 * 	@var EE_Payment_Processor $_instance
 	 * 	@access 	private
-     */
+	 */
 	private static $_instance;
 
 
@@ -50,7 +50,6 @@ 
 	/**
 	 * Using the selected gateway, processes the payment for that transaction, and updates the transaction appropriately.
 	 * Saves the payment that is generated
-
 	 *
 *@param EE_Payment_Method    $payment_method
 	 * @param EE_Transaction       $transaction
@@ -130,7 +129,6 @@ 
 
 
 	/**
-
 	 * @param EE_Base_Class|int $transaction
 	 * @param EE_Payment_Method $payment_method
 	 * @throws EE_Error

Spacing +132 added lines, -132 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
-EE_Registry::instance()->load_class( 'Processor_Base' );
+EE_Registry::instance()->load_class('Processor_Base');
 /**
  *
  * EE_Payment_Processor
@@ -27,7 +27,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Payment_Processor ) {
+		if ( ! self::$_instance instanceof EE_Payment_Processor) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -42,7 +42,7 @@ 
 	 *@return EE_Payment_Processor
 	 */
 	private function __construct() {
-		do_action( 'AHEE__EE_Payment_Processor__construct' );
+		do_action('AHEE__EE_Payment_Processor__construct');
 	}
 
 
@@ -81,7 +81,7 @@ 
 		$update_txn = true,
 		$cancel_url = ''
 	) {
-		if( (float)$amount < 0 ) {
+		if ((float) $amount < 0) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -94,33 +94,33 @@ 
 			);
 		}
 		// verify payment method
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj( $payment_method, TRUE );
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, TRUE);
 		// verify transaction
-		EEM_Transaction::instance()->ensure_is_obj( $transaction );
-		$transaction->set_payment_method_ID( $payment_method->ID() );
+		EEM_Transaction::instance()->ensure_is_obj($transaction);
+		$transaction->set_payment_method_ID($payment_method->ID());
 		// verify payment method type
-		if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
 			$payment = $payment_method->type_obj()->process_payment(
 				$transaction,
-				min( $amount, $transaction->remaining() ),//make sure we don't overcharge
+				min($amount, $transaction->remaining()), //make sure we don't overcharge
 				$billing_form,
 				$return_url,
-				add_query_arg( array( 'ee_cancel_payment' => true ), $cancel_url ),
+				add_query_arg(array('ee_cancel_payment' => true), $cancel_url),
 				$method,
 				$by_admin
 			);
 			// check if payment method uses an off-site gateway
-			if ( $payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite ) {
+			if ($payment_method->type_obj()->payment_occurs() !== EE_PMT_Base::offsite) {
 				// don't process payments for off-site gateways yet because no payment has occurred yet
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			}
 			return $payment;
 		} else {
 			EE_Error::add_error(
 				sprintf(
-					__( 'A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso' ),
+					__('A valid payment method could not be determined due to a technical issue.%sPlease try again or contact %s for assistance.', 'event_espresso'),
 					'<br/>',
-					EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+					EE_Registry::instance()->CFG->organization->get_pretty('email')
 				), __FILE__, __FUNCTION__, __LINE__
 			);
 			return NULL;
@@ -136,11 +136,11 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function get_ipn_url_for_payment_method( $transaction, $payment_method ){
+	public function get_ipn_url_for_payment_method($transaction, $payment_method) {
 		/** @type \EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$primary_reg = $transaction->primary_registration();
-		if( ! $primary_reg instanceof EE_Registration ){
+		if ( ! $primary_reg instanceof EE_Registration) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -151,7 +151,7 @@ 
 				)
 			);
 		}
-		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method,true);
+		$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method, true);
 		$url = add_query_arg(
 			array(
 				'e_reg_url_link'=>$primary_reg->reg_url_link(),
@@ -188,92 +188,92 @@ 
 		$update_txn = true,
 		$separate_IPN_request = true
 	) {
-		EE_Registry::instance()->load_model( 'Change_Log' );
-		$_req_data = $this->_remove_unusable_characters_from_array( $_req_data );
-		EE_Processor_Base::set_IPN( $separate_IPN_request );
+		EE_Registry::instance()->load_model('Change_Log');
+		$_req_data = $this->_remove_unusable_characters_from_array($_req_data);
+		EE_Processor_Base::set_IPN($separate_IPN_request);
 		$obj_for_log = null;
-		if( $transaction instanceof EE_Transaction ){
+		if ($transaction instanceof EE_Transaction) {
 			$obj_for_log = $transaction;
-			if( $payment_method instanceof EE_Payment_Method ) {
+			if ($payment_method instanceof EE_Payment_Method) {
 				$obj_for_log = EEM_Payment::instance()->get_one(
 					array(
-						array( 'TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID() ),
-						'order_by' => array( 'PAY_timestamp' => 'desc' )
+						array('TXN_ID' => $transaction->ID(), 'PMD_ID' => $payment_method->ID()),
+						'order_by' => array('PAY_timestamp' => 'desc')
 					)
 				);
 			}
-		} else if( $payment_method instanceof EE_Payment ) {
+		} else if ($payment_method instanceof EE_Payment) {
 			$obj_for_log = $payment_method;
 		}
 		$log = EEM_Change_Log::instance()->log(
 			EEM_Change_Log::type_gateway,
-			array( 'IPN data received' => $_req_data ),
+			array('IPN data received' => $_req_data),
 			$obj_for_log
 		);
-		try{
+		try {
 			/**
 			 * @var EE_Payment $payment
 			 */
 			$payment = NULL;
-			if($transaction && $payment_method){
+			if ($transaction && $payment_method) {
 				/** @type EE_Transaction $transaction */
 				$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 				/** @type EE_Payment_Method $payment_method */
 				$payment_method = EEM_Payment_Method::instance()->ensure_is_obj($payment_method);
-				if ( $payment_method->type_obj() instanceof EE_PMT_Base ) {
-						$payment = $payment_method->type_obj()->handle_ipn( $_req_data, $transaction );
+				if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+						$payment = $payment_method->type_obj()->handle_ipn($_req_data, $transaction);
 						$log->set_object($payment);
 				} else {
 					// not a payment
 					EE_Error::add_error(
 						sprintf(
-							__( 'A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso' ),
+							__('A valid payment method could not be determined due to a technical issue.%sPlease refresh your browser and try again or contact %s for assistance.', 'event_espresso'),
 							'<br/>',
-							EE_Registry::instance()->CFG->organization->get_pretty( 'email' )
+							EE_Registry::instance()->CFG->organization->get_pretty('email')
 						),
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else {
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
 				$active_payment_methods = EEM_Payment_Method::instance()->get_all_active();
-				foreach( $active_payment_methods as $active_payment_method ){
-					try{
-						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn( $_req_data );
+				foreach ($active_payment_methods as $active_payment_method) {
+					try {
+						$payment = $active_payment_method->type_obj()->handle_unclaimed_ipn($_req_data);
 						$payment_method = $active_payment_method;
 						EEM_Change_Log::instance()->log(
 							EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment
 						);
 						break;
-					} catch( EE_Error $e ) {
+					} catch (EE_Error $e) {
 						//that's fine- it apparently couldn't handle the IPN
 					}
 				}
 
 			}
 // 			EEM_Payment_Log::instance()->log("got to 7",$transaction,$payment_method);
-			if( $payment instanceof EE_Payment){
+			if ($payment instanceof EE_Payment) {
 				$payment->save();
 				//  update the TXN
-				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+				$this->update_txn_based_on_payment($transaction, $payment, $update_txn, $separate_IPN_request);
+			} else {
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
-				if($payment_method){
+				if ($payment_method) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				}elseif ($transaction) {
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}
 			return $payment;
 
-		} catch( EE_Error $e ) {
+		} catch (EE_Error $e) {
 			do_action(
 				'AHEE__log', __FILE__, __FUNCTION__, sprintf(
-					__( 'Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso' ),
-					print_r( $transaction, TRUE ),
-					print_r( $_req_data, TRUE ),
+					__('Error occurred while receiving IPN. Transaction: %1$s, req data: %2$s. The error was "%3$s"', 'event_espresso'),
+					print_r($transaction, TRUE),
+					print_r($_req_data, TRUE),
 					$e->getMessage()
 				)
 			);
@@ -288,10 +288,10 @@ 
 	 * @param  array $request_data
 	 * @return array
 	 */
-	protected function _remove_unusable_characters_from_array( array $request_data ) {
+	protected function _remove_unusable_characters_from_array(array $request_data) {
 		$return_data = array();
-		foreach( $request_data as $key => $value ) {
-			$return_data[ $this->_remove_unusable_characters( $key ) ] = $this->_remove_unusable_characters( $value );
+		foreach ($request_data as $key => $value) {
+			$return_data[$this->_remove_unusable_characters($key)] = $this->_remove_unusable_characters($value);
 		}
 		return $return_data;
 	}
@@ -303,8 +303,8 @@ 
 	 * @param string $request_data
 	 * @return string
 	 */
-	protected function _remove_unusable_characters( $request_data ) {
-		return preg_replace( '/[^[:print:]]/', '', $request_data );
+	protected function _remove_unusable_characters($request_data) {
+		return preg_replace('/[^[:print:]]/', '', $request_data);
 	}
 
 
@@ -326,13 +326,13 @@ 
 	 * @deprecated 4.6.24 method is no longer used. Instead it is up to client code, like SPCO,
 	 *                                      to call handle_ipn() for offsite gateways that don't receive separate IPNs
 	 */
-	public function finalize_payment_for( $transaction, $update_txn = TRUE ){
+	public function finalize_payment_for($transaction, $update_txn = TRUE) {
 		/** @var $transaction EE_Transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		$last_payment_method = $transaction->payment_method();
-		if ( $last_payment_method instanceof EE_Payment_Method ) {
-			$payment = $last_payment_method->type_obj()->finalize_payment_for( $transaction );
-			$this->update_txn_based_on_payment( $transaction, $payment, $update_txn );
+		if ($last_payment_method instanceof EE_Payment_Method) {
+			$payment = $last_payment_method->type_obj()->finalize_payment_for($transaction);
+			$this->update_txn_based_on_payment($transaction, $payment, $update_txn);
 			return $payment;
 		} else {
 			return NULL;
@@ -355,9 +355,9 @@ 
 		EE_Payment $payment_to_refund,
 		$refund_info = array()
 	) {
-		if ( $payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds() ) {
-			$payment_method->type_obj()->process_refund( $payment_to_refund, $refund_info );
-			$this->update_txn_based_on_payment( $payment_to_refund->transaction(), $payment_to_refund );
+		if ($payment_method instanceof EE_Payment_Method && $payment_method->type_obj()->supports_sending_refunds()) {
+			$payment_method->type_obj()->process_refund($payment_to_refund, $refund_info);
+			$this->update_txn_based_on_payment($payment_to_refund->transaction(), $payment_to_refund);
 		}
 		return $payment_to_refund;
 	}
@@ -398,12 +398,12 @@ 
 	 *                        TXN is locked before updating
 	 * @throws \EE_Error
 	 */
-	public function update_txn_based_on_payment( $transaction, $payment, $update_txn = true, $IPN = false ){
+	public function update_txn_based_on_payment($transaction, $payment, $update_txn = true, $IPN = false) {
 		$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__not_successful';
 		/** @type EE_Transaction $transaction */
-		$transaction = EEM_Transaction::instance()->ensure_is_obj( $transaction );
+		$transaction = EEM_Transaction::instance()->ensure_is_obj($transaction);
 		// can we freely update the TXN at this moment?
-		if ( $IPN && $transaction->is_locked() ) {
+		if ($IPN && $transaction->is_locked()) {
 			// don't update the transaction at this exact moment
 			// because the TXN is active in another request
 			EE_Cron_Tasks::schedule_update_transaction_with_payment(
@@ -413,45 +413,45 @@ 
 			);
 		} else {
 			// verify payment and that it has been saved
-			if ( $payment instanceof EE_Payment && $payment->ID() ) {
-				if(
+			if ($payment instanceof EE_Payment && $payment->ID()) {
+				if (
 					$payment->payment_method() instanceof EE_Payment_Method
 					&& $payment->payment_method()->type_obj() instanceof EE_PMT_Base
-				){
-					$payment->payment_method()->type_obj()->update_txn_based_on_payment( $payment );
+				) {
+					$payment->payment_method()->type_obj()->update_txn_based_on_payment($payment);
 					// update TXN registrations with payment info
-					$this->process_registration_payments( $transaction, $payment );
+					$this->process_registration_payments($transaction, $payment);
 				}
 				$do_action = $payment->just_approved()
 					? 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__successful'
 					: $do_action;
 			} else {
 				// send out notifications
-				add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+				add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 				$do_action = 'AHEE__EE_Payment_Processor__update_txn_based_on_payment__no_payment_made';
 			}
 			// if this is an IPN, then we want to know the initial TXN status prior to updating the TXN
 			// so that we know whether the status has changed and notifications should be triggered
-			if ( $IPN ) {
+			if ($IPN) {
 				/** @type EE_Transaction_Processor $transaction_processor */
-				$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-				$transaction_processor->set_old_txn_status( $transaction->status_ID() );
+				$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+				$transaction_processor->set_old_txn_status($transaction->status_ID());
 			}
-			if ( $payment->status() !== EEM_Payment::status_id_failed ) {
+			if ($payment->status() !== EEM_Payment::status_id_failed) {
 				/** @type EE_Transaction_Payments $transaction_payments */
-				$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+				$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 				// set new value for total paid
-				$transaction_payments->calculate_total_payments_and_update_status( $transaction );
+				$transaction_payments->calculate_total_payments_and_update_status($transaction);
 				// call EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment() ???
-				if ( $update_txn ) {
-					$this->_post_payment_processing( $transaction, $payment, $IPN );
+				if ($update_txn) {
+					$this->_post_payment_processing($transaction, $payment, $IPN);
 				}
 			}
 			// granular hook for others to use.
-			do_action( $do_action, $transaction, $payment );
-			do_action( 'AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action' );
+			do_action($do_action, $transaction, $payment);
+			do_action('AHEE_log', __CLASS__, __FUNCTION__, $do_action, '$do_action');
 			//global hook for others to use.
-			do_action( 'AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment );
+			do_action('AHEE__EE_Payment_Processor__update_txn_based_on_payment', $transaction, $payment);
 		}
 	}
 
@@ -471,25 +471,25 @@ 
 		$registrations = array()
 	) {
 		// only process if payment was successful
-		if ( $payment->status() !== EEM_Payment::status_id_approved ) {
+		if ($payment->status() !== EEM_Payment::status_id_approved) {
 			return;
 		}
 		//EEM_Registration::instance()->show_next_x_db_queries();
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			// find registrations with monies owing that can receive a payment
 			$registrations = $transaction->registrations(
 				array(
 					array(
 						// only these reg statuses can receive payments
-						'STS_ID'           => array( 'IN', EEM_Registration::reg_statuses_that_allow_payment() ),
-						'REG_final_price'  => array( '!=', 0 ),
-						'REG_final_price*' => array( '!=', 'REG_paid', true ),
+						'STS_ID'           => array('IN', EEM_Registration::reg_statuses_that_allow_payment()),
+						'REG_final_price'  => array('!=', 0),
+						'REG_final_price*' => array('!=', 'REG_paid', true),
 					)
 				)
 			);
 		}
 		// still nothing ??!??
-		if ( empty( $registrations )) {
+		if (empty($registrations)) {
 			return;
 		}
 		// todo: break out the following logic into a separate strategy class
@@ -501,28 +501,28 @@ 
 
 		$refund = $payment->is_a_refund();
 		// how much is available to apply to registrations?
-		$available_payment_amount = abs( $payment->amount() );
-		foreach ( $registrations as $registration ) {
-			if ( $registration instanceof EE_Registration ) {
+		$available_payment_amount = abs($payment->amount());
+		foreach ($registrations as $registration) {
+			if ($registration instanceof EE_Registration) {
 				// nothing left?
-				if ( $available_payment_amount <= 0 ) {
+				if ($available_payment_amount <= 0) {
 					break;
 				}
-				if ( $refund ) {
-					$available_payment_amount = $this->process_registration_refund( $registration, $payment, $available_payment_amount );
+				if ($refund) {
+					$available_payment_amount = $this->process_registration_refund($registration, $payment, $available_payment_amount);
 				} else {
-					$available_payment_amount = $this->process_registration_payment( $registration, $payment, $available_payment_amount );
+					$available_payment_amount = $this->process_registration_payment($registration, $payment, $available_payment_amount);
 				}
 			}
 		}
-		if ( $available_payment_amount > 0 && apply_filters( 'FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false ) ) {
+		if ($available_payment_amount > 0 && apply_filters('FHEE__EE_Payment_Processor__process_registration_payments__display_notifications', false)) {
 			EE_Error::add_attention(
 				sprintf(
-					__( 'A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso' ),
-					EEH_Template::format_currency( $available_payment_amount ),
-					implode( ', ',  array_keys( $registrations ) ),
+					__('A remainder of %1$s exists after applying this payment to Registration(s) %2$s.%3$sPlease verify that the original payment amount of %4$s is correct. If so, you should edit this payment and select at least one additional registration in the "Registrations to Apply Payment to" section, so that the remainder of this payment can be applied to the additional registration(s).', 'event_espresso'),
+					EEH_Template::format_currency($available_payment_amount),
+					implode(', ', array_keys($registrations)),
 					'<br/>',
-					EEH_Template::format_currency( $payment->amount() )
+					EEH_Template::format_currency($payment->amount())
 				),
 				__FILE__, __FUNCTION__, __LINE__
 			);
@@ -540,17 +540,17 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_payment( EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00 ) {
+	public function process_registration_payment(EE_Registration $registration, EE_Payment $payment, $available_payment_amount = 0.00) {
 		$owing = $registration->final_price() - $registration->paid();
-		if ( $owing > 0 ) {
+		if ($owing > 0) {
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
-			$payment_amount = min( $available_payment_amount, $owing );
+			$payment_amount = min($available_payment_amount, $owing);
 			// update $available_payment_amount
 			$available_payment_amount -= $payment_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() + $payment_amount );
+			$registration->set_paid($registration->paid() + $payment_amount);
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $payment_amount );
+			$this->_apply_registration_payment($registration, $payment, $payment_amount);
 		}
 		return $available_payment_amount;
 	}
@@ -566,19 +566,19 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	protected function _apply_registration_payment( EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00 ) {
+	protected function _apply_registration_payment(EE_Registration $registration, EE_Payment $payment, $payment_amount = 0.00) {
 		// find any existing reg payment records for this registration and payment
 		$existing_reg_payment = EEM_Registration_Payment::instance()->get_one(
-			array( array( 'REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID() ) )
+			array(array('REG_ID' => $registration->ID(), 'PAY_ID' => $payment->ID()))
 		);
 		// if existing registration payment exists
-		if ( $existing_reg_payment instanceof EE_Registration_Payment ) {
+		if ($existing_reg_payment instanceof EE_Registration_Payment) {
 			// then update that record
-			$existing_reg_payment->set_amount( $payment_amount );
+			$existing_reg_payment->set_amount($payment_amount);
 			$existing_reg_payment->save();
 		} else {
 			// or add new relation between registration and payment and set amount
-			$registration->_add_relation_to( $payment, 'Payment', array( 'RPY_amount' => $payment_amount ) );
+			$registration->_add_relation_to($payment, 'Payment', array('RPY_amount' => $payment_amount));
 			// make it stick
 			$registration->save();
 		}
@@ -595,21 +595,21 @@ 
 	 * @return float
 	 * @throws \EE_Error
 	 */
-	public function process_registration_refund( EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00 ) {
+	public function process_registration_refund(EE_Registration $registration, EE_Payment $payment, $available_refund_amount = 0.00) {
 		//EEH_Debug_Tools::printr( $payment->amount(), '$payment->amount()', __FILE__, __LINE__ );
-		if ( $registration->paid() > 0 ) {
+		if ($registration->paid() > 0) {
 			// ensure $available_refund_amount is NOT negative
-			$available_refund_amount = (float)abs( $available_refund_amount );
+			$available_refund_amount = (float) abs($available_refund_amount);
 			// don't allow refund amount to exceed the available payment amount, OR the amount paid
-			$refund_amount = min( $available_refund_amount, (float)$registration->paid() );
+			$refund_amount = min($available_refund_amount, (float) $registration->paid());
 			// update $available_payment_amount
 			$available_refund_amount -= $refund_amount;
 			//calculate and set new REG_paid
-			$registration->set_paid( $registration->paid() - $refund_amount );
+			$registration->set_paid($registration->paid() - $refund_amount);
 			// convert payment amount back to a negative value for storage in the db
-			$refund_amount = (float)abs( $refund_amount ) * -1;
+			$refund_amount = (float) abs($refund_amount) * -1;
 			// now save it
-			$this->_apply_registration_payment( $registration, $payment, $refund_amount );
+			$this->_apply_registration_payment($registration, $payment, $refund_amount);
 		}
 		return $available_refund_amount;
 	}
@@ -628,21 +628,21 @@ 
 	 * @param bool           $IPN
 	 * @throws \EE_Error
 	 */
-	protected function _post_payment_processing( EE_Transaction $transaction, EE_Payment $payment, $IPN = false ) {
+	protected function _post_payment_processing(EE_Transaction $transaction, EE_Payment $payment, $IPN = false) {
 
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
 		// is the Payment Options Reg Step completed ?
-		$payment_options_step_completed = $transaction_processor->reg_step_completed( $transaction, 'payment_options' );
+		$payment_options_step_completed = $transaction_processor->reg_step_completed($transaction, 'payment_options');
 		// if the Payment Options Reg Step is completed...
 		$revisit = $payment_options_step_completed === true ? true : false;
 		// then this is kinda sorta a revisit with regards to payments at least
-		$transaction_processor->set_revisit( $revisit );
+		$transaction_processor->set_revisit($revisit);
 		// if this is an IPN, let's consider the Payment Options Reg Step completed if not already
 		if (
 			$IPN &&
 			$payment_options_step_completed !== true &&
-			( $payment->is_approved() || $payment->is_pending() )
+			($payment->is_approved() || $payment->is_pending())
 		) {
 			$payment_options_step_completed = $transaction_processor->set_reg_step_completed(
 				$transaction,
@@ -650,34 +650,34 @@ 
 			);
 		}
 		/** @type EE_Transaction_Payments $transaction_payments */
-		$transaction_payments = EE_Registry::instance()->load_class( 'Transaction_Payments' );
+		$transaction_payments = EE_Registry::instance()->load_class('Transaction_Payments');
 		// maybe update status, but don't save transaction just yet
-		$transaction_payments->update_transaction_status_based_on_total_paid( $transaction, false );
+		$transaction_payments->update_transaction_status_based_on_total_paid($transaction, false);
 		// check if 'finalize_registration' step has been completed...
-		$finalized = $transaction_processor->reg_step_completed( $transaction, 'finalize_registration' );
+		$finalized = $transaction_processor->reg_step_completed($transaction, 'finalize_registration');
 		//  if this is an IPN and the final step has not been initiated
-		if ( $IPN && $payment_options_step_completed && $finalized === false ) {
+		if ($IPN && $payment_options_step_completed && $finalized === false) {
 			// and if it hasn't already been set as being started...
-			$finalized = $transaction_processor->set_reg_step_initiated( $transaction, 'finalize_registration' );
+			$finalized = $transaction_processor->set_reg_step_initiated($transaction, 'finalize_registration');
 		}
 		$transaction->save();
 		// because the above will return false if the final step was not fully completed, we need to check again...
-		if ( $IPN && $finalized !== false ) {
+		if ($IPN && $finalized !== false) {
 			// and if we are all good to go, then send out notifications
-			add_filter( 'FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true' );
+			add_filter('FHEE__EED_Messages___maybe_registration__deliver_notifications', '__return_true');
 			//ok, now process the transaction according to the payment
-			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $transaction, $payment );
+			$transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($transaction, $payment);
 		}
 		// DEBUG LOG
 		$payment_method = $payment->payment_method();
-		if ( $payment_method instanceof EE_Payment_Method ) {
+		if ($payment_method instanceof EE_Payment_Method) {
 			$payment_method_type_obj = $payment_method->type_obj();
-			if ( $payment_method_type_obj instanceof EE_PMT_Base ) {
+			if ($payment_method_type_obj instanceof EE_PMT_Base) {
 				$gateway = $payment_method_type_obj->get_gateway();
-				if ( $gateway instanceof EE_Gateway ){
+				if ($gateway instanceof EE_Gateway) {
 					$gateway->log(
 						array(
-							'message'               => __( 'Post Payment Transaction Details', 'event_espresso' ),
+							'message'               => __('Post Payment Transaction Details', 'event_espresso'),
 							'transaction'           => $transaction->model_field_array(),
 							'finalized'             => $finalized,
 							'IPN'                   => $IPN,

Braces +3 added lines, -3 removed lines

@@ -234,7 +234,7 @@ 
 						__FILE__, __FUNCTION__, __LINE__
 					);
 				}
-			}else{
+			} else{
 				//that's actually pretty ok. The IPN just wasn't able
 				//to identify which transaction or payment method this was for
 				// give all active payment methods a chance to claim it
@@ -258,11 +258,11 @@ 
 				$payment->save();
 				//  update the TXN
 				$this->update_txn_based_on_payment( $transaction, $payment, $update_txn, $separate_IPN_request );
-			}else{
+			} else{
 				//we couldn't find the payment for this IPN... let's try and log at least SOMETHING
 				if($payment_method){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $payment_method);
-				}elseif($transaction){
+				} elseif($transaction){
 					EEM_Change_Log::instance()->log(EEM_Change_Log::type_gateway, array('IPN data'=>$_req_data), $transaction);
 				}
 			}

core/db_classes/EE_Base_Class.class.php

Indentation +56 added lines, -56 removed lines

@@ -47,25 +47,25 @@ 
 
 
 	/**
-    *	date format
-	*
-    *	pattern or format for displaying dates
-	*
-	*	@access	protected
-    *	@var string
-    */
+	 *	date format
+	 *
+	 *	pattern or format for displaying dates
+	 *
+	 *	@access	protected
+	 *	@var string
+	 */
 	protected $_dt_frmt;
 
 
 
-    /**
-    *	time format
-	*
-    *	pattern or format for displaying time
-	*
-	*	@access	protected
-    *	@var string
-    */
+	/**
+	 *	time format
+	 *
+	 *	pattern or format for displaying time
+	 *
+	 *	@access	protected
+	 *	@var string
+	 */
 	protected $_tm_frmt;
 
 
@@ -1420,24 +1420,24 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-        public function refresh_cache_of_related_objects() {
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
-                    $related_objects = $this->_model_relations[ $relation_name ];
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
-                        //this relation only stores a single model object, not an array
-                        //but let's make it consistent
-                        $related_objects = array( $related_objects );
-                    }
-                    foreach( $related_objects as $related_object ) {
-                        //only refresh their cache if they're in memory
-                        if( $related_object instanceof EE_Base_Class ) {
+		public function refresh_cache_of_related_objects() {
+			foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
+				if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
+					$related_objects = $this->_model_relations[ $relation_name ];
+					if( $relation_obj instanceof EE_Belongs_To_Relation ) {
+						//this relation only stores a single model object, not an array
+						//but let's make it consistent
+						$related_objects = array( $related_objects );
+					}
+					foreach( $related_objects as $related_object ) {
+						//only refresh their cache if they're in memory
+						if( $related_object instanceof EE_Base_Class ) {
 							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
-                        }
-                    }
-                }
-            }
-        }
+						}
+					}
+				}
+			}
+		}
 
 
 
@@ -1678,7 +1678,7 @@ 
 		if ( self::_get_model( $classname )->has_primary_key_field() ) {
 			$primary_id_ref = self::_get_primary_key_name( $classname );
 			if ( array_key_exists( $primary_id_ref, $props_n_values )
-			     && ! empty( $props_n_values[ $primary_id_ref ] )
+				 && ! empty( $props_n_values[ $primary_id_ref ] )
 			) {
 				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
 					$props_n_values[ $primary_id_ref ]
@@ -1830,9 +1830,9 @@ 
 			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
 			//clear cache so future get_many_related and get_first_related() return new results.
 			$this->clear_cache( $relationName, $otherObject, TRUE );
-                        if( $otherObject instanceof EE_Base_Class ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
-                        }
+						if( $otherObject instanceof EE_Base_Class ) {
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+						}
 		} else {
 			//this thing doesn't exist in the DB,  so just cache it
 			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
@@ -1846,18 +1846,18 @@ 
 			}
 			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
-                    //fix the reciprocal relation too
-                    if( $otherObject->ID() ) {
-                            //its saved so assumed relations exist in the DB, so we can just
-                            //clear the cache so future queries use the updated info in the DB
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
-                    } else {
-
-                            //it's not saved, so it caches relations like this
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
-                    }
-                }
+				if( $otherObject instanceof EE_Base_Class ) {
+					//fix the reciprocal relation too
+					if( $otherObject->ID() ) {
+							//its saved so assumed relations exist in the DB, so we can just
+							//clear the cache so future queries use the updated info in the DB
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
+					} else {
+
+							//it's not saved, so it caches relations like this
+							$otherObject->cache( $this->get_model()->get_this_model_name(), $this );
+					}
+				}
 		return $otherObject;
 	}
 
@@ -1888,9 +1888,9 @@ 
 			//this doesn't exist in the DB, just remove it from the cache
 			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
-                }
+				if( $otherObject instanceof EE_Base_Class ) {
+					$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+				}
 		return $otherObject;
 	}
 
@@ -1913,11 +1913,11 @@ 
 			//this doesn't exist in the DB, just remove it from the cache
 			$otherObjects = $this->clear_cache( $relationName, null, true );
 		}
-                if( is_array( $otherObjects ) ) {
-                    foreach ( $otherObjects as $otherObject ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
-                    }
-                }
+				if( is_array( $otherObjects ) ) {
+					foreach ( $otherObjects as $otherObject ) {
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+					}
+				}
 		return $otherObjects;
 	}
 

Braces +36 added lines, -36 removed lines

@@ -170,7 +170,7 @@ 
 		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
 			if($relation_obj instanceof EE_Belongs_To_Relation){
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else{
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -216,7 +216,7 @@ 
 		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
 				$field_settings = $this->get_model()->field_settings_for( $field_name )){
 			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -273,7 +273,7 @@ 
 						: $this->set( $field_name, $this->_fields[$field_name] );
 				}
 
-			}else{
+			} else{
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
@@ -304,7 +304,7 @@ 
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
 			$this->_clear_cached_property( $field_name );
-		}else{
+		} else{
 			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
 		}
 
@@ -653,10 +653,10 @@ 
 		if($clear_all){
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		} elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
+		} else{
 			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
 				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
@@ -676,20 +676,20 @@ 
 					}
 					if($index_found_at){
 						$index_in_cache = $index_found_at;
-					}else{
+					} else{
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			} elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
 				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
 					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else{
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
@@ -759,7 +759,7 @@ 
 		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
 		if(is_array($cached_array_or_object)){
 			return array_shift($cached_array_or_object);
-		}else{
+		} else{
 			return $cached_array_or_object;
 		}
 	}
@@ -790,7 +790,7 @@ 
 				if( $model_object->ID() ){
 					$model->add_to_entity_map( $model_object );
 				}
-			}else{
+			} else{
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -925,10 +925,10 @@ 
 				if( $field_obj->is_nullable()){
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else{
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
+			} else{
 				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
 			}
 			$this->_fields[$field_name] = $field_value;
@@ -1513,7 +1513,7 @@ 
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else{//PK is NOT auto-increment
 				//so check if one like it already exists in the db
 				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
 					if( WP_DEBUG && ! $this->in_entity_map() ){
@@ -1528,12 +1528,12 @@ 
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else{
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else{//there is NO primary key
 			$already_in_db = false;
 			foreach($this->get_model()->unique_indexes() as $index){
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
@@ -1544,7 +1544,7 @@ 
 			if( $already_in_db ){
 				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
 				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
+			} else{
 				$results = $this->get_model()->insert( $save_cols_n_values );
 			}
 		}
@@ -1606,7 +1606,7 @@ 
 		//make sure this has been saved
 		if( ! $this->ID()){
 			$id = $this->save();
-		}else{
+		} else{
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
@@ -1625,7 +1625,7 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
+				} else{
 					foreach($this->_model_relations[$relationName] as $related_model_obj){
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
@@ -1774,7 +1774,7 @@ 
 	private static function _get_model_classname( $model_name = null){
 		if(strpos($model_name,"EE_")===0){
 			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+		} else{
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1815,7 +1815,7 @@ 
 		//now that we know the name of the variable, use a variable variable to get its value and return its
 		if( $this->get_model()->has_primary_key_field() ) {
 			return $this->_fields[ self::_get_primary_key_name( get_class($this) ) ];
-		}else{
+		} else{
 			return $this->get_model()->get_index_primary_key_string( $this->_fields );
 		}
 	}
@@ -1951,7 +1951,7 @@ 
 			//if there are query parameters, forget about caching the related model objects.
 			if( $query_params ){
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else{
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
 				if ( ! $cached_results ){
@@ -1961,11 +1961,11 @@ 
 					foreach($related_model_objects as $related_model_object){
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else{
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{
+		} else{
 			//this doesn't exist in the DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
@@ -2020,18 +2020,18 @@ 
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
 			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
 				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			} else{
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
 				if ( ! $cached_result ){
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
 					$this->cache($relationName,$related_model_object);
-				}else{
+				} else{
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else{
 			$related_model_object = null;
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
 			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
@@ -2063,7 +2063,7 @@ 
 	public function delete_related($relationName,$query_params = array()){
 		if($this->ID()){
 			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+		} else{
 			$count = count($this->get_all_from_cache($relationName));
 			$this->clear_cache($relationName,NULL,TRUE);
 		}
@@ -2087,7 +2087,7 @@ 
 	public function delete_related_permanently($relationName,$query_params = array()){
 		if($this->ID()){
 			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+		} else{
 			$count = count($this->get_all_from_cache($relationName));
 		}
 		$this->clear_cache($relationName,NULL,TRUE);
@@ -2317,10 +2317,10 @@ 
 			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
 			if ( $result instanceof EE_Extra_Meta ){
 				return $result->value();
-			}else{
+			} else{
 				return $default;
 			}
-		}else{
+		} else{
 			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
 			if($results){
 				$values = array();
@@ -2330,7 +2330,7 @@ 
 					}
 				}
 				return $values;
-			}else{
+			} else{
 				return $default;
 			}
 		}
@@ -2361,7 +2361,7 @@ 
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 				}
 			}
-		}else{
+		} else{
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
 			foreach($extra_meta_objs as $extra_meta_obj){
 				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
@@ -2388,7 +2388,7 @@ 
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
 		if($field_we_can_use){
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else{
 			$first_few_properties = $this->model_field_array();
 			$first_few_properties = array_slice($first_few_properties,0,3);
 			$name_parts = array();
@@ -2412,7 +2412,7 @@ 
 		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -2426,7 +2426,7 @@ 
 	public function refresh_from_db(){
 		if( $this->ID() && $this->in_entity_map() ){
 			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+		} else{
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's

Spacing +484 added lines, -484 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
-do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
+do_action('AHEE_log', __FILE__, ' FILE LOADED', '');
 /**
  *
  * Event Espresso
@@ -24,7 +24,7 @@ 
  * ------------------------------------------------------------------------
  */
 
-abstract class EE_Base_Class{
+abstract class EE_Base_Class {
 
 	/**
 	 * This is an array of the original properties and values provided during construction
@@ -117,59 +117,59 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) {
 
-		$className=get_class($this);
+		$className = get_class($this);
 
-		do_action("AHEE__{$className}__construct",$this,$fieldValues);
-		$model=$this->get_model();
-		$model_fields = $model->field_settings( FALSE );
+		do_action("AHEE__{$className}__construct", $this, $fieldValues);
+		$model = $this->get_model();
+		$model_fields = $model->field_settings(FALSE);
 		// ensure $fieldValues is an array
-		$fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues );
+		$fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues);
 		// EEH_Debug_Tools::printr( $fieldValues, '$fieldValues  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
 		// verify client code has not passed any invalid field names
-		foreach($fieldValues as $field_name=> $field_value){
-			if( ! isset( $model_fields[ $field_name] ) ){
-				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields))));
+		foreach ($fieldValues as $field_name=> $field_value) {
+			if ( ! isset($model_fields[$field_name])) {
+				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields))));
 			}
 		}
 		// EEH_Debug_Tools::printr( $model_fields, '$model_fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 
-		if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
+		if ( ! empty($date_formats) && is_array($date_formats)) {
 			$this->_dt_frmt = $date_formats[0];
 			$this->_tm_frmt = $date_formats[1];
 		} else {
 			//set default formats for date and time
-			$this->_dt_frmt = get_option( 'date_format' );
-			$this->_tm_frmt = get_option( 'time_format' );
+			$this->_dt_frmt = get_option('date_format');
+			$this->_tm_frmt = get_option('time_format');
 		}
 
 		//if db model is instantiating
-		if ( $bydb ){
+		if ($bydb) {
 			//client code has indicated these field values are from the database
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null);
 			}
 		} else {
 			//we're constructing a brand
 			//new instance of the model object. Generally, this means we'll need to do more field validation
-			foreach( $model_fields as $fieldName => $field ){
-				$this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true );
+			foreach ($model_fields as $fieldName => $field) {
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
 			}
 		}
 
 		//remember what values were passed to this constructor
 		$this->_props_n_values_provided_in_constructor = $fieldValues;
 		//remember in entity mapper
-		if( ! $bydb  && $model->has_primary_key_field() && $this->ID() ){
+		if ( ! $bydb && $model->has_primary_key_field() && $this->ID()) {
 			$model->add_to_entity_map($this);
 		}
 		//setup all the relations
-		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$this->_model_relations[$relation_name] = NULL;
-			}else{
+			} else {
 				$this->_model_relations[$relation_name] = array();
 			}
 		}
@@ -177,7 +177,7 @@ 
 		 * Action done at the end of each model object construction
 		 * @param EE_Base_Class $this the model object just created
 		 */
-		do_action( 'AHEE__EE_Base_Class__construct__finished', $this );
+		do_action('AHEE__EE_Base_Class__construct__finished', $this);
 	}
 
 	/**
@@ -197,7 +197,7 @@ 
 	 * @param boolean $allow_persist
 	 * @return boolean
 	 */
-	public function set_allow_persist( $allow_persist ) {
+	public function set_allow_persist($allow_persist) {
 		return $this->_allow_persist = $allow_persist;
 	}
 
@@ -211,11 +211,11 @@ 
 	 * @return mixed|null
 	 * @throws \EE_Error
 	 */
-	public function get_original( $field_name ){
-		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
-				$field_settings = $this->get_model()->field_settings_for( $field_name )){
-			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
-		}else{
+	public function get_original($field_name) {
+		if (isset($this->_props_n_values_provided_in_constructor[$field_name]) &&
+				$field_settings = $this->get_model()->field_settings_for($field_name)) {
+			return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]);
+		} else {
 			return NULL;
 		}
 	}
@@ -225,7 +225,7 @@ 
 	 * @param EE_Base_Class $obj
 	 * @return string
 	 */
-	public function get_class($obj){
+	public function get_class($obj) {
 		return get_class($obj);
 	}
 
@@ -240,19 +240,19 @@ 
 	 * @param bool      $use_default
 	 * @throws \EE_Error
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		$field_obj = $this->get_model()->field_settings_for( $field_name );
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		$field_obj = $this->get_model()->field_settings_for($field_name);
+		if ($field_obj instanceof EE_Model_Field_Base) {
 //			if ( method_exists( $field_obj, 'set_timezone' )) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt );
-				$field_obj->set_time_format( $this->_tm_frmt );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt);
+				$field_obj->set_time_format($this->_tm_frmt);
 			}
 
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
 			//should the value be null?
-			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
+			if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) {
 				$this->_fields[$field_name] = $field_obj->get_default_value();
 
 				/**
@@ -264,26 +264,26 @@ 
 				 */
 				if (
 					$field_obj instanceof EE_Datetime_Field
-					&& $this->_fields[ $field_name ] !== null
+					&& $this->_fields[$field_name] !== null
 					&& ! $this->_fields[$field_name] instanceof DateTime
 				) {
-					empty( $this->_fields[$field_name] )
-						? $this->set( $field_name, time() )
-						: $this->set( $field_name, $this->_fields[$field_name] );
+					empty($this->_fields[$field_name])
+						? $this->set($field_name, time())
+						: $this->set($field_name, $this->_fields[$field_name]);
 				}
 
-			}else{
+			} else {
 				$this->_fields[$field_name] = $holder_of_value;
 			}
 
 			//if we're not in the constructor...
 			//now check if what we set was a primary key
-			if(
+			if (
 				//note: props_n_values_provided_in_constructor is only set at the END of the constructor
 				$this->_props_n_values_provided_in_constructor
 				&& $field_value
-				&& $field_name === self::_get_primary_key_name( get_class( $this ) )
-			){
+				&& $field_name === self::_get_primary_key_name(get_class($this))
+			) {
 				//if so, we want all this object's fields to be filled either with
 				//what we've explicitly set on this model
 				//or what we have in the db
@@ -291,20 +291,20 @@ 
 				$fields_on_model = self::_get_model(get_class($this))->field_settings();
 
 				$obj_in_db = self::_get_model(get_class($this))->get_one_by_ID($field_value);
-				foreach($fields_on_model as $field_obj){
-					if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
-						&& $field_obj->get_name() !== $field_name ){
+				foreach ($fields_on_model as $field_obj) {
+					if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
+						&& $field_obj->get_name() !== $field_name) {
 
-						$this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name()));
+						$this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name()));
 					}
 				}
 				//oh this model object has an ID? well make sure its in the entity mapper
 				$this->get_model()->add_to_entity_map($this);
 			}
 			//let's unset any cache for this field_name from the $_cached_properties property.
-			$this->_clear_cached_property( $field_name );
-		}else{
-			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
+			$this->_clear_cached_property($field_name);
+		} else {
+			throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name));
 		}
 
 	}
@@ -321,14 +321,14 @@ 
 	 * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs.
 	 * @throws \EE_Error
 	 */
-	public function set_field_or_extra_meta( $field_name, $field_value ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$this->set( $field_name, $field_value );
+	public function set_field_or_extra_meta($field_name, $field_value) {
+		if ($this->get_model()->has_field($field_name)) {
+			$this->set($field_name, $field_value);
 			return true;
 		} else {
 			//ensure this object is saved first so that extra meta can be properly related.
 			$this->save();
-			return $this->update_extra_meta( $field_name, $field_value );
+			return $this->update_extra_meta($field_name, $field_value);
 		}
 	}
 
@@ -349,12 +349,12 @@ 
 	 * @return mixed|null  value for the field if found.  null if not found.
 	 * @throws \EE_Error
 	 */
-	public function get_field_or_extra_meta( $field_name ) {
-		if ( $this->get_model()->has_field( $field_name ) ) {
-			$column_value = $this->get( $field_name );
+	public function get_field_or_extra_meta($field_name) {
+		if ($this->get_model()->has_field($field_name)) {
+			$column_value = $this->get($field_name);
 		} else {
 			//This isn't a column in the main table, let's see if it is in the extra meta.
-			$column_value = $this->get_extra_meta( $field_name, true, null );
+			$column_value = $this->get_extra_meta($field_name, true, null);
 		}
 		return $column_value;
 	}
@@ -370,18 +370,18 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function set_timezone( $timezone = '' ) {
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
+	public function set_timezone($timezone = '') {
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
 		//make sure we clear all cached properties because they won't be relevant now
 		$this->_clear_cached_properties();
 
 		//make sure we update field settings and the date for all EE_Datetime_Fields
-		$model_fields = $this->get_model()->field_settings( false );
-		foreach ( $model_fields as $field_name => $field_obj ) {
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) {
-					$this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) );
+		$model_fields = $this->get_model()->field_settings(false);
+		foreach ($model_fields as $field_name => $field_obj) {
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) {
+					$this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone));
 				}
 			}
 		}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @param string $format   should be a format recognizable by PHP date() functions.
 	 */
-	public function set_date_format( $format ) {
+	public function set_date_format($format) {
 		$this->_dt_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -426,7 +426,7 @@ 
 	 * @since 4.6
 	 * @param string $format should be a format recognizable by PHP date() functions.
 	 */
-	public function set_time_format( $format ) {
+	public function set_time_format($format) {
 		$this->_tm_frmt = $format;
 		//clear cached_properties because they won't be relevant now.
 		$this->_clear_cached_properties();
@@ -443,8 +443,8 @@ 
 	 *
 	 * @return mixed string|array
 	 */
-	public function get_format( $full = true ) {
-		return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt );
+	public function get_format($full = true) {
+		return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt);
 	}
 
 
@@ -462,17 +462,17 @@ 
 	 * @throws EE_Error
 	 * @return mixed    index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array)
 	 */
-	public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){
+	public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) {
 		// its entirely possible that there IS no related object yet in which case there is nothing to cache.
-		if ( ! $object_to_cache instanceof EE_Base_Class ) {
+		if ( ! $object_to_cache instanceof EE_Base_Class) {
 			return FALSE;
 		}
 		// also get "how" the object is related, or throw an error
-		if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) {
-			throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this )));
+		if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) {
+			throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this)));
 		}
 		// how many things are related ?
-		if( $relationship_to_model instanceof EE_Belongs_To_Relation ){
+		if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			// if it's a "belongs to" relationship, then there's only one related model object  eg, if this is a registration, there's only 1 attendee for it
 			// so for these model objects just set it to be cached
 			$this->_model_relations[$relationName] = $object_to_cache;
@@ -480,26 +480,26 @@ 
 		} else {
 			// otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type.
 			// eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array
-			if( ! is_array( $this->_model_relations[$relationName] )) {
+			if ( ! is_array($this->_model_relations[$relationName])) {
 				// if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array
-				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array();
+				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array();
 			}
 			// first check for a cache_id which is normally empty
-			if ( ! empty( $cache_id )) {
+			if ( ! empty($cache_id)) {
 				// if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on
-				$this->_model_relations[$relationName][ $cache_id ] = $object_to_cache;
+				$this->_model_relations[$relationName][$cache_id] = $object_to_cache;
 				$return = $cache_id;
-			} elseif ( $object_to_cache->ID() ) {
+			} elseif ($object_to_cache->ID()) {
 				// OR the cached object originally came from the db, so let's just use it's PK for an ID
-				$this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache;
+				$this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache;
 				$return = $object_to_cache->ID();
 			} else {
 				// OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID
 				$this->_model_relations[$relationName][] = $object_to_cache;
 				  // move the internal pointer to the end of the array
-				end( $this->_model_relations[$relationName] );
+				end($this->_model_relations[$relationName]);
 				// and grab the key so that we can return it
-				$return = key( $this->_model_relations[$relationName] );
+				$return = key($this->_model_relations[$relationName]);
 			}
 
 		}
@@ -518,11 +518,11 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
+	protected function _set_cached_property($fieldname, $value, $cache_type = NULL) {
 		//first make sure this property exists
 		$this->get_model()->field_settings_for($fieldname);
 
-		$cache_type = empty( $cache_type ) ? 'standard' : $cache_type;
+		$cache_type = empty($cache_type) ? 'standard' : $cache_type;
 		$this->_cached_properties[$fieldname][$cache_type] = $value;
 	}
 
@@ -543,36 +543,36 @@ 
 	 * @return mixed                   whatever the value for the property is we're retrieving
 	 * @throws \EE_Error
 	 */
-	protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) {
+	protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) {
 		//verify the field exists
 		$this->get_model()->field_settings_for($fieldname);
 
 		$cache_type = $pretty ? 'pretty' : 'standard';
-		$cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : '';
+		$cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : '';
 
-		if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) {
+		if (isset($this->_cached_properties[$fieldname][$cache_type])) {
 			return $this->_cached_properties[$fieldname][$cache_type];
 		}
 
 		$field_obj = $this->get_model()->field_settings_for($fieldname);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			/**
 			 * maybe this is EE_Datetime_Field.  If so we need to make sure timezone and
 			 * formats are correct.
 			 */
-			if ( $field_obj instanceof EE_Datetime_Field ) {
-				$field_obj->set_timezone( $this->_timezone );
-				$field_obj->set_date_format( $this->_dt_frmt, $pretty );
-				$field_obj->set_time_format( $this->_tm_frmt, $pretty );
+			if ($field_obj instanceof EE_Datetime_Field) {
+				$field_obj->set_timezone($this->_timezone);
+				$field_obj->set_date_format($this->_dt_frmt, $pretty);
+				$field_obj->set_time_format($this->_tm_frmt, $pretty);
 			}
 
-			if( ! isset($this->_fields[$fieldname])){
+			if ( ! isset($this->_fields[$fieldname])) {
 				$this->_fields[$fieldname] = NULL;
 			}
 			$value = $pretty
 				? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref)
-				: $field_obj->prepare_for_get($this->_fields[$fieldname] );
-			$this->_set_cached_property( $fieldname, $value, $cache_type );
+				: $field_obj->prepare_for_get($this->_fields[$fieldname]);
+			$this->_set_cached_property($fieldname, $value, $cache_type);
 			return $value;
 		}
 		return null;
@@ -598,9 +598,9 @@ 
 	 * @param  string $property_name the property to remove if it exists (from the _cached_properties array)
 	 * @return void
 	 */
-	protected function _clear_cached_property( $property_name ) {
-		if ( isset( $this->_cached_properties[ $property_name ] ) ) {
-			unset( $this->_cached_properties[ $property_name ] );
+	protected function _clear_cached_property($property_name) {
+		if (isset($this->_cached_properties[$property_name])) {
+			unset($this->_cached_properties[$property_name]);
 		}
 	}
 
@@ -614,12 +614,12 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){
+	protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) {
 		$other_model_instance = self::_get_model_instance_with_name(
-			self::_get_model_classname( $model_name ),
+			self::_get_model_classname($model_name),
 			$this->_timezone
 		);
-		return $other_model_instance->ensure_is_obj( $object_or_id );
+		return $other_model_instance->ensure_is_obj($object_or_id);
 	}
 
 
@@ -636,32 +636,32 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class | boolean from which was cleared from the cache, or true if we requested to remove a relation from all
 	 */
-	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){
+	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) {
 		$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 		$index_in_cache = '';
-		if( ! $relationship_to_model){
+		if ( ! $relationship_to_model) {
 			throw new EE_Error(
 				sprintf(
-					__( "There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso' ),
+					__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'),
 					$relationName,
-					get_class( $this )
+					get_class($this)
 				)
 			);
 		}
-		if($clear_all){
+		if ($clear_all) {
 			$obj_removed = true;
 			$this->_model_relations[$relationName]  = null;
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
+		}elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 			$obj_removed = $this->_model_relations[$relationName];
 			$this->_model_relations[$relationName]  = null;
-		}else{
-			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
+		} else {
+			if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) {
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
-				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
+				if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) {
 					$index_found_at = NULL;
 					//find this object in the array even though it has a different key
-					foreach($this->_model_relations[$relationName] as $index=>$obj){
-						if(
+					foreach ($this->_model_relations[$relationName] as $index=>$obj) {
+						if (
 							$obj instanceof EE_Base_Class
 							&& (
 								$obj == $object_to_remove_or_index_into_array
@@ -672,34 +672,34 @@ 
 							break;
 						}
 					}
-					if($index_found_at){
+					if ($index_found_at) {
 						$index_in_cache = $index_found_at;
-					}else{
+					} else {
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
 						//if it wasn't in it to begin with. So we're done
 						return $object_to_remove_or_index_into_array;
 					}
 				}
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
+			}elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) {
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
-				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
-					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
+				foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) {
+					if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) {
 						$index_in_cache = $index;
 					}
 				}
-			}else{
+			} else {
 				$index_in_cache = $object_to_remove_or_index_into_array;
 			}
 			//supposedly we've found it. But it could just be that the client code
 			//provided a bad index/object
 			if (
 				isset(
-					$this->_model_relations[ $relationName ],
-					$this->_model_relations[ $relationName ][ $index_in_cache ]
+					$this->_model_relations[$relationName],
+					$this->_model_relations[$relationName][$index_in_cache]
 				)
 			) {
-				$obj_removed = $this->_model_relations[ $relationName ][ $index_in_cache ];
-				unset( $this->_model_relations[ $relationName ][ $index_in_cache ] );
+				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
+				unset($this->_model_relations[$relationName][$index_in_cache]);
 			} else {
 				//that thing was never cached anyways.
 				$obj_removed = null;
@@ -720,24 +720,24 @@ 
 	 * @return boolean TRUE on success, FALSE on fail
 	 * @throws \EE_Error
 	 */
-	public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
+	public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
 		// verify that incoming object is of the correct type
-		$obj_class = 'EE_' . $relationName;
-		if ( $newly_saved_object instanceof $obj_class ) {
+		$obj_class = 'EE_'.$relationName;
+		if ($newly_saved_object instanceof $obj_class) {
 			/* @type EE_Base_Class $newly_saved_object*/
 			// now get the type of relation
-			$relationship_to_model = $this->get_model()->related_settings_for( $relationName );
+			$relationship_to_model = $this->get_model()->related_settings_for($relationName);
 			// if this is a 1:1 relationship
-			if( $relationship_to_model instanceof EE_Belongs_To_Relation ) {
+			if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
 				// then just replace the cached object with the newly saved object
 				$this->_model_relations[$relationName] = $newly_saved_object;
 				return TRUE;
 			// or if it's some kind of sordid feral polyamorous relationship...
-			} elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) {
+			} elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) {
 				// then remove the current cached item
-				unset( $this->_model_relations[$relationName][ $current_cache_id ] );
+				unset($this->_model_relations[$relationName][$current_cache_id]);
 				// and cache the newly saved object using it's new ID
-				$this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object;
+				$this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object;
 				return TRUE;
 			}
 		}
@@ -753,11 +753,11 @@ 
 	 * @param string $relationName
 	 * @return EE_Base_Class
 	 */
-	public function get_one_from_cache($relationName){
-		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
-		if(is_array($cached_array_or_object)){
+	public function get_one_from_cache($relationName) {
+		$cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : null;
+		if (is_array($cached_array_or_object)) {
 			return array_shift($cached_array_or_object);
-		}else{
+		} else {
 			return $cached_array_or_object;
 		}
 	}
@@ -772,23 +772,23 @@ 
 	 * @throws \EE_Error
 	 * @return EE_Base_Class[] NOT necessarily indexed by primary keys
 	 */
-	public function get_all_from_cache($relationName){
-		$objects = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array();
+	public function get_all_from_cache($relationName) {
+		$objects = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : array();
 		// if the result is not an array, but exists, make it an array
-		$objects = is_array( $objects ) ? $objects : array( $objects );
+		$objects = is_array($objects) ? $objects : array($objects);
 		//bugfix for https://events.codebasehq.com/projects/event-espresso/tickets/7143
 		//basically, if this model object was stored in the session, and these cached model objects
 		//already have IDs, let's make sure they're in their model's entity mapper
 		//otherwise we will have duplicates next time we call
 		// EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() );
-		$model = EE_Registry::instance()->load_model( $relationName );
-		foreach( $objects as $model_object ){
-			if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){
+		$model = EE_Registry::instance()->load_model($relationName);
+		foreach ($objects as $model_object) {
+			if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) {
 				//ensure its in the map if it has an ID; otherwise it will be added to the map when its saved
-				if( $model_object->ID() ){
-					$model->add_to_entity_map( $model_object );
+				if ($model_object->ID()) {
+					$model->add_to_entity_map($model_object);
 				}
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -796,7 +796,7 @@ 
 							'event_espresso'
 						),
 						$relationName,
-						gettype( $model_object )
+						gettype($model_object)
 					)
 				);
 			}
@@ -818,15 +818,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -843,15 +843,15 @@ 
 	 * @return array|EE_Base_Class[]
 	 * @throws \EE_Error
 	 */
-	public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select );
+		return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -867,15 +867,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -891,15 +891,15 @@ 
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field()
+	public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field()
 			? $this->get_model()->get_primary_key_field()->get_name()
 			: $field_to_order_by;
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
-		if ( empty( $field ) || empty( $current_value ) ) {
+		$current_value = ! empty($field) ? $this->get($field) : null;
+		if (empty($field) || empty($current_value)) {
 			return array();
 		}
-		return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select );
+		return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select);
 	}
 
 
@@ -912,25 +912,25 @@ 
 	 * @param mixed  $field_value_from_db
 	 * @throws \EE_Error
 	 */
-	public function set_from_db($field_name,$field_value_from_db){
+	public function set_from_db($field_name, $field_value_from_db) {
 		$field_obj = $this->get_model()->field_settings_for($field_name);
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
+		if ($field_obj instanceof EE_Model_Field_Base) {
 			//you would think the DB has no NULLs for non-null label fields right? wrong!
 			//eg, a CPT model object could have an entry in the posts table, but no
 			//entry in the meta table. Meaning that all its columns in the meta table
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
-			if($field_value_from_db === NULL ){
-				if( $field_obj->is_nullable()){
+			if ($field_value_from_db === NULL) {
+				if ($field_obj->is_nullable()) {
 					//if the field allows nulls, then let it be null
 					$field_value = NULL;
-				}else{
+				} else {
 					$field_value = $field_obj->get_default_value();
 				}
-			}else{
-				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
+			} else {
+				$field_value = $field_obj->prepare_for_set_from_db($field_value_from_db);
 			}
 			$this->_fields[$field_name] = $field_value;
-			$this->_clear_cached_property( $field_name );
+			$this->_clear_cached_property($field_name);
 		}
 	}
 
@@ -946,8 +946,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get($field_name, $extra_cache_ref = NULL ){
-		return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref );
+	public function get($field_name, $extra_cache_ref = NULL) {
+		return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref);
 	}
 
 
@@ -980,10 +980,10 @@ 
 	 *                                         just null is returned (because that indicates that likely
 	 *                                         this field is nullable).
 	 */
-	public function get_DateTime_object( $field_name ) {
-		$field_settings = $this->get_model()->field_settings_for( $field_name );
+	public function get_DateTime_object($field_name) {
+		$field_settings = $this->get_model()->field_settings_for($field_name);
 
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
 			EE_Error::add_error(
 				sprintf(
 					__(
@@ -1015,7 +1015,7 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function e($field_name, $extra_cache_ref = NULL){
+	public function e($field_name, $extra_cache_ref = NULL) {
 		echo $this->get_pretty($field_name, $extra_cache_ref);
 	}
 
@@ -1029,8 +1029,8 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	public function f($field_name){
-		$this->e($field_name,'form_input');
+	public function f($field_name) {
+		$this->e($field_name, 'form_input');
 	}
 
 
@@ -1043,8 +1043,8 @@ 
 	 * @return mixed
 	 * @throws \EE_Error
 	 */
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
 	}
 
 
@@ -1062,36 +1062,36 @@ 
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
 	 * @throws \EE_Error
 	 */
-	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
+	protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) {
 
-		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt :  $dt_frmt;
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt;
 		$in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt;
 
 		//validate field for datetime and returns field settings if valid.
-		$field = $this->_get_dtt_field_settings( $field_name );
+		$field = $this->_get_dtt_field_settings($field_name);
 
 		//clear cached property if either formats are not null.
-		if( $dt_frmt !== null || $tm_frmt !== null ) {
-			$this->_clear_cached_property( $field_name );
+		if ($dt_frmt !== null || $tm_frmt !== null) {
+			$this->_clear_cached_property($field_name);
 			//reset format properties because they are used in get()
 			$this->_dt_frmt = $in_dt_frmt;
 			$this->_tm_frmt = $in_tm_frmt;
 		}
-		if ( $echo ) {
-			$field->set_pretty_date_format( $in_dt_frmt );
+		if ($echo) {
+			$field->set_pretty_date_format($in_dt_frmt);
 		} else {
-			$field->set_date_format( $in_dt_frmt );
+			$field->set_date_format($in_dt_frmt);
 		}
-		if ( $echo ) {
-			$field->set_pretty_time_format( $in_tm_frmt );
+		if ($echo) {
+			$field->set_pretty_time_format($in_tm_frmt);
 		} else {
-			$field->set_time_format( $in_tm_frmt );
+			$field->set_time_format($in_tm_frmt);
 		}
 		//set timezone in field object
-		$field->set_timezone( $this->_timezone );
+		$field->set_timezone($this->_timezone);
 
 		//set the output returned
-		switch ( $date_or_time ) {
+		switch ($date_or_time) {
 
 			case 'D' :
 				$field->set_date_time_output('date');
@@ -1106,11 +1106,11 @@ 
 		}
 
 
-		if ( $echo ) {
-			$this->e( $field_name, $date_or_time );
+		if ($echo) {
+			$this->e($field_name, $date_or_time);
 			return '';
 		 }
-		return $this->get( $field_name, $date_or_time );
+		return $this->get($field_name, $date_or_time);
 	}
 
 
@@ -1123,8 +1123,8 @@ 
 	 * @return string            datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_date( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, $format, NULL, 'D' );
+	public function get_date($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, $format, NULL, 'D');
 	}
 
 
@@ -1134,8 +1134,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_date( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, $format, NULL, 'D', TRUE );
+	public function e_date($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, $format, NULL, 'D', TRUE);
 	}
 
 
@@ -1148,8 +1148,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_time( $field_name, $format = NULL ) {
-		return $this->_get_datetime( $field_name, NULL, $format, 'T' );
+	public function get_time($field_name, $format = NULL) {
+		return $this->_get_datetime($field_name, NULL, $format, 'T');
 	}
 
 
@@ -1159,8 +1159,8 @@ 
 	 * @param null $format
 	 * @throws \EE_Error
 	 */
-	public function e_time( $field_name, $format = NULL ) {
-		$this->_get_datetime( $field_name, NULL, $format, 'T', TRUE );
+	public function e_time($field_name, $format = NULL) {
+		$this->_get_datetime($field_name, NULL, $format, 'T', TRUE);
 	}
 
 
@@ -1174,8 +1174,8 @@ 
 	 * @return string             datetime value formatted
 	 * @throws \EE_Error
 	 */
-	public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt );
+	public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt);
 	}
 
 
@@ -1186,8 +1186,8 @@ 
 	 * @param null $tm_frmt
 	 * @throws \EE_Error
 	 */
-	public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
-		$this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
+	public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
+		$this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
 	}
 
 
@@ -1201,11 +1201,11 @@ 
 	 * @throws \EE_Error
 	 *                           field name.
 	 */
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
+	public function get_i18n_datetime($field_name, $format = NULL) {
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
 		return date_i18n(
 			$format,
-			EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone )
+			EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone)
 		);
 	}
 
@@ -1218,14 +1218,14 @@ 
 	 * @throws EE_Error
 	 * @return EE_Datetime_Field
 	 */
-	protected function _get_dtt_field_settings( $field_name ) {
+	protected function _get_dtt_field_settings($field_name) {
 		$field = $this->get_model()->field_settings_for($field_name);
 
 		//check if field is dtt
-		if ( $field instanceof EE_Datetime_Field ) {
+		if ($field instanceof EE_Datetime_Field) {
 			return $field;
 		} else {
-			throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) );
+			throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this))));
 		}
 	}
 
@@ -1246,8 +1246,8 @@ 
 	 * @param string          $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_time_for( $time, $fieldname ) {
-		$this->_set_date_time( 'T', $time, $fieldname );
+	protected function _set_time_for($time, $fieldname) {
+		$this->_set_date_time('T', $time, $fieldname);
 	}
 
 
@@ -1260,8 +1260,8 @@ 
 	 * @param string          $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_for( $date, $fieldname ) {
-		$this->_set_date_time( 'D', $date, $fieldname );
+	protected function _set_date_for($date, $fieldname) {
+		$this->_set_date_time('D', $date, $fieldname);
 	}
 
 
@@ -1275,26 +1275,26 @@ 
 	 * @param string          $fieldname      the name of the field the date OR time is being set on (must match a EE_Datetime_Field property)
 	 * @throws \EE_Error
 	 */
-	protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) {
-		$field = $this->_get_dtt_field_settings( $fieldname );
-		$field->set_timezone( $this->_timezone );
-		$field->set_date_format( $this->_dt_frmt );
-		$field->set_time_format( $this->_tm_frmt );
-		switch ( $what ) {
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
+		$field = $this->_get_dtt_field_settings($fieldname);
+		$field->set_timezone($this->_timezone);
+		$field->set_date_format($this->_dt_frmt);
+		$field->set_time_format($this->_tm_frmt);
+		switch ($what) {
 			case 'T' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_time(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'D' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set_with_new_date(
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date(
 					$datetime_value,
-					$this->_fields[ $fieldname ]
+					$this->_fields[$fieldname]
 				);
 				break;
 			case 'B' :
-				$this->_fields[ $fieldname ] = $field->prepare_for_set( $datetime_value );
+				$this->_fields[$fieldname] = $field->prepare_for_set($datetime_value);
 				break;
 		}
 		$this->_clear_cached_property($fieldname);
@@ -1316,17 +1316,17 @@ 
 	 * @throws EE_Error
 	 * @return string timestamp
 	 */
-	public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) {
+	public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') {
 		$timezone = EEH_DTT_Helper::get_timezone();
-		if ( $timezone === $this->_timezone ) {
+		if ($timezone === $this->_timezone) {
 			return '';
 		}
 		$original_timezone = $this->_timezone;
-		$this->set_timezone( $timezone );
+		$this->set_timezone($timezone);
 
 		$fn = (array) $field_name;
-		$args = array_merge( $fn, (array) $args );
-		if ( ! method_exists( $this, $callback ) ) {
+		$args = array_merge($fn, (array) $args);
+		if ( ! method_exists($this, $callback)) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1338,9 +1338,9 @@ 
 			);
 		}
 		$args = (array) $args;
-		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
+		$return = $prepend.call_user_func_array(array($this, $callback), $args).$append;
 
-		$this->set_timezone( $original_timezone );
+		$this->set_timezone($original_timezone);
 		return $return;
 	}
 
@@ -1354,7 +1354,7 @@ 
 	 * @return boolean | int
 	 * @throws \EE_Error
 	 */
-	public function delete(){
+	public function delete() {
 		/**
 		 * Called just before the `EE_Base_Class::_delete` method call.
 		 * Note: `EE_Base_Class::_delete` might be overridden by child classes so any client code hooking into these actions
@@ -1363,7 +1363,7 @@ 
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
+		do_action('AHEE__EE_Base_Class__delete__before', $this);
 		$result = $this->_delete();
 		/**
 		 * Called just after the `EE_Base_Class::_delete` method call.
@@ -1373,7 +1373,7 @@ 
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete__end', $this, $result);
 		return $result;
 	}
 
@@ -1399,22 +1399,22 @@ 
 	 * @return bool | int
 	 * @throws \EE_Error
 	 */
-	public function delete_permanently(){
+	public function delete_permanently() {
 		/**
 		 * Called just before HARD deleting a model object
 		 *
 		 * @param EE_Base_Class $model_object about to be 'deleted'
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__before', $this );
-		$model=$this->get_model();
-		$result=$model->delete_permanently_by_ID($this->ID());
+		do_action('AHEE__EE_Base_Class__delete_permanently__before', $this);
+		$model = $this->get_model();
+		$result = $model->delete_permanently_by_ID($this->ID());
 		$this->refresh_cache_of_related_objects();
 		/**
 		 * Called just after HARD deleting a model object
 		 * @param EE_Base_Class $model_object that was just 'deleted'
 		 * @param boolean $result
 		 */
-		do_action( 'AHEE__EE_Base_Class__delete_permanently__end', $this, $result );
+		do_action('AHEE__EE_Base_Class__delete_permanently__end', $this, $result);
 		return $result;
 	}
 
@@ -1427,18 +1427,18 @@ 
 	 * @throws \EE_Error
 	 */
         public function refresh_cache_of_related_objects() {
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
-                    $related_objects = $this->_model_relations[ $relation_name ];
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
+            foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+                if ( ! empty($this->_model_relations[$relation_name])) {
+                    $related_objects = $this->_model_relations[$relation_name];
+                    if ($relation_obj instanceof EE_Belongs_To_Relation) {
                         //this relation only stores a single model object, not an array
                         //but let's make it consistent
-                        $related_objects = array( $related_objects );
+                        $related_objects = array($related_objects);
                     }
-                    foreach( $related_objects as $related_object ) {
+                    foreach ($related_objects as $related_object) {
                         //only refresh their cache if they're in memory
-                        if( $related_object instanceof EE_Base_Class ) {
-							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                        if ($related_object instanceof EE_Base_Class) {
+							$related_object->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
                     }
                 }
@@ -1458,17 +1458,17 @@ 
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object
 	 * isn't allowed to persist (as determined by EE_Base_Class::allow_persist())
 	 */
-	public function save($set_cols_n_values=array()) {
+	public function save($set_cols_n_values = array()) {
 		/**
 		 * Filters the fields we're about to save on the model object
 		 *
 		 * @param array $set_cols_n_values
 		 * @param EE_Base_Class $model_object
 		 */
-		$set_cols_n_values = (array)apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this  );
+		$set_cols_n_values = (array) apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this);
 		//set attributes as provided in $set_cols_n_values
-		foreach($set_cols_n_values as $column=>$value){
-			$this->set($column,$value);
+		foreach ($set_cols_n_values as $column=>$value) {
+			$this->set($column, $value);
 		}
 		/**
 		 * Saving a model object.
@@ -1476,8 +1476,8 @@ 
 		 * Before we perform a save, this action is fired.
 		 * @param EE_Base_Class $model_object the model object about to be saved.
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__begin', $this );
-		if( ! $this->allow_persist() ) {
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
+		if ( ! $this->allow_persist()) {
 			return 0;
 		}
 		//now get current attribute values
@@ -1487,61 +1487,61 @@ 
 		$old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object();
 		$this->get_model()->assume_values_already_prepared_by_model_object(true);
 		//does this model have an autoincrement PK?
-		if($this->get_model()->has_primary_key_field()){
-			if($this->get_model()->get_primary_key_field()->is_auto_increment()){
+		if ($this->get_model()->has_primary_key_field()) {
+			if ($this->get_model()->get_primary_key_field()->is_auto_increment()) {
 				//ok check if it's set, if so: update; if not, insert
-				if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){
-					$results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() );
+				if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) {
+					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
 				} else {
-					unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]);
-					$results = $this->get_model()->insert( $save_cols_n_values );
-					if($results){
+					unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]);
+					$results = $this->get_model()->insert($save_cols_n_values);
+					if ($results) {
 						//if successful, set the primary key
 						//but don't use the normal SET method, because it will check if
 						//an item with the same ID exists in the mapper & db, then
 						//will find it in the db (because we just added it) and THAT object
 						//will get added to the mapper before we can add this one!
 						//but if we just avoid using the SET method, all that headache can be avoided
-						$pk_field_name =self::_get_primary_key_name( get_class($this));
+						$pk_field_name = self::_get_primary_key_name(get_class($this));
 						$this->_fields[$pk_field_name] = $results;
 						$this->_clear_cached_property($pk_field_name);
-						$this->get_model()->add_to_entity_map( $this );
+						$this->get_model()->add_to_entity_map($this);
 						$this->_update_cached_related_model_objs_fks();
 					}
 				}
-			}else{//PK is NOT auto-increment
+			} else {//PK is NOT auto-increment
 				//so check if one like it already exists in the db
-				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
-					if( WP_DEBUG && ! $this->in_entity_map() ){
+				if ($this->get_model()->exists_by_ID($this->ID())) {
+					if (WP_DEBUG && ! $this->in_entity_map()) {
 						throw new EE_Error(
 							sprintf(
-								__( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ),
+								__('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'),
 								get_class($this),
-								get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-								get_class( $this->get_model() ) . '::instance()->get_one_by_ID()',
+								get_class($this->get_model()).'::instance()->add_to_entity_map()',
+								get_class($this->get_model()).'::instance()->get_one_by_ID()',
 								'<br />'
 							)
 						);
 					}
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
-				}else{
+				} else {
 					$results = $this->get_model()->insert($save_cols_n_values);
 					$this->_update_cached_related_model_objs_fks();
 				}
 			}
-		}else{//there is NO primary key
+		} else {//there is NO primary key
 			$already_in_db = false;
-			foreach($this->get_model()->unique_indexes() as $index){
+			foreach ($this->get_model()->unique_indexes() as $index) {
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
-				if($this->get_model()->exists(array($uniqueness_where_params))){
+				if ($this->get_model()->exists(array($uniqueness_where_params))) {
 					$already_in_db = true;
 				}
 			}
-			if( $already_in_db ){
-				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
-				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
-			}else{
-				$results = $this->get_model()->insert( $save_cols_n_values );
+			if ($already_in_db) {
+				$combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields());
+				$results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values);
+			} else {
+				$results = $this->get_model()->insert($save_cols_n_values);
 			}
 		}
 		//restore the old assumption about values being prepared by the model object
@@ -1554,7 +1554,7 @@ 
 		 * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted
 		 * the new ID (or 0 if an error occurred and it wasn't updated)
 		 */
-		do_action( 'AHEE__EE_Base_Class__save__end', $this, $results );
+		do_action('AHEE__EE_Base_Class__save__end', $this, $results);
 		return $results;
 	}
 
@@ -1569,15 +1569,15 @@ 
 	 * @return void
 	 * @throws \EE_Error
 	 */
-	protected function _update_cached_related_model_objs_fks(){
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){
-			if( $relation_obj instanceof EE_Has_Many_Relation ){
-				foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) {
+	protected function _update_cached_related_model_objs_fks() {
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Has_Many_Relation) {
+				foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) {
 					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to(
 						$this->get_model()->get_this_model_name()
 					);
-					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() );
-					if( $related_model_obj_in_cache->ID() ){
+					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID());
+					if ($related_model_obj_in_cache->ID()) {
 						$related_model_obj_in_cache->save();
 					}
 				}
@@ -1598,21 +1598,21 @@ 
 	 * @return int ID of new model object on save; 0 on failure+
 	 * @throws \EE_Error
 	 */
-	public function save_new_cached_related_model_objs(){
+	public function save_new_cached_related_model_objs() {
 		//make sure this has been saved
-		if( ! $this->ID()){
+		if ( ! $this->ID()) {
 			$id = $this->save();
-		}else{
+		} else {
 			$id = $this->ID();
 		}
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
-		foreach($this->get_model()->relation_settings() as $relationName => $relationObj){
+		foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) {
 
 
-			if($this->_model_relations[$relationName]){
+			if ($this->_model_relations[$relationName]) {
 				//is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation)
 				//or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)?
-				if($relationObj instanceof EE_Belongs_To_Relation){
+				if ($relationObj instanceof EE_Belongs_To_Relation) {
 					//add a relation to that relation type (which saves the appropriate thing in the process)
 					//but ONLY if it DOES NOT exist in the DB
 					/* @var $related_model_obj EE_Base_Class */
@@ -1621,8 +1621,8 @@ 
 						$this->_add_relation_to($related_model_obj, $relationName);
 						$related_model_obj->save_new_cached_related_model_objs();
 //					}
-				}else{
-					foreach($this->_model_relations[$relationName] as $related_model_obj){
+				} else {
+					foreach ($this->_model_relations[$relationName] as $related_model_obj) {
 						//add a relation to that relation type (which saves the appropriate thing in the process)
 						//but ONLY if it DOES NOT exist in the DB
 //						if( ! $related_model_obj->ID()){
@@ -1643,8 +1643,8 @@ 
 	 * @return \EEM_Base | \EEM_CPT_Base
 	 */
 	public function get_model() {
-		$modelName = self::_get_model_classname( get_class($this) );
-		return self::_get_model_instance_with_name($modelName, $this->_timezone );
+		$modelName = self::_get_model_classname(get_class($this));
+		return self::_get_model_instance_with_name($modelName, $this->_timezone);
 	}
 
 
@@ -1655,10 +1655,10 @@ 
 	 * @return mixed bool|EE_Base_Class|EEM_CPT_Base
 	 * @throws \EE_Error
 	 */
-	protected static function _get_object_from_entity_mapper($props_n_values, $classname){
+	protected static function _get_object_from_entity_mapper($props_n_values, $classname) {
 		//TODO: will not work for Term_Relationships because they have no PK!
-		$primary_id_ref = self::_get_primary_key_name( $classname );
-		if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
+		$primary_id_ref = self::_get_primary_key_name($classname);
+		if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
 			$id = $props_n_values[$primary_id_ref];
 			return self::_get_model($classname)->get_from_entity_map($id);
 		}
@@ -1679,37 +1679,37 @@ 
 	 * @return mixed (EE_Base_Class|bool)
 	 * @throws \EE_Error
 	 */
-	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL, $date_formats = array() ) {
+	protected static function _check_for_object($props_n_values, $classname, $timezone = NULL, $date_formats = array()) {
 		$existing = null;
-		if ( self::_get_model( $classname )->has_primary_key_field() ) {
-			$primary_id_ref = self::_get_primary_key_name( $classname );
-			if ( array_key_exists( $primary_id_ref, $props_n_values )
-			     && ! empty( $props_n_values[ $primary_id_ref ] )
+		if (self::_get_model($classname)->has_primary_key_field()) {
+			$primary_id_ref = self::_get_primary_key_name($classname);
+			if (array_key_exists($primary_id_ref, $props_n_values)
+			     && ! empty($props_n_values[$primary_id_ref])
 			) {
-				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-					$props_n_values[ $primary_id_ref ]
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+					$props_n_values[$primary_id_ref]
 				);
 			}
-		} elseif ( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields( $props_n_values ) ) {
+		} elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) {
 			//no primary key on this model, but there's still a matching item in the DB
-			$existing = self::_get_model( $classname, $timezone )->get_one_by_ID(
-				self::_get_model( $classname, $timezone )->get_index_primary_key_string( $props_n_values )
+			$existing = self::_get_model($classname, $timezone)->get_one_by_ID(
+				self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values)
 			);
 		}
-		if ( $existing ) {
+		if ($existing) {
 
 			//set date formats if present before setting values
-			if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
-				$existing->set_date_format( $date_formats[0] );
-				$existing->set_time_format( $date_formats[1] );
+			if ( ! empty($date_formats) && is_array($date_formats)) {
+				$existing->set_date_format($date_formats[0]);
+				$existing->set_time_format($date_formats[1]);
 			} else {
 				//set default formats for date and time
-				$existing->set_date_format( get_option( 'date_format' ) );
-				$existing->set_time_format( get_option( 'time_format' ) );
+				$existing->set_date_format(get_option('date_format'));
+				$existing->set_time_format(get_option('time_format'));
 			}
 
-			foreach ( $props_n_values as $property => $field_value ) {
-				$existing->set( $property, $field_value );
+			foreach ($props_n_values as $property => $field_value) {
+				$existing->set($property, $field_value);
 			}
 			return $existing;
 		} else {
@@ -1727,9 +1727,9 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	protected static function  _get_model( $classname, $timezone = NULL ){
+	protected static function  _get_model($classname, $timezone = NULL) {
 		//find model for this class
-		if( ! $classname ){
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
 					__(
@@ -1740,8 +1740,8 @@ 
 				)
 			);
 		}
-		$modelName=self::_get_model_classname($classname);
-		return self::_get_model_instance_with_name($modelName, $timezone );
+		$modelName = self::_get_model_classname($classname);
+		return self::_get_model_instance_with_name($modelName, $timezone);
 	}
 
 
@@ -1752,10 +1752,10 @@ 
 	 * @param null   $timezone
 	 * @return EEM_Base
 	 */
-	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
-		$model_classname = str_replace( 'EEM_', '', $model_classname );
-		$model = EE_Registry::instance()->load_model( $model_classname );
-		$model->set_timezone( $timezone );
+	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) {
+		$model_classname = str_replace('EEM_', '', $model_classname);
+		$model = EE_Registry::instance()->load_model($model_classname);
+		$model->set_timezone($timezone);
 		return $model;
 	}
 
@@ -1767,10 +1767,10 @@ 
 	 * @param null $model_name
 	 * @return string like EEM_Attendee
 	 */
-	private static function _get_model_classname( $model_name = null){
-		if(strpos($model_name,"EE_")===0){
-			$model_classname=str_replace("EE_","EEM_",$model_name);
-		}else{
+	private static function _get_model_classname($model_name = null) {
+		if (strpos($model_name, "EE_") === 0) {
+			$model_classname = str_replace("EE_", "EEM_", $model_name);
+		} else {
 			$model_classname = "EEM_".$model_name;
 		}
 		return $model_classname;
@@ -1784,16 +1784,16 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	protected static function _get_primary_key_name( $classname = NULL ){
-		if( ! $classname){
+	protected static function _get_primary_key_name($classname = NULL) {
+		if ( ! $classname) {
 			throw new EE_Error(
 				sprintf(
-					__( "What were you thinking calling _get_primary_key_name(%s)", "event_espresso" ),
+					__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),
 					$classname
 				)
 			);
 		}
-		return self::_get_model( $classname )->get_primary_key_field()->get_name();
+		return self::_get_model($classname)->get_primary_key_field()->get_name();
 	}
 
 
@@ -1807,12 +1807,12 @@ 
 	 * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string
 	 * @throws \EE_Error
 	 */
-	public function ID(){
+	public function ID() {
 		//now that we know the name of the variable, use a variable variable to get its value and return its
-		if( $this->get_model()->has_primary_key_field() ) {
-			return $this->_fields[ self::_get_primary_key_name( get_class($this) ) ];
-		}else{
-			return $this->get_model()->get_index_primary_key_string( $this->_fields );
+		if ($this->get_model()->has_primary_key_field()) {
+			return $this->_fields[self::_get_primary_key_name(get_class($this))];
+		} else {
+			return $this->get_model()->get_index_primary_key_string($this->_fields);
 		}
 	}
 
@@ -1830,38 +1830,38 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class the object the relation was added to
 	 */
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) {
 		//if this thing exists in the DB, save the relation to the DB
-		if( $this->ID() ){
-			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
+		if ($this->ID()) {
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values);
 			//clear cache so future get_many_related and get_first_related() return new results.
-			$this->clear_cache( $relationName, $otherObject, TRUE );
-                        if( $otherObject instanceof EE_Base_Class ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+			$this->clear_cache($relationName, $otherObject, TRUE);
+                        if ($otherObject instanceof EE_Base_Class) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                         }
 		} else {
 			//this thing doesn't exist in the DB,  so just cache it
-			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
-				throw new EE_Error( sprintf(
-					__( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ),
+			if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) {
+				throw new EE_Error(sprintf(
+					__('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'),
 					$otherObjectModelObjectOrID,
-					get_class( $this )
+					get_class($this)
 				));
 			} else {
 				$otherObject = $otherObjectModelObjectOrID;
 			}
-			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
+			$this->cache($relationName, $otherObjectModelObjectOrID, $cache_id);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
+                if ($otherObject instanceof EE_Base_Class) {
                     //fix the reciprocal relation too
-                    if( $otherObject->ID() ) {
+                    if ($otherObject->ID()) {
                             //its saved so assumed relations exist in the DB, so we can just
                             //clear the cache so future queries use the updated info in the DB
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true);
                     } else {
 
                             //it's not saved, so it caches relations like this
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
+                            $otherObject->cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObject;
@@ -1885,17 +1885,17 @@ 
 	 * @return EE_Base_Class the relation was removed from
 	 * @throws \EE_Error
 	 */
-	public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){
-		if ( $this->ID() ) {
+	public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query );
-			$this->clear_cache( $relationName, $otherObject );
+			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
+			$this->clear_cache($relationName, $otherObject);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
+			$otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID);
 		}
-                if( $otherObject instanceof EE_Base_Class ) {
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if ($otherObject instanceof EE_Base_Class) {
+                    $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                 }
 		return $otherObject;
 	}
@@ -1910,18 +1910,18 @@ 
 	 * @return EE_Base_Class
 	 * @throws \EE_Error
 	 */
-	public function _remove_relations($relationName,$where_query_params = array()){
-		if ( $this->ID() ) {
+	public function _remove_relations($relationName, $where_query_params = array()) {
+		if ($this->ID()) {
 			//if this exists in the DB, save the relation change to the DB too
-			$otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params );
-			$this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params);
+			$this->clear_cache($relationName, null, true);
 		} else {
 			//this doesn't exist in the DB, just remove it from the cache
-			$otherObjects = $this->clear_cache( $relationName, null, true );
+			$otherObjects = $this->clear_cache($relationName, null, true);
 		}
-                if( is_array( $otherObjects ) ) {
-                    foreach ( $otherObjects as $otherObject ) {
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
+                if (is_array($otherObjects)) {
+                    foreach ($otherObjects as $otherObject) {
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
                     }
                 }
 		return $otherObjects;
@@ -1941,27 +1941,27 @@ 
 	 * @throws \EE_Error
 	 *                             or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs
 	 */
-	public function get_many_related($relationName,$query_params = array()){
-		if($this->ID()){
+	public function get_many_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
 			//this exists in the DB, so get the related things from either the cache or the DB
 			//if there are query parameters, forget about caching the related model objects.
-			if( $query_params ){
+			if ($query_params) {
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
-			}else{
+			} else {
 				//did we already cache the result of this query?
 				$cached_results = $this->get_all_from_cache($relationName);
-				if ( ! $cached_results ){
+				if ( ! $cached_results) {
 					$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
 					//if no query parameters were passed, then we got all the related model objects
 					//for that relation. We can cache them then.
-					foreach($related_model_objects as $related_model_object){
+					foreach ($related_model_objects as $related_model_object) {
 						$this->cache($relationName, $related_model_object);
 					}
-				}else{
+				} else {
 					$related_model_objects = $cached_results;
 				}
 			}
-		}else{
+		} else {
 			//this doesn't exist in the DB, so just get the related things from the cache
 			$related_model_objects = $this->get_all_from_cache($relationName);
 		}
@@ -1979,8 +1979,8 @@ 
 	 * @param bool   	$distinct       if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){
-		return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct);
+	public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
+		return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct);
 	}
 
 
@@ -1994,7 +1994,7 @@ 
 	 * 						By default, uses primary key (which doesn't make much sense, so you should probably change it)
 	 * @return int
 	 */
-	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){
+	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) {
 		return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum);
 	}
 
@@ -2008,33 +2008,33 @@ 
 	 * @return EE_Base_Class (not an array, a single object)
 	 * @throws \EE_Error
 	 */
-	public function get_first_related($relationName,$query_params = array()){
-		if($this->ID()){//this exists in the DB, get from the cache OR the DB
+	public function get_first_related($relationName, $query_params = array()) {
+		if ($this->ID()) {//this exists in the DB, get from the cache OR the DB
 
 			//if they've provided some query parameters, don't bother trying to cache the result
 			//also make sure we're not caching the result of get_first_related
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
-			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
-			}else{
+			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
+			} else {
 				//first, check if we've already cached the result of this query
 				$cached_result = $this->get_one_from_cache($relationName);
-				if ( ! $cached_result ){
+				if ( ! $cached_result) {
 
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
-					$this->cache($relationName,$related_model_object);
-				}else{
+					$this->cache($relationName, $related_model_object);
+				} else {
 					$related_model_object = $cached_result;
 				}
 			}
-		}else{
+		} else {
 			$related_model_object = null;
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
-			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
+			if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
 			}
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
-			if( ! $related_model_object){
+			if ( ! $related_model_object) {
 				$related_model_object = $this->get_one_from_cache($relationName);
 			}
 
@@ -2056,12 +2056,12 @@ 
 	 * @return int how many deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_related($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
-		}else{
+	public function delete_related($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
-			$this->clear_cache($relationName,NULL,TRUE);
+			$this->clear_cache($relationName, NULL, TRUE);
 		}
 		return $count;
 	}
@@ -2080,13 +2080,13 @@ 
 	 * @return int how many deleted (including those soft deleted)
 	 * @throws \EE_Error
 	 */
-	public function delete_related_permanently($relationName,$query_params = array()){
-		if($this->ID()){
-			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
-		}else{
+	public function delete_related_permanently($relationName, $query_params = array()) {
+		if ($this->ID()) {
+			$count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
+		} else {
 			$count = count($this->get_all_from_cache($relationName));
 		}
-		$this->clear_cache($relationName,NULL,TRUE);
+		$this->clear_cache($relationName, NULL, TRUE);
 		return $count;
 	}
 
@@ -2102,7 +2102,7 @@ 
 	 * @param  string $field_name property to check
 	 * @return bool            				  TRUE if existing,FALSE if not.
 	 */
-	public function is_set( $field_name ) {
+	public function is_set($field_name) {
 		return isset($this->_fields[$field_name]);
 	}
 
@@ -2114,11 +2114,11 @@ 
 	 * @throws EE_Error
 	 * @return bool                              TRUE if existing, throw EE_Error if not.
 	 */
-	protected function _property_exists( $properties ) {
+	protected function _property_exists($properties) {
 
-		foreach ( (array) $properties as $property_name ) {
+		foreach ((array) $properties as $property_name) {
 			//first make sure this property exists
-			if ( ! $this->_fields[ $property_name ] ) {
+			if ( ! $this->_fields[$property_name]) {
 				throw new EE_Error(
 					sprintf(
 						__(
@@ -2146,7 +2146,7 @@ 
 		$fields = $this->get_model()->field_settings(FALSE);
 		$properties = array();
 		//remove prepended underscore
-		foreach ( $fields as $field_name => $settings ) {
+		foreach ($fields as $field_name => $settings) {
 			$properties[$field_name] = $this->get($field_name);
 		}
 		return $properties;
@@ -2176,10 +2176,10 @@ 
 	 * @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(
 					__(
@@ -2192,7 +2192,7 @@ 
 				)
 			);
 		}
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -2208,7 +2208,7 @@ 
 	 * @throws \EE_Error
 	 * NOTE: if the values haven't changed, returns 0
 	 */
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2216,17 +2216,17 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $previous_value !== null ) {
+		if ($previous_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all( $query_params );
-		if ( ! $existing_rows_like_that ) {
-			return $this->add_extra_meta( $meta_key, $meta_value );
+		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
+		if ( ! $existing_rows_like_that) {
+			return $this->add_extra_meta($meta_key, $meta_value);
 		} else {
-			foreach ( $existing_rows_like_that as $existing_row ) {
-				$existing_row->save( array( 'EXM_value' => $meta_value ) );
+			foreach ($existing_rows_like_that as $existing_row) {
+				$existing_row->save(array('EXM_value' => $meta_value));
 			}
-			return count( $existing_rows_like_that );
+			return count($existing_rows_like_that);
 		}
 	}
 
@@ -2243,8 +2243,8 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function add_extra_meta($meta_key,$meta_value,$unique = false){
-		if ( $unique ) {
+	public function add_extra_meta($meta_key, $meta_value, $unique = false) {
+		if ($unique) {
 			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(
 				array(
 					array(
@@ -2254,7 +2254,7 @@ 
 					)
 				)
 			);
-			if ( $existing_extra_meta ) {
+			if ($existing_extra_meta) {
 				return false;
 			}
 		}
@@ -2281,7 +2281,7 @@ 
 	 * @return int number of extra meta rows deleted
 	 * @throws \EE_Error
 	 */
-	public function delete_extra_meta($meta_key,$meta_value = NULL){
+	public function delete_extra_meta($meta_key, $meta_value = NULL) {
 		$query_params = array(
 			array(
 				'EXM_key'  => $meta_key,
@@ -2289,10 +2289,10 @@ 
 				'EXM_type' => $this->get_model()->get_this_model_name()
 			)
 		);
-		if ( $meta_value !== null ) {
+		if ($meta_value !== null) {
 			$query_params[0]['EXM_value'] = $meta_value;
 		}
-		return EEM_Extra_Meta::instance()->delete( $query_params );
+		return EEM_Extra_Meta::instance()->delete($query_params);
 	}
 
 
@@ -2308,25 +2308,25 @@ 
 	 * @return mixed single value if $single; array if ! $single
 	 * @throws \EE_Error
 	 */
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){
-		if($single){
-			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if ( $result instanceof EE_Extra_Meta ){
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) {
+		if ($single) {
+			$result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($result instanceof EE_Extra_Meta) {
 				return $result->value();
-			}else{
+			} else {
 				return $default;
 			}
-		}else{
-			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
-			if($results){
+		} else {
+			$results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
+			if ($results) {
 				$values = array();
-				foreach($results as $result){
-					if ( $result instanceof EE_Extra_Meta ){
+				foreach ($results as $result) {
+					if ($result instanceof EE_Extra_Meta) {
 						$values[$result->ID()] = $result->value();
 					}
 				}
 				return $values;
-			}else{
+			} else {
 				return $default;
 			}
 		}
@@ -2348,20 +2348,20 @@ 
 	 * @return array
 	 * @throws \EE_Error
 	 */
-	public function all_extra_meta_array($one_of_each_key = true){
+	public function all_extra_meta_array($one_of_each_key = true) {
 		$return_array = array();
-		if($one_of_each_key){
+		if ($one_of_each_key) {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key'));
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
 				}
 			}
-		}else{
+		} else {
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
-			foreach($extra_meta_objs as $extra_meta_obj){
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
-					if( ! isset($return_array[$extra_meta_obj->key()])){
+			foreach ($extra_meta_objs as $extra_meta_obj) {
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
+					if ( ! isset($return_array[$extra_meta_obj->key()])) {
 						$return_array[$extra_meta_obj->key()] = array();
 					}
 					$return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value();
@@ -2379,19 +2379,19 @@ 
 	 * @return string
 	 * @throws \EE_Error
 	 */
-	public function name(){
+	public function name() {
 		//find a field that's not a text field
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
-		if($field_we_can_use){
+		if ($field_we_can_use) {
 			return $this->get($field_we_can_use->get_name());
-		}else{
+		} else {
 			$first_few_properties = $this->model_field_array();
-			$first_few_properties = array_slice($first_few_properties,0,3);
+			$first_few_properties = array_slice($first_few_properties, 0, 3);
 			$name_parts = array();
-			foreach( $first_few_properties as $name=> $value ){
+			foreach ($first_few_properties as $name=> $value) {
 				$name_parts[] = "$name:$value";
 			}
-			return implode(",",$name_parts);
+			return implode(",", $name_parts);
 		}
 	}
 
@@ -2404,11 +2404,11 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function in_entity_map(){
-		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
+	public function in_entity_map() {
+		if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) {
 			//well, if we looked, did we find it in the entity map?
 			return TRUE;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -2419,21 +2419,21 @@ 
 	 * @throws EE_Error if this model object isn't in the entity mapper (because then you should
 	 * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE
 	 */
-	public function refresh_from_db(){
-		if( $this->ID() && $this->in_entity_map() ){
-			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
-		}else{
+	public function refresh_from_db() {
+		if ($this->ID() && $this->in_entity_map()) {
+			$this->get_model()->refresh_entity_map_from_db($this->ID());
+		} else {
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
 			//absolutely nothing in it for this ID
-			if( WP_DEBUG ) {
+			if (WP_DEBUG) {
 				throw new EE_Error(
 					sprintf(
-						__( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ),
+						__('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'),
 						$this->ID(),
-						get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
-						get_class( $this->get_model() ) . '::instance()->refresh_entity_map()'
+						get_class($this->get_model()).'::instance()->add_to_entity_map()',
+						get_class($this->get_model()).'::instance()->refresh_entity_map()'
 					)
 				);
 			}
@@ -2447,11 +2447,11 @@ 
 	 * (probably a bad assumption they have made, oh well)
 	 * @return string
 	 */
-	public function __toString(){
+	public function __toString() {
 		try {
-			return sprintf( '%s (%s)', $this->name(), $this->ID() );
-		} catch ( Exception $e ) {
-			EE_Error::add_error( $e->getMessage(), __FILE__, __FUNCTION__, __LINE__ );
+			return sprintf('%s (%s)', $this->name(), $this->ID());
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
 			return '';
 		}
 	}
@@ -2487,16 +2487,16 @@ 
 	 * @throws \EE_Error
 	 */
 	public function __sleep() {
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
-			if( $relation_obj instanceof EE_Belongs_To_Relation ) {
-				$classname = 'EE_' . $this->get_model()->get_this_model_name();
-				if( $this->get_one_from_cache( $relation_name ) instanceof $classname &&
-						$this->get_one_from_cache( $relation_name )->ID() ) {
-					$this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() );
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
+				$classname = 'EE_'.$this->get_model()->get_this_model_name();
+				if ($this->get_one_from_cache($relation_name) instanceof $classname &&
+						$this->get_one_from_cache($relation_name)->ID()) {
+					$this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID());
 				}
 			}
 		}
-		return array_keys( get_object_vars( $this ) );
+		return array_keys(get_object_vars($this));
 	}
 
 

Doc Comments +12 added lines, -11 removed lines

@@ -862,7 +862,7 @@ 
 	 *
 	 * @param null  $field_to_order_by  What field is being used as the reference point.
 	 * @param array $query_params       Any additional conditions on the query.
-	 * @param null  $columns_to_select  If left null, then an array of EE_Base_Class objects is returned, otherwise
+	 * @param string  $columns_to_select  If left null, then an array of EE_Base_Class objects is returned, otherwise
 	 *                                  you can indicate just the columns you want returned
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
@@ -886,7 +886,7 @@ 
 	 *
 	 * @param null  $field_to_order_by  What field is being used as the reference point.
 	 * @param array $query_params       Any additional conditions on the query.
-	 * @param null  $columns_to_select  If left null, then an EE_Base_Class object is returned, otherwise
+	 * @param string  $columns_to_select  If left null, then an EE_Base_Class object is returned, otherwise
 	 *                                  you can indicate just the column you want returned
 	 * @return array|EE_Base_Class
 	 * @throws \EE_Error
@@ -955,7 +955,7 @@ 
 	 * This method simply returns the RAW unprocessed value for the given property in this class
 	 *
 	 * @param  string $field_name A valid fieldname
-	 * @return mixed              Whatever the raw value stored on the property is.
+	 * @return integer|null              Whatever the raw value stored on the property is.
 	 * @throws EE_Error if fieldSettings is misconfigured or the field doesn't exist.
 	 */
 	public function get_raw($field_name) {
@@ -1055,8 +1055,8 @@ 
 	 *
 	 * @access   protected
 	 * @param  string  $field_name   Field on the instantiated EE_Base_Class child object
-	 * @param null     $dt_frmt      valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
-	 * @param null     $tm_frmt      Same as above except this is for time format
+	 * @param string|null     $dt_frmt      valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
+	 * @param null|string     $tm_frmt      Same as above except this is for time format
 	 * @param string   $date_or_time if NULL then both are returned, otherwise "D" = only date and "T" = only time.
 	 * @param  boolean $echo         Whether the dtt is echoing using pretty echoing or just returned using vanilla get
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
@@ -1242,7 +1242,7 @@ 
 	 * sets the time on a datetime property
 	 *
 	 * @access protected
-	 * @param string|Datetime $time      a valid time string for php datetime functions (or DateTime object)
+	 * @param string $time      a valid time string for php datetime functions (or DateTime object)
 	 * @param string          $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
@@ -1256,7 +1256,7 @@ 
 	 * sets the date on a datetime property
 	 *
 	 * @access protected
-	 * @param string|DateTime $date      a valid date string for php datetime functions ( or DateTime object)
+	 * @param string $date      a valid date string for php datetime functions ( or DateTime object)
 	 * @param string          $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
 	 * @throws \EE_Error
 	 */
@@ -1313,6 +1313,7 @@ 
 	 * @param mixed (array|string) $args       This is the arguments that will be passed to the callback.
 	 * @param string               $prepend    You can include something to prepend on the timestamp
 	 * @param string               $append     You can include something to append on the timestamp
+	 * @param string $args
 	 * @throws EE_Error
 	 * @return string timestamp
 	 */
@@ -1351,7 +1352,7 @@ 
 	 * This calls the `EE_Base_Class::_delete` method.  Child classes wishing to change default behaviour should override
 	 * `EE_Base_Class::_delete` NOT this class.
 	 *
-	 * @return boolean | int
+	 * @return integer | int
 	 * @throws \EE_Error
 	 */
 	public function delete(){
@@ -1384,7 +1385,7 @@ 
 	 * This method is called by the public `EE_Base_Class::delete` method.  Any child classes desiring to override default
 	 * functionality for "delete" (which is to call `permanently_delete`) should override this method NOT `EE_Base_Class::delete`
 	 *
-	 * @return bool|int
+	 * @return boolean
 	 * @throws \EE_Error
 	 */
 	protected function _delete() {
@@ -1673,7 +1674,7 @@ 
 	 *
 	 * @param  array  $props_n_values   incoming array of properties and their values
 	 * @param  string $classname        the classname of the child class
-	 * @param null    $timezone
+	 * @param string|null    $timezone
 	 * @param array   $date_formats     incoming date_formats in an array where the first value is the
 	 *                                  date_format and the second value is the time format
 	 * @return mixed (EE_Base_Class|bool)
@@ -1749,7 +1750,7 @@ 
 	/**
 	 * Gets the model instance (eg instance of EEM_Attendee) given its classname (eg EE_Attendee)
 	 * @param string $model_classname
-	 * @param null   $timezone
+	 * @param string|null   $timezone
 	 * @return EEM_Base
 	 */
 	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){

core/db_classes/EE_Payment_Method.class.php

Spacing +45 added lines, -45 removed lines

@@ -1,5 +1,5 @@ 
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed');}
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {exit('No direct script access allowed'); }
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 /**
  * EE_Payment_Method class
  * Should be parent of all payment method classes
@@ -8,7 +8,7 @@ 
  * @subpackage		includes/classes/EE_Checkin.class.php
  * @author			Mike Nelson
  */
-class EE_Payment_Method extends EE_Base_Class{
+class EE_Payment_Method extends EE_Base_Class {
 
 	/**
 	 * Payment Method type object, which has all the info about this type of payment method,
@@ -24,9 +24,9 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public static function new_instance( $props_n_values = array()) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE);
 	}
 
 
@@ -36,8 +36,8 @@ 
 	 * @return EE_Payment_Method
 	 * @throws \EE_Error
 	 */
-	public static function new_instance_from_db ( $props_n_values = array()) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 
@@ -66,7 +66,7 @@ 
 	 * @return boolean
 	 */
 	public function active() {
-		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()),$this->scope());
+		return array_intersect(array_keys(EEM_Payment_Method::instance()->scopes()), $this->scope());
 	}
 
 
@@ -77,10 +77,10 @@ 
 	 *
 	 * @throws \EE_Error
 	 */
-	public function set_active(){
+	public function set_active() {
 		$default_scopes = array(EEM_Payment_Method::scope_cart);
-		if($this->type_obj() &&
-			$this->type_obj()->payment_occurs() === EE_PMT_Base::offline){
+		if ($this->type_obj() &&
+			$this->type_obj()->payment_occurs() === EE_PMT_Base::offline) {
 			$default_scopes[] = EEM_Payment_Method::scope_admin;
 		}
 		$this->set_scope($default_scopes);
@@ -91,7 +91,7 @@ 
 	/**
 	 * Makes this payment method apply to NO scopes at all. DOES NOT SAVE it.
 	 */
-	public function deactivate(){
+	public function deactivate() {
 		$this->set_scope(array());
 	}
 
@@ -282,8 +282,8 @@ 
 	 * @param mixed $field_value
 	 * @param boolean $use_default
 	 */
-	public function set( $field_name, $field_value, $use_default = FALSE ){
-		if( $field_name === 'PMD_type' ){
+	public function set($field_name, $field_value, $use_default = FALSE) {
+		if ($field_name === 'PMD_type') {
 			//the type has probably changed, so forget about its old type object
 			$this->_type_obj = NULL;
 		}
@@ -357,26 +357,26 @@ 
 	 * @return EE_PMT_Base
 	 * @throws EE_Error
 	 */
-	public function type_obj(){
-		if( ! $this->_type_obj ) {
-			EE_Registry::instance()->load_lib( 'Payment_Method_Manager' );
-			if ( EE_Payment_Method_Manager::instance()->payment_method_type_exists( $this->type() )) {
-				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type( $this->type() );
-				if ( ! class_exists( $class_name )) {
+	public function type_obj() {
+		if ( ! $this->_type_obj) {
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			if (EE_Payment_Method_Manager::instance()->payment_method_type_exists($this->type())) {
+				$class_name = EE_Payment_Method_Manager::instance()->payment_method_class_from_type($this->type());
+				if ( ! class_exists($class_name)) {
 					throw new EE_Error(
 						sprintf(
-							__( 'An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso' ),
+							__('An attempt to use the "%1$s" payment method failed, so it was deactivated.%2$sWas the "%1$s" Plugin recently deactivated? It can be reactivated on the %3$sPlugins Admin Page%4$s', 'event_espresso'),
 							$class_name,
 							'<br />',
-							'<a href="' . admin_url('plugins.php') . '">',
+							'<a href="'.admin_url('plugins.php').'">',
 							'</a>'
 						)
 					);
 				}
-				$r = new ReflectionClass( $class_name );
-					$this->_type_obj = $r->newInstanceArgs( array( $this ));
+				$r = new ReflectionClass($class_name);
+					$this->_type_obj = $r->newInstanceArgs(array($this));
 			} else {
-				throw new EE_Error( sprintf( __( 'A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso' ), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names() ) ) );
+				throw new EE_Error(sprintf(__('A payment method of type "%1$s" does not exist. Only ones existing are: %2$s', 'event_espresso'), $this->type(), implode(',', EE_Payment_Method_Manager::instance()->payment_method_type_names())));
 			}
 		}
 		return $this->_type_obj;
@@ -389,18 +389,18 @@ 
 	 * and the extra meta. Mostly used for passing off ot gateways.	 *
 	 * @return array
 	 */
-	public function settings_array(){
+	public function settings_array() {
 		$fields = $this->model_field_array();
 		$extra_meta = $this->all_extra_meta_array();
 		//remove the model's prefix from the fields
 		$combined_settings_array = array();
-		foreach($fields as $key => $value){
-			if(strpos($key, 'PMD_')===0){
+		foreach ($fields as $key => $value) {
+			if (strpos($key, 'PMD_') === 0) {
 				$key_sans_model_prefix = str_replace('PMD_', '', $key);
 				$combined_settings_array [$key_sans_model_prefix] = $value;
 			}
 		}
-		$combined_settings_array = array_merge( $extra_meta,$combined_settings_array );
+		$combined_settings_array = array_merge($extra_meta, $combined_settings_array);
 		return $combined_settings_array;
 	}
 
@@ -414,12 +414,12 @@ 
 	 * @return string of HTML for displaying the button
 	 * @throws \EE_Error
 	 */
-	public function button_html( $url = '', $css_class = '' ){
+	public function button_html($url = '', $css_class = '') {
 		$payment_occurs = $this->type_obj()->payment_occurs();
 		return '
-		 <div id="' . $this->slug() . '-payment-option-dv" class="'. $payment_occurs .'-payment-gateway reg-page-payment-option-dv' . $css_class . '">
-			<a id="payment-gateway-button-' . $this->slug() . '" class="reg-page-payment-option-lnk" rel="' . $this->slug() . '" href="' . $url . '" >
-				<img src="' . $this->button_url() . '" alt="' . sprintf( esc_attr__( 'Pay using %s', 'event_espresso' ), $this->get_pretty('PMD_name','form_input') ) . '" />
+		 <div id="' . $this->slug().'-payment-option-dv" class="'.$payment_occurs.'-payment-gateway reg-page-payment-option-dv'.$css_class.'">
+			<a id="payment-gateway-button-' . $this->slug().'" class="reg-page-payment-option-lnk" rel="'.$this->slug().'" href="'.$url.'" >
+				<img src="' . $this->button_url().'" alt="'.sprintf(esc_attr__('Pay using %s', 'event_espresso'), $this->get_pretty('PMD_name', 'form_input')).'" />
 			</a>
 		</div>
 ';
@@ -434,7 +434,7 @@ 
 	 * @return EE_Currency[]
 	 * @throws \EE_Error
 	 */
-	public function get_all_usable_currencies(){
+	public function get_all_usable_currencies() {
 		return EEM_Currency::instance()->get_all_currencies_usable_by($this->type_obj());
 	}
 
@@ -447,9 +447,9 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function usable_for_currency( $currency_code ) {
-		foreach( $this->get_all_usable_currencies() as $currency_obj ) {
-			if( $currency_obj->ID() === $currency_code ){
+	public function usable_for_currency($currency_code) {
+		foreach ($this->get_all_usable_currencies() as $currency_obj) {
+			if ($currency_obj->ID() === $currency_code) {
 				return TRUE;
 			}
 		}
@@ -464,7 +464,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_on_site(){
+	public function is_on_site() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::onsite;
 	}
 
@@ -476,7 +476,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_off_site(){
+	public function is_off_site() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::offsite;
 	}
 
@@ -488,7 +488,7 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function is_off_line(){
+	public function is_off_line() {
 		return $this->type_obj()->payment_occurs() === EE_PMT_Base::offline;
 	}
 
@@ -498,10 +498,10 @@ 
 	 * to load the required classes, and don't need them at the time of unserialization
 	 * @return array
 	 */
-	public function __sleep(){
-		$properties =  get_object_vars( $this );
-		unset( $properties[ '_type_obj' ] );
-		return array_keys( $properties );
+	public function __sleep() {
+		$properties = get_object_vars($this);
+		unset($properties['_type_obj']);
+		return array_keys($properties);
 	}