eventespresso / event-espresso-core

core/libraries/form_sections/inputs/EE_Year_Input.input.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('No direct script access allowed');
 
 /**
@@ -24,18 +24,18 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class EE_Year_Input extends EE_Select_Input{
+class EE_Year_Input extends EE_Select_Input {
 
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
-		if($four_digit_year){
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0) {
+		if ($four_digit_year) {
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else {
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();
-		for( $start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++){
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
 			$answer_options[$start] = $start;
 		}
-		parent::__construct( $answer_options, $input_settings );
+		parent::__construct($answer_options, $input_settings);
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -1,6 +1,7 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION'))
+if (!defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -29,7 +30,7 @@ 
 	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 100, $years_ahead = 0 ){
 		if($four_digit_year){
 			$current_year_int = intval(date('Y'));
-		}else{
+		} else{
 			$current_year_int = intval(date('y'));
 		}
 		$answer_options = array();

admin_pages/messages/qtips/EE_Message_List_Table_Tips.lib.php

Spacing +24 added lines, -24 removed lines

@@ -18,9 +18,9 @@ 
 	protected function _set_tips_array() {
 		$this->_qtipsa = array(
 			0 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_sent,
-				'target' => '.msg-status-' . EEM_Message::status_sent,
-				'content' => $this->_message_status_legend( EEM_Message::status_sent ),
+				'content_id' => 'message_status-'.EEM_Message::status_sent,
+				'target' => '.msg-status-'.EEM_Message::status_sent,
+				'content' => $this->_message_status_legend(EEM_Message::status_sent),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -28,9 +28,9 @@ 
 					)
 				),
 			1 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_idle,
-				'target' => '.msg-status-' . EEM_Message::status_idle,
-				'content' => $this->_message_status_legend( EEM_Message::status_idle ),
+				'content_id' => 'message_status-'.EEM_Message::status_idle,
+				'target' => '.msg-status-'.EEM_Message::status_idle,
+				'content' => $this->_message_status_legend(EEM_Message::status_idle),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -38,9 +38,9 @@ 
 					)
 				),
 			2 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_failed,
-				'target' => '.msg-status-' . EEM_Message::status_failed,
-				'content' => $this->_message_status_legend( EEM_Message::status_failed ),
+				'content_id' => 'message_status-'.EEM_Message::status_failed,
+				'target' => '.msg-status-'.EEM_Message::status_failed,
+				'content' => $this->_message_status_legend(EEM_Message::status_failed),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -48,9 +48,9 @@ 
 					)
 				),
 			3 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_resend,
-				'target' => '.msg-status-' . EEM_Message::status_resend,
-				'content' => $this->_message_status_legend( EEM_Message::status_resend ),
+				'content_id' => 'message_status-'.EEM_Message::status_resend,
+				'target' => '.msg-status-'.EEM_Message::status_resend,
+				'content' => $this->_message_status_legend(EEM_Message::status_resend),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -58,9 +58,9 @@ 
 					)
 				),
 			4 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_incomplete,
-				'target' => '.msg-status-' . EEM_Message::status_incomplete,
-				'content' => $this->_message_status_legend( EEM_Message::status_incomplete ),
+				'content_id' => 'message_status-'.EEM_Message::status_incomplete,
+				'target' => '.msg-status-'.EEM_Message::status_incomplete,
+				'content' => $this->_message_status_legend(EEM_Message::status_incomplete),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -68,9 +68,9 @@ 
 					)
 				),
 			5 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_retry,
-				'target' => '.msg-status-' . EEM_Message::status_retry,
-				'content' => $this->_message_status_legend( EEM_Message::status_retry ),
+				'content_id' => 'message_status-'.EEM_Message::status_retry,
+				'target' => '.msg-status-'.EEM_Message::status_retry,
+				'content' => $this->_message_status_legend(EEM_Message::status_retry),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -78,9 +78,9 @@ 
 					)
 				),
 			6 => array(
-				'content_id' => 'message_status-' . EEM_Message::status_debug_only,
-				'target' => '.msg-status-' . EEM_Message::status_debug_only,
-				'content' => $this->_message_status_legend( EEM_Message::status_debug_only ),
+				'content_id' => 'message_status-'.EEM_Message::status_debug_only,
+				'target' => '.msg-status-'.EEM_Message::status_debug_only,
+				'content' => $this->_message_status_legend(EEM_Message::status_debug_only),
 				'options' => array(
 					'position' => array(
 						'target' => 'mouse',
@@ -99,7 +99,7 @@ 
 	 * @param  EEM_Message constant $status What status is set (by class)
 	 * @return string         The status legend with the related status highlighted
 	 */
-	private function _message_status_legend( $status ) {
+	private function _message_status_legend($status) {
 
 		$status_array = array(
 			'sent_status' => EEM_Message::status_sent,
@@ -110,10 +110,10 @@ 
 			'retry_status' => EEM_Message::status_retry,
 			);
 
-		if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
+		if (defined('WP_DEBUG') && WP_DEBUG) {
 			$status_array['debug_only_status'] = EEM_Message::status_debug_only;
 		}
 
-		return EEH_Template::status_legend( $status_array, $status );
+		return EEH_Template::status_legend($status_array, $status);
 	}
 }
\ No newline at end of file

core/libraries/form_sections/inputs/EE_Text_Area_Input.input.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
  *
  * This input has a default validation strategy of plaintext (which can be removed after construction)
  */
-class EE_Text_Area_Input extends EE_Form_Input_Base{
+class EE_Text_Area_Input extends EE_Form_Input_Base {
 
 
 	protected $_rows = 2;
@@ -18,28 +18,28 @@ 
 	 * sets the rows property on this input
 	 * @param int $rows
 	 */
-	public function set_rows( $rows ) {
+	public function set_rows($rows) {
 		$this->_rows = $rows;
 	}
 	/**
 	 * sets the cols html property on this input
 	 * @param int $cols
 	 */
-	public function set_cols( $cols ) {
+	public function set_cols($cols) {
 		$this->_cols = $cols;
 	}
 	/**
 	 *
 	 * @return int
 	 */
-	public function get_rows(){
+	public function get_rows() {
 		return $this->_rows;
 	}
 	/**
 	 *
 	 * @return int
 	 */
-	public function get_cols(){
+	public function get_cols() {
 		return $this->_cols;
 	}
 
@@ -57,7 +57,7 @@ 
 		
 		//if the input hasn't specifically mentioned a more lenient validation strategy, 
 		//apply plaintext validation strategy
-		if( ! $this->has_validation_strategy( 
+		if ( ! $this->has_validation_strategy( 
 				array(
 					'EE_Full_HTML_Validation_Strategy',
 					'EE_Simple_HTML_Validation_Strategy'
@@ -66,7 +66,7 @@ 
 		) {
 			//by default we use the plaintext validation. If you want something else,
 			//just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
-			$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
+			$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
 		}
 	}
 }

admin_pages/registration_form/help_tabs/registration_form_reg_form_settings.help_tab.php

Spacing +3 added lines, -3 removed lines

@@ -3,15 +3,15 @@
 <?php _e('This page shows options for Email Validation, the EE "Bot Trap" and reCAPTCHA which can help prevent SPAM registrations on your site.', 'event_espresso'); ?>
 </p>
 <div id="email_validation_info">
-<p><strong><?php _e('Email Validation', 'event_espresso');?></strong></p>
+<p><strong><?php _e('Email Validation', 'event_espresso'); ?></strong></p>
 <p><?php _e("Validating an email address is extremely difficult to do correctly. Your server's configuration, as well as your own tolerances and needs, can affect the type of validation needed. We offer different types of validation so that you can control how strict your registration form responds to entered email addresses. If you are receiving too many bogus email addresses, then you can try the WordPress Default validation setting. If you find that the form validation is blocking a valid email address you can try the Basic setting, or if available, the International validation settings.", 'event_espresso'); ?>
 </p>
-<p><strong><?php _e('Validation Options:', 'event_espresso' );?></strong></p>
+<p><strong><?php _e('Validation Options:', 'event_espresso'); ?></strong></p>
 <ul>
 <li>
 	<?php _e('"Basic" - only checks that an email address follows the most basic structure guidelines ( ie: text@text.text ). Will work with the widest range of email addresses but will also allow the most garbage through.', 'event_espresso'); ?></li>
 <li>
-	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).','event_espresso'); ?></li>
+	<?php _e('"WordPress Default" - uses built in WordPress email validation, but does not support unicode characters (ie: international characters from non-latin based languages).', 'event_espresso'); ?></li>
 <li>
 	<?php _e('"International" - supports unicode characters but may not be supported by all server configurations. Try this first if you need to international language support, but drop back down to "Basic" if your server configuration conflicts.', 'event_espresso'); ?>
 </li>

caffeinated/admin/extend/about/templates/whats_new.template.php

Spacing +9 added lines, -9 removed lines

@@ -1,25 +1,25 @@
 <div class="changelog point-releases">
-	<!-- <h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3> -->
-	<h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>
+	<!-- <h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3> -->
+	<h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>
 	<?php //$type = 'minor'; ?>
 	<?php $type = 'major'; ?>
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
 		<?php
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
-			array_pop( $ver );
-			$ver = implode( '.', $ver );
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
+			array_pop($ver);
+			$ver = implode('.', $ver);
 		?>
-		<?php printf( __( 'For more information, see <a href="%s" target="_blank">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
+		<?php printf(__('For more information, see <a href="%s" target="_blank">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
  	</p>
 </div>
 
 <div class="changelog">
 	<?php
 	//maintenance mode on?
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
 		?>
 		<div class="ee-attention">
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
 			<p>
 			<?php
 				printf(

core/libraries/batch/JobHandlerBaseClasses/JobHandlerFile.php

Spacing +22 added lines, -22 removed lines

@@ -16,8 +16,8 @@ 
 
 use EventEspressoBatchRequest\Helpers\BatchRequestException;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -39,8 +39,8 @@ 
 	 *
 	 * @param \EEHI_File|null $file_helper
 	 */
-	public function __construct( \EEHI_File $file_helper = null ) {
-		if( ! $file_helper ) {
+	public function __construct(\EEHI_File $file_helper = null) {
+		if ( ! $file_helper) {
 			$this->_file_helper = new \EEH_File();
 		}
 	}
@@ -56,39 +56,39 @@ 
 	 * @return string
 	 * @throws \EventEspressoBatchRequest\Helpers\BatchRequestException
 	 */
-	public function create_file_from_job_with_name( $job_id, $filename, $filetype = 'application/ms-excel' ) {
+	public function create_file_from_job_with_name($job_id, $filename, $filetype = 'application/ms-excel') {
 		$filepath = '';
-		try{
+		try {
 			$base_folder = $this->get_base_folder();
 			$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-				$base_folder . JobHandlerFile::temp_folder_name
+				$base_folder.JobHandlerFile::temp_folder_name
 			);
-			if ( $success ) {
+			if ($success) {
 				$success = $this->_file_helper->ensure_folder_exists_and_is_writable(
-					$base_folder . JobHandlerFile::temp_folder_name . DS . $job_id
+					$base_folder.JobHandlerFile::temp_folder_name.DS.$job_id
 				);
 			}
-			if( $success ) {
-				$filepath = $base_folder . JobHandlerFile::temp_folder_name . DS . $job_id . DS. $filename;
-				$success = $this->_file_helper->ensure_file_exists_and_is_writable( $filepath );
+			if ($success) {
+				$filepath = $base_folder.JobHandlerFile::temp_folder_name.DS.$job_id.DS.$filename;
+				$success = $this->_file_helper->ensure_file_exists_and_is_writable($filepath);
 			}
 			//let's add the .htaccess file so safari will open the file properly
-			if( $success ) {
-				$extension = \EEH_File::get_file_extension( $filepath );
+			if ($success) {
+				$extension = \EEH_File::get_file_extension($filepath);
 				\EEH_File::write_to_file(
-					$base_folder . JobHandlerFile::temp_folder_name . DS . $job_id . DS . '.htaccess',
-					'AddType ' . $filetype . ' ' . $extension,
+					$base_folder.JobHandlerFile::temp_folder_name.DS.$job_id.DS.'.htaccess',
+					'AddType '.$filetype.' '.$extension,
 					'.htaccess'
 				);
 			}
 			//those methods normally fail with an exception, but if not, let's do it
-			if( ! $success ) {
-				throw new \EE_Error( __( 'Could not create temporary file, an unknown error occurred', 'event_espresso' ) );
+			if ( ! $success) {
+				throw new \EE_Error(__('Could not create temporary file, an unknown error occurred', 'event_espresso'));
 			}
-		} catch( \EE_Error $e ) {
+		} catch (\EE_Error $e) {
 			throw new BatchRequestException(
 				sprintf(
-					__( 'Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso' ),
+					__('Could not create temporary file for job %1$s, because: %2$s ', 'event_espresso'),
 					$job_id,
 					$e->getMessage()
 				),
@@ -104,8 +104,8 @@ 
 	 * @param string $filepath
 	 * @return string url to file
 	 */
-	public function get_url_to_file( $filepath ) {
-		return str_replace( $this->get_base_folder(), $this->get_base_url(), $filepath );
+	public function get_url_to_file($filepath) {
+		return str_replace($this->get_base_folder(), $this->get_base_url(), $filepath);
 	}
 	
 	/**

shortcodes/espresso_thank_you/templates/thank-you-page-overview.template.php

Spacing +6 added lines, -6 removed lines

@@ -3,13 +3,13 @@ 
 /** @var boolean $revisit */
 /** @var string $order_conf_desc */
 
-do_action( 'AHEE__thank_you_page_overview_template__top', $transaction );
+do_action('AHEE__thank_you_page_overview_template__top', $transaction);
 
 ?>
 
 <div id="espresso-thank-you-page-overview-dv" class="width-100" >
 
-	<?php if ( ! $revisit ) : ?>
+	<?php if ( ! $revisit) : ?>
 	<div class="ee-attention">
 		<div class="extra-padding-sides">
 			<?php echo apply_filters(
@@ -21,10 +21,10 @@ 
 					'<br />'
 				)
 			);
-			if ( ! empty( $TXN_receipt_url )) : ?>
+			if ( ! empty($TXN_receipt_url)) : ?>
 			<br/>
 			<div class="jst-rght">
-				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url;?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters( 'FHEE__thank_you_page_overview_template__order_conf_button_text', __( 'View Full Order Confirmation Receipt', 'event_espresso' )); ?></a>
+				<a class="ee-button ee-roundish indented-text big-text" href="<?php echo $TXN_receipt_url; ?>"><span class="ee-icon ee-icon-PDF-file-type"></span><?php echo apply_filters('FHEE__thank_you_page_overview_template__order_conf_button_text', __('View Full Order Confirmation Receipt', 'event_espresso')); ?></a>
 			</div>
 			<?php endif; ?>
 		</div>
@@ -33,9 +33,9 @@ 
 	<?php endif; ?>
 	<br/>
 
-	<?php  do_action( 'AHEE__thank_you_page_overview_template__content', $transaction ); ?>
+	<?php  do_action('AHEE__thank_you_page_overview_template__content', $transaction); ?>
 
 </div>
 <!-- end of espresso-thank-you-page-overview-dv -->
 
-<?php  do_action( 'AHEE__thank_you_page_overview_template__bottom', $transaction ); ?>
+<?php  do_action('AHEE__thank_you_page_overview_template__bottom', $transaction); ?>

core/business/EE_Transaction_Payments.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -161,7 +161,7 @@
 	 * @param EE_Transaction $transaction
 	 * @param string         $payment_status One of EEM_Payment's statuses, like 'PAP' (Approved).
 	 *                                       By default, searches for approved payments
-	 * @return float|false   float on success, false on fail
+	 * @return double   float on success, false on fail
 	 * @throws \EE_Error
 	 */
 	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {

Indentation +2 added lines, -2 removed lines

@@ -233,8 +233,8 @@
 					if ( $registration instanceof EE_Registration ) {
 						$registration->set_paid( $registration->paid() - $amount_paid );
 						if ($registration->save() !== false) {
-						    $registration_payment->delete_permanently();
-                            $save_payment = true;
+							$registration_payment->delete_permanently();
+							$save_payment = true;
 						}
 					} else {
 						EE_Error::add_error(

Spacing +43 added lines, -43 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_Payments
@@ -42,7 +42,7 @@ 
 	 */
 	public static function instance() {
 		// check if class object is instantiated
-		if ( ! self::$_instance instanceof EE_Transaction_Payments ) {
+		if ( ! self::$_instance instanceof EE_Transaction_Payments) {
 			self::$_instance = new self();
 		}
 		return self::$_instance;
@@ -59,18 +59,18 @@ 
 	 * @return bool true if TXN total was updated, false if not
 	 * @throws \EE_Error
 	 */
-	public function recalculate_transaction_total( EE_Transaction $transaction, $update_txn = true ) {
+	public function recalculate_transaction_total(EE_Transaction $transaction, $update_txn = true) {
 		$total_line_item = $transaction->total_line_item();
-		if ( ! $total_line_item instanceof EE_Line_Item ) {
+		if ( ! $total_line_item instanceof EE_Line_Item) {
 			EE_Error::add_error(
-				sprintf( __( 'The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso' ), $transaction->ID() ),
+				sprintf(__('The Total Line Item for Transaction %1$d\'s was not found or is invalid.', 'event_espresso'), $transaction->ID()),
 				__FILE__, __FUNCTION__, __LINE__
 			);
 			return false;
 		}
 		$new_total = $total_line_item->recalculate_total_including_taxes();
-		$transaction->set_total( $new_total );
-		if ( $update_txn ) {
+		$transaction->set_total($new_total);
+		if ($update_txn) {
 			return $transaction->save() ? true : false;
 		}
 		return false;
@@ -93,20 +93,20 @@ 
 	 * @return    boolean        whether the TXN was saved
 	 * @throws \EE_Error
 	 */
-	public function calculate_total_payments_and_update_status( EE_Transaction $transaction, $update_txn = true ){
+	public function calculate_total_payments_and_update_status(EE_Transaction $transaction, $update_txn = true) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// calculate total paid
-		$total_paid = $this->recalculate_total_payments_for_transaction( $transaction );
+		$total_paid = $this->recalculate_total_payments_for_transaction($transaction);
 		// if total paid has changed
-		if ( $total_paid !== false && (float)$total_paid !== $transaction->paid() ) {
-			$transaction->set_paid( $total_paid );
+		if ($total_paid !== false && (float) $total_paid !== $transaction->paid()) {
+			$transaction->set_paid($total_paid);
 			// maybe update status, and make sure to save transaction if not done already
-			if ( ! $transaction->update_status_based_on_total_paid( $update_txn ) ) {
-				if ( $update_txn ) {
+			if ( ! $transaction->update_status_based_on_total_paid($update_txn)) {
+				if ($update_txn) {
 					return $transaction->save() ? true : false;
 				}
 			} else {
@@ -130,18 +130,18 @@ 
 	 * @return float|false   float on success, false on fail
 	 * @throws \EE_Error
 	 */
-	public function recalculate_total_payments_for_transaction( EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved ) {
+	public function recalculate_total_payments_for_transaction(EE_Transaction $transaction, $payment_status = EEM_Payment::status_id_approved) {
 		// verify transaction
-		if ( ! $transaction instanceof EE_Transaction ) {
-			EE_Error::add_error( __( 'Please provide a valid EE_Transaction object.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $transaction instanceof EE_Transaction) {
+			EE_Error::add_error(__('Please provide a valid EE_Transaction object.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		// ensure Payment model is loaded
-		EE_Registry::instance()->load_model( 'Payment' );
+		EE_Registry::instance()->load_model('Payment');
 		// calls EEM_Base::sum()
 		return EEM_Payment::instance()->sum(
 			// query params
-			array( array( 'TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status )),
+			array(array('TXN_ID' => $transaction->ID(), 'STS_ID' => $payment_status)),
 			// field to sum
 			'PAY_amount'
 		);
@@ -159,17 +159,17 @@ 
 	 * @return boolean
 	 * @throws \EE_Error
 	 */
-	public function delete_payment_and_update_transaction( EE_Payment $payment ) {
+	public function delete_payment_and_update_transaction(EE_Payment $payment) {
 		// verify payment
-		if ( ! $payment instanceof EE_Payment ) {
-			EE_Error::add_error( __( 'A valid Payment object was not received.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment instanceof EE_Payment) {
+			EE_Error::add_error(__('A valid Payment object was not received.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
-		if ( ! $this->delete_registration_payments_and_update_registrations( $payment ) ) {
+		if ( ! $this->delete_registration_payments_and_update_registrations($payment)) {
 			return false;
 		}
-		if ( ! $payment->delete() ) {
-			EE_Error::add_error( __( 'The payment could not be deleted.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $payment->delete()) {
+			EE_Error::add_error(__('The payment could not be deleted.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 
@@ -180,14 +180,14 @@ 
 			|| $TXN_status === EEM_Transaction::failed_status_code
 			|| $payment->amount() === 0
 		) {
-			EE_Error::add_success( __( 'The Payment was successfully deleted.', 'event_espresso' ) );
+			EE_Error::add_success(__('The Payment was successfully deleted.', 'event_espresso'));
 			return true;
 		}
 
 
 		//if this fails, that just means that the transaction didn't get its status changed and/or updated.
 		//however the payment was still deleted.
-		if ( ! $this->calculate_total_payments_and_update_status( $transaction ) ) {
+		if ( ! $this->calculate_total_payments_and_update_status($transaction)) {
 
 			EE_Error::add_attention(
 				__(
@@ -221,17 +221,17 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	public function delete_registration_payments_and_update_registrations( EE_Payment $payment, $reg_payment_query_params = array() ) {
+	public function delete_registration_payments_and_update_registrations(EE_Payment $payment, $reg_payment_query_params = array()) {
 		$save_payment = false;
-		$reg_payment_query_params = ! empty( $reg_payment_query_params ) ? $reg_payment_query_params : array( array( 'PAY_ID' => $payment->ID() ) );
-		$registration_payments = EEM_Registration_Payment::instance()->get_all( $reg_payment_query_params );
-		if ( ! empty( $registration_payments )) {
-			foreach ( $registration_payments as $registration_payment ) {
-				if ( $registration_payment instanceof EE_Registration_Payment ) {
+		$reg_payment_query_params = ! empty($reg_payment_query_params) ? $reg_payment_query_params : array(array('PAY_ID' => $payment->ID()));
+		$registration_payments = EEM_Registration_Payment::instance()->get_all($reg_payment_query_params);
+		if ( ! empty($registration_payments)) {
+			foreach ($registration_payments as $registration_payment) {
+				if ($registration_payment instanceof EE_Registration_Payment) {
 					$amount_paid = $registration_payment->amount();
 					$registration = $registration_payment->registration();
-					if ( $registration instanceof EE_Registration ) {
-						$registration->set_paid( $registration->paid() - $amount_paid );
+					if ($registration instanceof EE_Registration) {
+						$registration->set_paid($registration->paid() - $amount_paid);
 						if ($registration->save() !== false) {
 						    $registration_payment->delete_permanently();
                             $save_payment = true;
@@ -239,7 +239,7 @@ 
 					} else {
 						EE_Error::add_error(
 							sprintf(
-								__( 'An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso' ),
+								__('An invalid Registration object was associated with Registration Payment ID# %1$d.', 'event_espresso'),
 								$registration_payment->ID()
 							),
 							__FILE__, __FUNCTION__, __LINE__
@@ -249,7 +249,7 @@ 
 				} else {
 					EE_Error::add_error(
 						sprintf(
-							__( 'An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso' ),
+							__('An invalid Registration Payment object was associated with payment ID# %1$d.', 'event_espresso'),
 							$payment->ID()
 						),
 						__FILE__, __FUNCTION__, __LINE__
@@ -258,7 +258,7 @@ 
 				}
 			}
 		}
-		if ( $save_payment ) {
+		if ($save_payment) {
 			$payment->save();
 		}
 		return true;
@@ -282,7 +282,7 @@ 
 	public function update_transaction_status_based_on_total_paid(EE_Transaction $transaction, $update_txn = true)
 	{
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
+			__CLASS__.'::'.__FUNCTION__,
 			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'),
 				'EE_Transaction::update_status_based_on_total_paid()'),
 			'4.9.1',
@@ -324,7 +324,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $old_txn_status
 	 */
-	public function set_old_txn_status( $old_txn_status ) {
+	public function set_old_txn_status($old_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(
@@ -334,7 +334,7 @@ 
 			'4.9.12'
 		);
 		// only set the first time
-		if ( $this->_old_txn_status === null ) {
+		if ($this->_old_txn_status === null) {
 			$this->_old_txn_status = $old_txn_status;
 		}
 	}
@@ -363,7 +363,7 @@ 
 	 * @deprecated 4.9.12
 	 * @param string $new_txn_status
 	 */
-	public function set_new_txn_status( $new_txn_status ) {
+	public function set_new_txn_status($new_txn_status) {
 		EE_Error::doing_it_wrong(
 			__METHOD__,
 			esc_html__(

core/db_classes/EE_Question.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
 	 * Adds an option for this question. Note: if the option were previously associated with a different
 	 * Question, that relationship will be overwritten.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function add_option( EE_Question_Option $option ) {
 		return $this->_add_relation_to( $option, 'Question_Option' );
@@ -392,7 +392,7 @@ 
 	/**
 	 * Marks the option as deleted.
 	 * @param EE_Question_Option $option
-	 * @return boolean success
+	 * @return EE_Base_Class success
 	 */
 	public function remove_option( EE_Question_Option $option ) {
 		return $this->_remove_relation_to( $option, 'Question_Option' );

Indentation +19 added lines, -19 removed lines

@@ -445,8 +445,8 @@ 
 		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
 		$new_question->set_system_ID( null );
 		$new_question->set_wp_user( get_current_user_id() );
-                //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+				//if we're duplicating a trashed question, assume we don't want the new one to be trashed
+				$new_question->set_deleted( false );
 		$success = $new_question->save();
 		if( $success ) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
@@ -501,8 +501,8 @@ 
 		}
 		// has this question been answered ?
 		if ( $answer instanceof EE_Answer
-             && $answer->value() !== ''
-        ) {
+			 && $answer->value() !== ''
+		) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because the form input's display strategy may call esc_attr too
 			//which also does html special characters
@@ -516,10 +516,10 @@ 
 		}
 		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
 		if( in_array(
-		    $this->type(),
-            EEM_Question::instance()->questionTypesWithMaxLength(),
-            true
-        ) ) {
+			$this->type(),
+			EEM_Question::instance()->questionTypesWithMaxLength(),
+			true
+		) ) {
 			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
 				null,
 				min( $max_max_for_question, $this->max() )
@@ -632,17 +632,17 @@ 
 
 
 
-    /**
-     * Returns whether or not this question type should have question option entries
-     * @return bool
-     */
+	/**
+	 * Returns whether or not this question type should have question option entries
+	 * @return bool
+	 */
 	public function should_have_question_options()
-    {
-        return in_array(
-            $this->type(),
-            $this->_model->question_types_with_options(),
-            true
-        );
-    }
+	{
+		return in_array(
+			$this->type(),
+			$this->_model->question_types_with_options(),
+			true
+		);
+	}
 
 }

Spacing +111 added lines, -111 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -37,9 +37,9 @@ 
 	 *                             		    date_format and the second value is the time format
 	 * @return EE_Question
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
 	}
 
 
@@ -50,8 +50,8 @@ 
 	 *                          		the website will be used.
 	 * @return EE_Question
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -62,8 +62,8 @@ 
 	 * @access        public
 	 * @param string $QST_display_text
 	 */
-	public function set_display_text( $QST_display_text = '' ) {
-		$this->set( 'QST_display_text', $QST_display_text );
+	public function set_display_text($QST_display_text = '') {
+		$this->set('QST_display_text', $QST_display_text);
 	}
 
 
@@ -74,8 +74,8 @@ 
 	 * @access        public
 	 * @param        string $QST_admin_label
 	 */
-	public function set_admin_label( $QST_admin_label = '' ) {
-		$this->set( 'QST_admin_label', $QST_admin_label );
+	public function set_admin_label($QST_admin_label = '') {
+		$this->set('QST_admin_label', $QST_admin_label);
 	}
 
 
@@ -86,8 +86,8 @@ 
 	 * @access        public
 	 * @param        mixed $QST_system
 	 */
-	public function set_system_ID( $QST_system = '' ) {
-		$this->set( 'QST_system', $QST_system );
+	public function set_system_ID($QST_system = '') {
+		$this->set('QST_system', $QST_system);
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @access        public
 	 * @param        string $QST_type
 	 */
-	public function set_question_type( $QST_type = '' ) {
-		$this->set( 'QST_type', $QST_type );
+	public function set_question_type($QST_type = '') {
+		$this->set('QST_type', $QST_type);
 	}
 
 
@@ -110,8 +110,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_required
 	 */
-	public function set_required( $QST_required = FALSE ) {
-		$this->set( 'QST_required', $QST_required );
+	public function set_required($QST_required = FALSE) {
+		$this->set('QST_required', $QST_required);
 	}
 
 
@@ -122,8 +122,8 @@ 
 	 * @access        public
 	 * @param        string $QST_required_text
 	 */
-	public function set_required_text( $QST_required_text = '' ) {
-		$this->set( 'QST_required_text', $QST_required_text );
+	public function set_required_text($QST_required_text = '') {
+		$this->set('QST_required_text', $QST_required_text);
 	}
 
 
@@ -134,8 +134,8 @@ 
 	 * @access        public
 	 * @param        int $QST_order
 	 */
-	public function set_order( $QST_order = 0 ) {
-		$this->set( 'QST_order', $QST_order );
+	public function set_order($QST_order = 0) {
+		$this->set('QST_order', $QST_order);
 	}
 
 
@@ -146,8 +146,8 @@ 
 	 * @access        public
 	 * @param        bool $QST_admin_only
 	 */
-	public function set_admin_only( $QST_admin_only = FALSE ) {
-		$this->set( 'QST_admin_only', $QST_admin_only );
+	public function set_admin_only($QST_admin_only = FALSE) {
+		$this->set('QST_admin_only', $QST_admin_only);
 	}
 
 
@@ -158,8 +158,8 @@ 
 	 * @access        public
 	 * @param        int $QST_wp_user
 	 */
-	public function set_wp_user( $QST_wp_user = 1 ) {
-		$this->set( 'QST_wp_user', $QST_wp_user );
+	public function set_wp_user($QST_wp_user = 1) {
+		$this->set('QST_wp_user', $QST_wp_user);
 	}
 
 
@@ -175,8 +175,8 @@ 
 	 * @access        public
 	 * @param 	bool $QST_deleted
 	 */
-	public function set_deleted( $QST_deleted = FALSE ) {
-		$this->set( 'QST_deleted', $QST_deleted );
+	public function set_deleted($QST_deleted = FALSE) {
+		$this->set('QST_deleted', $QST_deleted);
 	}
 
 
@@ -187,7 +187,7 @@ 
 	 * @return string
 	 */
 	public function display_text() {
-		return $this->get( 'QST_display_text' );
+		return $this->get('QST_display_text');
 	}
 
 
@@ -198,7 +198,7 @@ 
 	 * @return string
 	 */
 	public function admin_label() {
-		return $this->get( 'QST_admin_label' );
+		return $this->get('QST_admin_label');
 	}
 
 
@@ -209,7 +209,7 @@ 
 	 * @return string
 	 */
 	public function system_ID() {
-		return $this->get( 'QST_system' );
+		return $this->get('QST_system');
 	}
 
 
@@ -220,7 +220,7 @@ 
 	 * @return boolean
 	 */
 	public function required() {
-		return $this->get( 'QST_required' );
+		return $this->get('QST_required');
 	}
 
 
@@ -232,7 +232,7 @@ 
 	 * @return string
 	 */
 	public function required_text() {
-		return $this->get( 'QST_required_text' );
+		return $this->get('QST_required_text');
 	}
 
 
@@ -243,7 +243,7 @@ 
 	 * @return string
 	 */
 	public function type() {
-		return $this->get( 'QST_type' );
+		return $this->get('QST_type');
 	}
 
 
@@ -255,7 +255,7 @@ 
 	 * @return int
 	 */
 	public function order() {
-		return $this->get( 'QST_order' );
+		return $this->get('QST_order');
 	}
 
 
@@ -267,7 +267,7 @@ 
 	 * @return boolean
 	 */
 	public function admin_only() {
-		return $this->get( 'QST_admin_only' );
+		return $this->get('QST_admin_only');
 	}
 
 
@@ -278,7 +278,7 @@ 
 	 * @return int
 	 */
 	public function wp_user() {
-		return $this->get( 'QST_wp_user' );
+		return $this->get('QST_wp_user');
 	}
 
 
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function deleted() {
-		return $this->get( 'QST_deleted' );
+		return $this->get('QST_deleted');
 	}
 
 
@@ -299,7 +299,7 @@ 
 	 * @return EE_Answer[]
 	 */
 	public function answers() {
-		return $this->get_many_related( 'Answer' );
+		return $this->get_many_related('Answer');
 	}
 
 
@@ -309,7 +309,7 @@ 
 	 * @return boolean true = has answers, false = no answers.
 	 */
 	public function has_answers() {
-		return $this->count_related( 'Answer' ) > 0 ? TRUE : FALSE;
+		return $this->count_related('Answer') > 0 ? TRUE : FALSE;
 	}
 
 
@@ -319,7 +319,7 @@ 
 	 * @return EE_Question_Group[]
 	 */
 	public function question_groups() {
-		return $this->get_many_related( 'Question_Group' );
+		return $this->get_many_related('Question_Group');
 	}
 
 
@@ -333,24 +333,24 @@ 
 	 *                                                       whether it was trashed or not.
 	 * @return EE_Question_Option[]
 	 */
-	public function options( $notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL ) {
-		if ( ! $this->ID() ) {
+	public function options($notDeletedOptionsOnly = TRUE, $selected_value_to_always_include = NULL) {
+		if ( ! $this->ID()) {
 			return array();
 		}
 		$query_params = array();
-		if ( $selected_value_to_always_include ) {
-			if ( is_array( $selected_value_to_always_include ) ) {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = array( 'IN', $selected_value_to_always_include );
+		if ($selected_value_to_always_include) {
+			if (is_array($selected_value_to_always_include)) {
+				$query_params[0]['OR*options-query']['QSO_value'] = array('IN', $selected_value_to_always_include);
 			} else {
-				$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_value' ] = $selected_value_to_always_include;
+				$query_params[0]['OR*options-query']['QSO_value'] = $selected_value_to_always_include;
 			}
 		}
-		if ( $notDeletedOptionsOnly ) {
-			$query_params[ 0 ][ 'OR*options-query' ][ 'QSO_deleted' ] = FALSE;
+		if ($notDeletedOptionsOnly) {
+			$query_params[0]['OR*options-query']['QSO_deleted'] = FALSE;
 		}
 		//order by QSO_order
-		$query_params[ 'order_by' ] = array( 'QSO_order' => 'ASC' );
-		return $this->get_many_related( 'Question_Option', $query_params );
+		$query_params['order_by'] = array('QSO_order' => 'ASC');
+		return $this->get_many_related('Question_Option', $query_params);
 	}
 
 
@@ -360,7 +360,7 @@ 
 	 * @return \EE_Question_Option[]
 	 */
 	public function temp_options() {
-		return $this->_model_relations[ 'Question_Option' ];
+		return $this->_model_relations['Question_Option'];
 	}
 
 
@@ -371,8 +371,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_option( EE_Question_Option $option ) {
-		return $this->_add_relation_to( $option, 'Question_Option' );
+	public function add_option(EE_Question_Option $option) {
+		return $this->_add_relation_to($option, 'Question_Option');
 	}
 
 
@@ -382,8 +382,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function add_temp_option( EE_Question_Option $option ) {
-		$this->_model_relations[ 'Question_Option' ][ ] = $option;
+	public function add_temp_option(EE_Question_Option $option) {
+		$this->_model_relations['Question_Option'][] = $option;
 		return TRUE;
 	}
 
@@ -394,8 +394,8 @@ 
 	 * @param EE_Question_Option $option
 	 * @return boolean success
 	 */
-	public function remove_option( EE_Question_Option $option ) {
-		return $this->_remove_relation_to( $option, 'Question_Option' );
+	public function remove_option(EE_Question_Option $option) {
+		return $this->_remove_relation_to($option, 'Question_Option');
 	}
 
 
@@ -404,8 +404,8 @@ 
 	 * @return bool
 	 */
 	public function is_system_question() {
-		$system_ID = $this->get( 'QST_system' );
-		return ! empty( $system_ID ) ? TRUE : FALSE;
+		$system_ID = $this->get('QST_system');
+		return ! empty($system_ID) ? TRUE : FALSE;
 	}
 
 
@@ -418,8 +418,8 @@ 
 	 */
 	public function set_order_to_latest() {
 		$latest_order = $this->get_model()->get_latest_question_order();
-		$latest_order ++;
-		$this->set( 'QST_order', $latest_order );
+		$latest_order++;
+		$this->set('QST_order', $latest_order);
 	}
 
 
@@ -438,20 +438,20 @@ 
 	 * Duplicates this question and its question options
 	 * @return \EE_Question
 	 */
-	public function duplicate( $options = array() ) {
+	public function duplicate($options = array()) {
 		$new_question = clone $this;
-		$new_question->set( 'QST_ID', null );
-		$new_question->set_display_text( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->display_text() ) );
-		$new_question->set_admin_label( sprintf( __( '%s **Duplicate**', 'event_espresso' ), $this->admin_label() ) );
-		$new_question->set_system_ID( null );
-		$new_question->set_wp_user( get_current_user_id() );
+		$new_question->set('QST_ID', null);
+		$new_question->set_display_text(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->display_text()));
+		$new_question->set_admin_label(sprintf(__('%s **Duplicate**', 'event_espresso'), $this->admin_label()));
+		$new_question->set_system_ID(null);
+		$new_question->set_wp_user(get_current_user_id());
                 //if we're duplicating a trashed question, assume we don't want the new one to be trashed
-                $new_question->set_deleted( false );
+                $new_question->set_deleted(false);
 		$success = $new_question->save();
-		if( $success ) {
+		if ($success) {
 			//we don't totally want to duplicate the question options, because we want them to be for the NEW question
-			foreach( $this->options() as $question_option ) {
-				$question_option->duplicate( array( 'QST_ID' => $new_question->ID() ) );
+			foreach ($this->options() as $question_option) {
+				$question_option->duplicate(array('QST_ID' => $new_question->ID()));
 			}
 			return $new_question;
 		} else {
@@ -464,7 +464,7 @@ 
 	 * @return int|float
 	 */
 	public function max() {
-		return $this->get( 'QST_max' );
+		return $this->get('QST_max');
 	}
 
 	/**
@@ -472,8 +472,8 @@ 
 	 * @param int|float $new_max
 	 * @return void
 	 */
-	public function set_max( $new_max ) {
-		$this->set( 'QST_max', $new_max );
+	public function set_max($new_max) {
+		$this->set('QST_max', $new_max);
 	}
 
 
@@ -485,7 +485,7 @@ 
 	 * @param array $input_constructor_args
 	 * @return EE_Form_Input_Base
 	 */
-	public function generate_form_input( $registration = null, $answer = null, $input_constructor_args = array() ) {
+	public function generate_form_input($registration = null, $answer = null, $input_constructor_args = array()) {
 		$identifier = $this->is_system_question() ? $this->system_ID() : $this->ID();
 
 		$input_constructor_args = array_merge(
@@ -496,33 +496,33 @@ 
 				),
 				$input_constructor_args
 			);
-		if( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration ) {
-			$answer = EEM_Answer::instance()->get_registration_question_answer_object( $registration, $this->ID() );
+		if ( ! $answer instanceof EE_Answer && $registration instanceof EE_Registration) {
+			$answer = EEM_Answer::instance()->get_registration_question_answer_object($registration, $this->ID());
 		}
 		// has this question been answered ?
-		if ( $answer instanceof EE_Answer
+		if ($answer instanceof EE_Answer
              && $answer->value() !== ''
         ) {
 			//answer gets htmlspecialchars called on it, undo that please
 			//because the form input's display strategy may call esc_attr too
 			//which also does html special characters
 			$values_with_html_special_chars = $answer->value();
-			if( is_array( $values_with_html_special_chars ) ) {
-				$default_value = array_map( 'htmlspecialchars_decode', $values_with_html_special_chars );
+			if (is_array($values_with_html_special_chars)) {
+				$default_value = array_map('htmlspecialchars_decode', $values_with_html_special_chars);
 			} else {
-				$default_value = htmlspecialchars_decode( $values_with_html_special_chars );
+				$default_value = htmlspecialchars_decode($values_with_html_special_chars);
 			}
 			$input_constructor_args['default'] = $default_value;
 		}
-		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question( $this->system_ID() );
-		if( in_array(
+		$max_max_for_question = EEM_Question::instance()->absolute_max_for_system_question($this->system_ID());
+		if (in_array(
 		    $this->type(),
             EEM_Question::instance()->questionTypesWithMaxLength(),
             true
-        ) ) {
-			$input_constructor_args[ 'validation_strategies' ][] = new EE_Max_Length_Validation_Strategy(
+        )) {
+			$input_constructor_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
 				null,
-				min( $max_max_for_question, $this->max() )
+				min($max_max_for_question, $this->max())
 			);
 		}
 		$input_constructor_args = apply_filters(
@@ -534,22 +534,22 @@ 
 		);
 
 		$result = null;
-		switch ( $this->type() ) {
+		switch ($this->type()) {
 			// Text
 			case EEM_Question::QST_type_text :
-				$result = new EE_Text_Input( $input_constructor_args );
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			// Textarea
 			case EEM_Question::QST_type_textarea :
-				$result = new EE_Text_Area_Input( $input_constructor_args );
+				$result = new EE_Text_Area_Input($input_constructor_args);
 				break;
 			// Radio Buttons
 			case EEM_Question::QST_type_radio :
-				$result = new EE_Radio_Button_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Radio_Button_Input($this->options(), $input_constructor_args);
 				break;
 			// Dropdown
 			case EEM_Question::QST_type_dropdown :
-				$result = new EE_Select_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Input($this->options(), $input_constructor_args);
 				break;
 			// State Dropdown
 			case EEM_Question::QST_type_state :
@@ -560,7 +560,7 @@ 
 					$registration,
 					$answer
 				);				
-				$result = new EE_State_Select_Input( $state_options, $input_constructor_args );
+				$result = new EE_State_Select_Input($state_options, $input_constructor_args);
 				break;
 			// Country Dropdown
 			case EEM_Question::QST_type_country :
@@ -571,47 +571,47 @@ 
 					$registration,
 					$answer
 				);
-				$result = new EE_Country_Select_Input( $country_options, $input_constructor_args );
+				$result = new EE_Country_Select_Input($country_options, $input_constructor_args);
 				break;
 			// Checkboxes
 			case EEM_Question::QST_type_checkbox :
-				$result = new EE_Checkbox_Multi_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Checkbox_Multi_Input($this->options(), $input_constructor_args);
 				break;
 			// Date
 			case EEM_Question::QST_type_date :
-				$result = new EE_Datepicker_Input( $input_constructor_args );
+				$result = new EE_Datepicker_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_html_textarea :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_Simple_HTML_Validation_Strategy();
-				$result =  new EE_Text_Area_Input( $input_constructor_args );
-				$result->remove_validation_strategy( 'EE_Plaintext_Validation_Strategy' );
+				$input_constructor_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+				$result = new EE_Text_Area_Input($input_constructor_args);
+				$result->remove_validation_strategy('EE_Plaintext_Validation_Strategy');
 				break;
 			case EEM_Question::QST_type_email :
-				$result = new EE_Email_Input( $input_constructor_args );
+				$result = new EE_Email_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_us_phone :
-				$result = new EE_Phone_Input( $input_constructor_args );
+				$result = new EE_Phone_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_int :
-				$result = new EE_Integer_Input( $input_constructor_args );
+				$result = new EE_Integer_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_decimal :
-				$result = new EE_Float_Input( $input_constructor_args );
+				$result = new EE_Float_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_url :
-				$input_constructor_args[ 'validation_strategies' ][] = new EE_URL_Validation_Strategy();
-				$result = new EE_Text_Input( $input_constructor_args );
+				$input_constructor_args['validation_strategies'][] = new EE_URL_Validation_Strategy();
+				$result = new EE_Text_Input($input_constructor_args);
 				break;
 			case EEM_Question::QST_type_year :
 				$result = new EE_Year_Input(
 						$input_constructor_args,
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this ),
-						apply_filters( 'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this )
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit', true, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range', 100, $this),
+						apply_filters('FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range', 100, $this)
 						);
 				break;
 			case EEM_Question::QST_type_multi_select :
-				$result = new EE_Select_Multiple_Input( $this->options(), $input_constructor_args );
+				$result = new EE_Select_Multiple_Input($this->options(), $input_constructor_args);
 				break;
 			// fallback
 			default :
@@ -622,12 +622,12 @@ 
 					$this,
 					$input_constructor_args
 				);
-				if( ! $default_input ){
-					$default_input = new EE_Text_Input( $input_constructor_args );
+				if ( ! $default_input) {
+					$default_input = new EE_Text_Input($input_constructor_args);
 				}
 				$result = $default_input;
 		}
-		return apply_filters( 'FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer );
+		return apply_filters('FHEE__EE_Question__generate_form_input__return', $result, $registration, $this, $answer);
 	}