eventespresso / event-espresso-core

core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.template.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * This is the template for the "Number Bubbles" Progress Steps
@@ -14,13 +14,13 @@ 
 <!-- progress step display -->
 <div class="ee-progress-step-main-container">
 	<div class="progress-step-container number-bubbles-container">
-		<?php foreach ( $progress_steps as $progress_step ) : ?>
-		<div data-step-nmbr="<?php echo $progress_step->order();?>" id="progress-step-<?php echo $progress_step->id(); ?>" class="progress-step-number <?php echo $progress_step->htmlClass(); ?>">
+		<?php foreach ($progress_steps as $progress_step) : ?>
+		<div data-step-nmbr="<?php echo $progress_step->order(); ?>" id="progress-step-<?php echo $progress_step->id(); ?>" class="progress-step-number <?php echo $progress_step->htmlClass(); ?>">
 			<div class="progress-step-line"></div>
 			<div class="progress-step-bubble"><p><?php echo $progress_step->order(); ?></p></div>
 			<span class="progress-step-text"><?php echo $progress_step->text(); ?></span>
 		</div>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</div>
 </div>
 

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

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
  * @since               	4.6
  *
  */
-abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base{
+abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base {
 	/**
 	 * returns HTML and javascript related to the displaying of this input
 	 * @return string
@@ -24,10 +24,10 @@ 
 	 * @param string $chars - exact string of characters to remove
 	 * @return string
 	 */
-	protected function _remove_chars( $string = '', $chars = '-' ) {
-		$char_length = strlen( $chars ) * -1;
+	protected function _remove_chars($string = '', $chars = '-') {
+		$char_length = strlen($chars) * -1;
 		// if last three characters of string is  " - ", then remove it
-		return substr( $string, $char_length ) === $chars ? substr( $string, 0, $char_length ) : $string;
+		return substr($string, $char_length) === $chars ? substr($string, 0, $char_length) : $string;
 	}
 
 
@@ -39,16 +39,16 @@ 
 	 * @param string $chars - exact string of characters to be added to end of string
 	 * @return string
 	 */
-	protected function _append_chars( $string = '', $chars = '-' ) {
-		return  $this->_remove_chars( $string, $chars ) . $chars;
+	protected function _append_chars($string = '', $chars = '-') {
+		return  $this->_remove_chars($string, $chars).$chars;
 	}
 	
 	/**
 	 * Gets the HTML IDs of all the inputs
 	 * @return array
 	 */
-	public function get_html_input_ids( $add_pound_sign = false ) {
-		return array( $this->get_input()->html_id( $add_pound_sign ) );
+	public function get_html_input_ids($add_pound_sign = false) {
+		return array($this->get_input()->html_id($add_pound_sign));
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 * @param array $other_js_data
 	 * @return array
 	 */
-	public function get_other_js_data( $other_js_data = array() ) {
+	public function get_other_js_data($other_js_data = array()) {
 		return $other_js_data;
 	}
 

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

Spacing +6 added lines, -6 removed lines

@@ -6,20 +6,20 @@
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_Hidden_Input extends EE_Form_Input_Base{
+class EE_Hidden_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $input_settings
 	 */
-	public function __construct($input_settings = array()){
+	public function __construct($input_settings = array()) {
 		//require_once('strategies/display_strategies/EE_Text_Input_Display_Strategy.strategy.php');
 		$this->_set_display_strategy(new EE_Hidden_Display_Strategy());
-		if ( isset( $input_settings['normalization_strategy'] ) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base ) {
-			$this->_set_normalization_strategy( $input_settings['normalization_strategy'] );
+		if (isset($input_settings['normalization_strategy']) && $input_settings['normalization_strategy'] instanceof EE_Normalization_Strategy_Base) {
+			$this->_set_normalization_strategy($input_settings['normalization_strategy']);
 		} else {
-			$this->_set_normalization_strategy( new EE_Text_Normalization() );
+			$this->_set_normalization_strategy(new EE_Text_Normalization());
 		}
-		parent::__construct( $input_settings );
+		parent::__construct($input_settings);
 	}
 
 

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

Spacing +3 added lines, -3 removed lines

@@ -8,15 +8,15 @@
  *
  * This input has a default validation strategy of plaintext (which can be removed after construction)
  */
-class EE_Submit_Input extends EE_Form_Input_Base{
+class EE_Submit_Input extends EE_Form_Input_Base {
 
 	/**
 	 * @param array $options
 	 */
-	public function __construct($options = array()){
+	public function __construct($options = array()) {
 		$this->_set_display_strategy(new EE_Submit_Input_Display_Strategy());
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
 		parent::__construct($options);
 	}
 }
\ No newline at end of file

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

Spacing +7 added lines, -7 removed lines

@@ -9,18 +9,18 @@
  * @package       Event Espresso
  * @author        Mike Nelson
  */
-class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base{
+class EE_Submit_Input_Display_Strategy extends EE_Display_Strategy_Base {
 	/**
 	 *
 	 * @return string of html to display the input
 	 */
-	public function display(){
+	public function display() {
 		$html = '<input type="submit" ';
-		$html .= 'name="' . $this->_input->html_name() . '" ';
-		$html .= 'value="' . $this->_input->raw_value_in_form() . '" ';
-		$html .= 'id="' . $this->_input->html_id() . '-submit" ';
-		$html .= 'class="' . $this->_input->html_class() . ' ' . $this->_input->button_css_attributes() . '" ';
-		$html .= 'style="' . $this->_input->html_style() . '" ';
+		$html .= 'name="'.$this->_input->html_name().'" ';
+		$html .= 'value="'.$this->_input->raw_value_in_form().'" ';
+		$html .= 'id="'.$this->_input->html_id().'-submit" ';
+		$html .= 'class="'.$this->_input->html_class().' '.$this->_input->button_css_attributes().'" ';
+		$html .= 'style="'.$this->_input->html_style().'" ';
 		$html .= $this->_input->other_html_attributes();
 		$html .= '/>';
 		return $html;

core/db_classes/EE_Line_Item.class.php

Braces +3 added lines, -3 removed lines

@@ -671,7 +671,7 @@ 
 			if( isset( $this->_children[ $code ] ) ) {
 				unset( $this->_children[ $code ] );
 				return 1;
-			}else{
+			} else{
 				return 0;
 			}
 		}
@@ -1110,10 +1110,10 @@ 
 					//that's taxable too (the taxable total so far)
 					if( $child_line_item->is_percent() ) {
 						$total = $total + ( $total * $child_line_item->percent() / 100 );
-					}else{
+					} else{
 						$total += $child_line_item->total();
 					}
-				}elseif( $child_line_item->type() === EEM_Line_Item::type_sub_total ){
+				} elseif( $child_line_item->type() === EEM_Line_Item::type_sub_total ){
 					$total += $child_line_item->taxable_total();
 				}
 			}

Spacing +209 added lines, -209 removed lines

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

Indentation +52 added lines, -52 removed lines

@@ -172,7 +172,7 @@ 
 	 * Sets quantity
 	 * @param int $quantity
 	 */
-    public function set_quantity( $quantity ) {
+	public function set_quantity( $quantity ) {
 		$this->set( 'LIN_quantity', max( $quantity, 0 ) );
 	}
 
@@ -212,25 +212,25 @@ 
 	 * Gets item_type
 	 * @return string
 	 */
-    public function OBJ_type_i18n() {
-	    $obj_type = $this->OBJ_type();
-        switch ($obj_type) {
-            case 'Event':
-                $obj_type = __('Event', 'event_espresso');
-                break;
-            case 'Price':
-                $obj_type = __('Price', 'event_espresso');
-                break;
-            case 'Promotion':
-                $obj_type = __('Promotion', 'event_espresso');
-                break;
-            case 'Ticket':
-                $obj_type = __('Ticket', 'event_espresso');
-                break;
-            case 'Transaction':
-                $obj_type = __('Transaction', 'event_espresso');
-                break;
-        }
+	public function OBJ_type_i18n() {
+		$obj_type = $this->OBJ_type();
+		switch ($obj_type) {
+			case 'Event':
+				$obj_type = __('Event', 'event_espresso');
+				break;
+			case 'Price':
+				$obj_type = __('Price', 'event_espresso');
+				break;
+			case 'Promotion':
+				$obj_type = __('Promotion', 'event_espresso');
+				break;
+			case 'Ticket':
+				$obj_type = __('Ticket', 'event_espresso');
+				break;
+			case 'Transaction':
+				$obj_type = __('Transaction', 'event_espresso');
+				break;
+		}
 		return apply_filters('FHEE__EE_Line_Item__OBJ_type_i18n', $obj_type, $this);
 	}
 
@@ -1244,48 +1244,48 @@ 
 
 
 
-    /**
-     * @param bool $raw
-     * @return int
-     * @throws \EE_Error
-     */
-    public function timestamp($raw = false)
-    {
-        return $raw ? $this->get_raw('LIN_timestamp') : $this->get('LIN_timestamp');
-    }
+	/**
+	 * @param bool $raw
+	 * @return int
+	 * @throws \EE_Error
+	 */
+	public function timestamp($raw = false)
+	{
+		return $raw ? $this->get_raw('LIN_timestamp') : $this->get('LIN_timestamp');
+	}
 
 
 
 
-    /************************* DEPRECATED *************************/
+	/************************* DEPRECATED *************************/
 
 
 
-    /**
-     * @deprecated 4.6.0
-     * @param string $type one of the constants on EEM_Line_Item
-     * @return EE_Line_Item[]
-     */
-    protected function _get_descendants_of_type($type)
-    {
-        EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()',
-            __('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0');
-        return EEH_Line_Item::get_descendants_of_type($this, $type);
-    }
+	/**
+	 * @deprecated 4.6.0
+	 * @param string $type one of the constants on EEM_Line_Item
+	 * @return EE_Line_Item[]
+	 */
+	protected function _get_descendants_of_type($type)
+	{
+		EE_Error::doing_it_wrong('EE_Line_Item::_get_descendants_of_type()',
+			__('Method replaced with EEH_Line_Item::get_descendants_of_type()', 'event_espresso'), '4.6.0');
+		return EEH_Line_Item::get_descendants_of_type($this, $type);
+	}
 
 
 
-    /**
-     * @deprecated 4.6.0
-     * @param string $type like one of the EEM_Line_Item::type_*
-     * @return EE_Line_Item
-     */
-    public function get_nearest_descendant_of_type($type)
-    {
-        EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()',
-            __('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0');
-        return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
-    }
+	/**
+	 * @deprecated 4.6.0
+	 * @param string $type like one of the EEM_Line_Item::type_*
+	 * @return EE_Line_Item
+	 */
+	public function get_nearest_descendant_of_type($type)
+	{
+		EE_Error::doing_it_wrong('EE_Line_Item::get_nearest_descendant_of_type()',
+			__('Method replaced with EEH_Line_Item::get_nearest_descendant_of_type()', 'event_espresso'), '4.6.0');
+		return EEH_Line_Item::get_nearest_descendant_of_type($this, $type);
+	}
 
 
 

core/services/collections/CollectionInterface.php

Indentation +6 added lines, -6 removed lines

@@ -111,12 +111,12 @@
 	public function previous();
 
 		/**
-	 * Returns the index of a given object, or false if not found
-	 *
-	 * @see http://stackoverflow.com/a/8736013
-	 * @param $object
-	 * @return boolean|int|string
-	 */
+		 * Returns the index of a given object, or false if not found
+		 *
+		 * @see http://stackoverflow.com/a/8736013
+		 * @param $object
+		 * @return boolean|int|string
+		 */
 	public function indexOf( $object );
 
 

Spacing +15 added lines, -15 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace EventEspresso\core\services\collections;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -25,7 +25,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function add( $object, $identifier = null );
+	public function add($object, $identifier = null);
 
 	/**
 	 * setIdentifier
@@ -37,7 +37,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function setIdentifier( $object, $identifier = null );
+	public function setIdentifier($object, $identifier = null);
 
 	/**
 	 * get
@@ -48,7 +48,7 @@ 
 	 * @param mixed $identifier
 	 * @return mixed
 	 */
-	public function get( $identifier );
+	public function get($identifier);
 
 	/**
 	 * has
@@ -60,7 +60,7 @@ 
 	 * @param  mixed $identifier
 	 * @return bool
 	 */
-	public function has( $identifier );
+	public function has($identifier);
 
 	/**
 	 * hasObject
@@ -70,7 +70,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function hasObject( $object );
+	public function hasObject($object);
 
 	/**
 	 * remove
@@ -80,7 +80,7 @@ 
 	 * @param $object
 	 * @return bool
 	 */
-	public function remove( $object );
+	public function remove($object);
 
 	/**
 	 * setCurrent
@@ -90,7 +90,7 @@ 
 	 * @param mixed $identifier
 	 * @return boolean
 	 */
-	public function setCurrent( $identifier ) ;
+	public function setCurrent($identifier);
 
 	/**
 	 * setCurrentUsingObject
@@ -100,7 +100,7 @@ 
 	 * @param $object
 	 * @return boolean
 	 */
-	public function setCurrentUsingObject( $object );
+	public function setCurrentUsingObject($object);
 
 	/**
 	 * Returns the object occupying the index before the current object,
@@ -117,7 +117,7 @@ 
 	 * @param $object
 	 * @return boolean|int|string
 	 */
-	public function indexOf( $object );
+	public function indexOf($object);
 
 
 	/**
@@ -127,7 +127,7 @@ 
 	 * @param $index
 	 * @return mixed
 	 */
-	public function objectAtIndex( $index );
+	public function objectAtIndex($index);
 
 	/**
 	 * Returns the sequence of objects as specified by the offset and length
@@ -137,7 +137,7 @@ 
 	 * @param int $length
 	 * @return array
 	 */
-	public function slice( $offset, $length );
+	public function slice($offset, $length);
 
 	/**
 	 * Inserts an object (or an array of objects) at a certain point
@@ -146,7 +146,7 @@ 
 	 * @param mixed   $objects A single object or an array of objects
 	 * @param integer $index
 	 */
-	public function insertAt( $objects, $index );
+	public function insertAt($objects, $index);
 
 	/**
 	 * Removes the object at the given index
@@ -154,7 +154,7 @@ 
 	 * @see http://stackoverflow.com/a/8736013
 	 * @param integer $index
 	 */
-	public function removeAt( $index ) ;
+	public function removeAt($index);
 
 
 }

caffeinated/payment_methods/Aim/EE_PMT_Aim.pm.php

Spacing +50 added lines, -50 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION')){
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
 	exit('No direct script access allowed');
 }
 /**
@@ -11,7 +11,7 @@ 
  * @subpackage
  * @author				Mike Nelson
  */
-class EE_PMT_Aim extends EE_PMT_Base{
+class EE_PMT_Aim extends EE_PMT_Base {
 
 
 	/**
@@ -34,7 +34,7 @@ 
 		require_once($this->file_folder().'EEG_Aim.gateway.php');
 		$this->_gateway = new EEG_Aim();
 		$this->_pretty_name = __("Authorize.net AIM", 'event_espresso');
-		$this->_default_description = __( 'Please provide the following billing information.', 'event_espresso' );
+		$this->_default_description = __('Please provide the following billing information.', 'event_espresso');
 		$this->_requires_https = true;
 	}
 
@@ -47,61 +47,61 @@ 
 	 * @return EE_Billing_Info_Form
 	 * @throws \EE_Error
 	 */
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
-		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance,array(
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
+		$billing_form = new EE_Billing_Attendee_Info_Form($this->_pm_instance, array(
 			'name'=>'AIM_Form',
 			'subsections'=>array(
 				'credit_card'=>new EE_Credit_Card_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'Card Number', 'event_espresso' )
+					'html_label_text' => __('Card Number', 'event_espresso')
 				)),
 				'exp_month'=>new EE_Credit_Card_Month_Input(true, array(
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Month', 'event_espresso' )
+					'html_label_text' => __('Expiry Month', 'event_espresso')
 				)),
-				'exp_year'=>new EE_Credit_Card_Year_Input( array( 
+				'exp_year'=>new EE_Credit_Card_Year_Input(array( 
 					'required'=>true,
-					'html_label_text' => __( 'Expiry Year', 'event_espresso' ) 
+					'html_label_text' => __('Expiry Year', 'event_espresso') 
 				)),
-				'cvv'=>new EE_CVV_Input( array(
+				'cvv'=>new EE_CVV_Input(array(
 					'required'=>true,
-					'html_label_text' => __( 'CVV', 'event_espresso' ) ) ),
+					'html_label_text' => __('CVV', 'event_espresso') )),
 			)
 		));
-		$billing_form->add_subsections( array(
-			'company' => new EE_Text_Input( array(
+		$billing_form->add_subsections(array(
+			'company' => new EE_Text_Input(array(
 				'html_label_text' => __('Company', 'event_espresso')
 			))
-		), 'email', false );
+		), 'email', false);
 		$billing_form->add_subsections( 
 				array(
-					'fax' => new EE_Text_Input( array(
+					'fax' => new EE_Text_Input(array(
 						'html_label_text' => __('Fax', 'event_espresso')
 					))
 				), 
 				'phone', 
 				false );
 		$settings_form = $this->settings_form();
-		if( $settings_form->get_input( 'excluded_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
-				$billing_form->exclude( $settings_form->get_input( 'excluded_billing_inputs' )->normalized_value() );
+		if ($settings_form->get_input('excluded_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+				$billing_form->exclude($settings_form->get_input('excluded_billing_inputs')->normalized_value());
 		}
-		if( $settings_form->get_input( 'required_billing_inputs' ) instanceof EE_Checkbox_Multi_Input ) {
-			$required_inputs = $settings_form->get_input( 'required_billing_inputs' )->normalized_value();
+		if ($settings_form->get_input('required_billing_inputs') instanceof EE_Checkbox_Multi_Input) {
+			$required_inputs = $settings_form->get_input('required_billing_inputs')->normalized_value();
 			//only change the requirement of inputs which are allowed to be changed
 			/** @var EE_Form_Input_Base[] $inputs_to_evaluate */
 			$inputs_to_evaluate = array_intersect_key( 
 				$billing_form->inputs(), 
 				$this->billing_input_names()
 			);
-			foreach( $inputs_to_evaluate as $input_name => $input ) {
-				if( in_array( $input_name, $required_inputs ) ) {
-					$input->set_required( true );
+			foreach ($inputs_to_evaluate as $input_name => $input) {
+				if (in_array($input_name, $required_inputs)) {
+					$input->set_required(true);
 				} else {
-					$input->set_required( false );
+					$input->set_required(false);
 				}
 			}
 		}
-		return $this->apply_billing_form_debug_settings( $billing_form );
+		return $this->apply_billing_form_debug_settings($billing_form);
 	}
 
 
@@ -114,18 +114,18 @@ 
 	 * @return \EE_Billing_Info_Form
 	 * @throws \EE_Error
 	 */
-	public function apply_billing_form_debug_settings( EE_Billing_Info_Form $billing_form ) {
+	public function apply_billing_form_debug_settings(EE_Billing_Info_Form $billing_form) {
 		if (
 			$this->_pm_instance->debug_mode() 
-			|| $this->_pm_instance->get_extra_meta( 'test_transactions', TRUE, FALSE )
+			|| $this->_pm_instance->get_extra_meta('test_transactions', TRUE, FALSE)
 		) {
-			$billing_form->get_input( 'credit_card' )->set_default( '4007000000027' );
-			$billing_form->get_input( 'exp_year' )->set_default( '2020' );
-			if( $billing_form->get_subsection( 'cvv' ) instanceof EE_Form_Input_Base ) {
-				$billing_form->get_input( 'cvv' )->set_default( '123' );
+			$billing_form->get_input('credit_card')->set_default('4007000000027');
+			$billing_form->get_input('exp_year')->set_default('2020');
+			if ($billing_form->get_subsection('cvv') instanceof EE_Form_Input_Base) {
+				$billing_form->get_input('cvv')->set_default('123');
 			}
 			$billing_form->add_subsections(
-				array( 'fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html() ),
+				array('fyi_about_autofill' => $billing_form->payment_fields_autofilled_notice_html()),
 				'credit_card'
 			);
 			$billing_form->add_subsections(
@@ -153,17 +153,17 @@ 
 				'extra_meta_inputs'=>array(
 					'login_id'=>new EE_Text_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Authorize.net API Login ID %s", "event_espresso"),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Authorize.net API Login ID %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'transaction_key'=>new EE_Text_Input(
 						array(
-							'html_label_text'=> sprintf( __("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link() ),
+							'html_label_text'=> sprintf(__("Authorize.net Transaction Key %s", "event_espresso"), $this->get_help_tab_link()),
 							'required' => true )
 					),
 					'test_transactions'=>new EE_Yes_No_Input(
 						array(
-							'html_label_text'=>  sprintf( __("Send test transactions? %s", 'event_espresso'),  $this->get_help_tab_link() ),
+							'html_label_text'=>  sprintf(__("Send test transactions? %s", 'event_espresso'), $this->get_help_tab_link()),
 							'html_help_text'=>  __("Send test transactions, even to live server", 'event_espresso'),
 							'default' => false,
 							'required' => true
@@ -172,7 +172,7 @@ 
 					'excluded_billing_inputs' => new EE_Checkbox_Multi_Input( 
 							$billing_input_names,
 					array( 
-						'html_label_text' => sprintf( __("Excluded Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+						'html_label_text' => sprintf(__("Excluded Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 						'default' => array(
 							'company',
 							'fax',
@@ -181,10 +181,10 @@ 
 					'required_billing_inputs' => new EE_Checkbox_Multi_Input( 
 						$billing_input_names,
 						array(
-							'html_label_text' => sprintf( __("Required Payment Form Fields %s", 'event_espresso'),  $this->get_help_tab_link() ),
+							'html_label_text' => sprintf(__("Required Payment Form Fields %s", 'event_espresso'), $this->get_help_tab_link()),
 							'default' => array_diff(
-										array_keys( $billing_input_names ),
-										array( 'address2', 'phone', 'company', 'fax' )
+										array_keys($billing_input_names),
+										array('address2', 'phone', 'company', 'fax')
 							),
 							'html_help_text' => __('Note: if fields are excluded they cannot be required.', 'event_espresso')
 						)
@@ -193,14 +193,14 @@ 
 						apply_filters(
 							'FHEE__EE_PMT_Aim__generate_new_settings_form__server_select_input__options',
 							array(
-								'akamai' => __( 'Authorize.net/Akamai (default)', 'event_espresso' ),
-								'authorize.net' => __( 'Authorize.net (deprecated)', 'event_espresso' ),
+								'akamai' => __('Authorize.net/Akamai (default)', 'event_espresso'),
+								'authorize.net' => __('Authorize.net (deprecated)', 'event_espresso'),
 							),
 							$this
 						),
 						array(
-							'html_label_text' => __( 'Server', 'event_espresso' ),
-							'html_help_text' => __( 'The Gateway Server where payment requests will be sent', 'event_espresso' )
+							'html_label_text' => __('Server', 'event_espresso'),
+							'html_help_text' => __('The Gateway Server where payment requests will be sent', 'event_espresso')
 						)
 					)
 						
@@ -216,10 +216,10 @@ 
 	 */
 	public function billing_input_names() {
 		return array(
-			'first_name' => __( 'First Name', 'event_espresso' ),
+			'first_name' => __('First Name', 'event_espresso'),
 			'last_name' => __('Last Name', 'event_espresso'),
-			'email' => __( 'Email', 'event_espresso' ),
-			'company' => __( 'Company', 'event_espresso' ),
+			'email' => __('Email', 'event_espresso'),
+			'company' => __('Company', 'event_espresso'),
 			'address' => __('Address', 'event_espresso'),
 			'address2' => __('Address2', 'event_espresso'),
 			'city' => __('City', 'event_espresso'),
@@ -227,7 +227,7 @@ 
 			'country' => __('Country', 'event_espresso'),
 			'zip' =>  __('Zip', 'event_espresso'),
 			'phone' => __('Phone', 'event_espresso'),
-			'fax' => __( 'Fax', 'event_espresso' ),
+			'fax' => __('Fax', 'event_espresso'),
 			'cvv' => __('CVV', 'event_espresso')
 		);
 	}
@@ -239,10 +239,10 @@ 
 	 * @param EE_Billing_Info_Form $billing_form
 	 * @return array
 	 */
-	protected function _get_billing_values_from_form( $billing_form ){
+	protected function _get_billing_values_from_form($billing_form) {
 		$all_billing_values_empty = array();
-		foreach( array_keys( $this->billing_input_names() ) as $input_name ) {
-			$all_billing_values_empty[ $input_name ] = '';
+		foreach (array_keys($this->billing_input_names()) as $input_name) {
+			$all_billing_values_empty[$input_name] = '';
 		}
 		return array_merge(
 				$all_billing_values_empty,
@@ -257,7 +257,7 @@ 
 	 * @see EE_PMT_Base::help_tabs_config()
 	 * @return array
 	 */
-	public function help_tabs_config(){
+	public function help_tabs_config() {
 		return array(
 			$this->get_help_tab_name() => array(
 				'title' => __('Authorize.net AIM Settings', 'event_espresso'),

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	public function __construct($pm_instance = NULL) {
 		$this->_setup_properties();
 		parent::__construct($pm_instance);
-        $this->_gateway->set_unsupported_character_remover(new \EventEspresso\core\services\formatters\Windows1252());
+		$this->_gateway->set_unsupported_character_remover(new \EventEspresso\core\services\formatters\Windows1252());
 	}
 	
 	/**

core/services/progress_steps/ProgressStepManager.php

Spacing +41 added lines, -41 removed lines

@@ -10,8 +10,8 @@ 
 use EventEspresso\core\services\collections\CollectionInterface;
 use EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface;
 
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 
 
@@ -78,15 +78,15 @@ 
 		CollectionInterface $collection = null,
 		EE_Request $request = null
 	) {
-		$this->setDisplayStrategy( $display_strategy_name );
-		$this->setDefaultStep( $default_step );
-		$this->setFormStepUrlKey( $form_step_url_key );
-		if ( ! $collection instanceof CollectionInterface ) {
-			$collection = new Collection( '\EventEspresso\core\services\progress_steps\ProgressStepInterface' );
+		$this->setDisplayStrategy($display_strategy_name);
+		$this->setDefaultStep($default_step);
+		$this->setFormStepUrlKey($form_step_url_key);
+		if ( ! $collection instanceof CollectionInterface) {
+			$collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
 		}
 		$this->collection = $collection;
-		if ( ! $request instanceof EE_Request ) {
-			$request = \EE_Registry::instance()->load_core( 'Request' );
+		if ( ! $request instanceof EE_Request) {
+			$request = \EE_Registry::instance()->load_core('Request');
 		}
 		$this->request = $request;
 	}
@@ -98,28 +98,28 @@ 
 	 * @throws InvalidDataTypeException
 	 * @throws InvalidClassException
 	 */
-	protected function setDisplayStrategy( $display_strategy_name = 'number_bubbles' ) {
-		if ( ! is_string( $display_strategy_name ) ) {
-			throw new InvalidDataTypeException( '$display_strategy_name', $display_strategy_name, 'string' );
+	protected function setDisplayStrategy($display_strategy_name = 'number_bubbles') {
+		if ( ! is_string($display_strategy_name)) {
+			throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
 		}
 		// build up FQCN from incoming display strategy folder name
 		$display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-		$display_strategy_class .= $display_strategy_name . '\\';
-		$display_strategy_class .= str_replace( ' ', '', ucwords( str_replace( '_', ' ', $display_strategy_name ) ) );
+		$display_strategy_class .= $display_strategy_name.'\\';
+		$display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
 		$display_strategy_class .= 'ProgressStepsDisplay';
 		$display_strategy_class = apply_filters(
 			'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
 			$display_strategy_class
 		);
-		if ( ! class_exists( $display_strategy_class ) ) {
-			throw new InvalidClassException( $display_strategy_class );
+		if ( ! class_exists($display_strategy_class)) {
+			throw new InvalidClassException($display_strategy_class);
 		}
 		$display_strategy = new $display_strategy_class();
-		if ( ! $display_strategy instanceof ProgressStepsDisplayInterface ) {
+		if ( ! $display_strategy instanceof ProgressStepsDisplayInterface) {
 			throw new InvalidClassException(
 				$display_strategy_class,
 				sprintf(
-					__( 'The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso' ),
+					__('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
 					$display_strategy_class,
 					'\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
 				)
@@ -134,9 +134,9 @@ 
 	 * @param string $default_step
 	 * @throws InvalidDataTypeException
 	 */
-	public function setDefaultStep( $default_step ) {
-		if ( ! is_string( $default_step ) ) {
-			throw new InvalidDataTypeException( '$default_step', $default_step, 'string' );
+	public function setDefaultStep($default_step) {
+		if ( ! is_string($default_step)) {
+			throw new InvalidDataTypeException('$default_step', $default_step, 'string');
 		}
 		$this->default_step = $default_step;
 	}
@@ -147,11 +147,11 @@ 
 	 * @param string $form_step_url_key
 	 * @throws InvalidDataTypeException
 	 */
-	public function setFormStepUrlKey( $form_step_url_key = 'ee-form-step' ) {
-		if ( ! is_string( $form_step_url_key ) ) {
-			throw new InvalidDataTypeException( '$form_step_key', $form_step_url_key, 'string' );
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step') {
+		if ( ! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
 		}
-		$this->form_step_url_key = ! empty( $form_step_url_key ) ? $form_step_url_key : 'ee-form-step';
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
 	}
 
 
@@ -160,26 +160,26 @@ 
 	 * @param string $step
 	 * @throws InvalidIdentifierException
 	 */
-	public function setCurrentStep( $step = '' ) {
+	public function setCurrentStep($step = '') {
 		// use incoming value if it's set, otherwise use request param if it's set, otherwise use default
-		$step = ! empty( $step )
+		$step = ! empty($step)
 			? $step
-			: $this->request->get( $this->form_step_url_key, $this->default_step );
+			: $this->request->get($this->form_step_url_key, $this->default_step);
 		// grab the step previously known as current, in case we need to revert
 		$current_current_step = $this->collection->current();
 		// verify that requested step exists
-		if ( ! $this->collection->has( $step ) ) {
-			throw new InvalidIdentifierException( $step, $this->default_step );
+		if ( ! $this->collection->has($step)) {
+			throw new InvalidIdentifierException($step, $this->default_step);
 		}
-		if ( $this->collection->setCurrent( $step ) ) {
+		if ($this->collection->setCurrent($step)) {
 			// if the old boss is the same as the new boss, then nothing changes
-			if ( $this->collection->current() !== $current_current_step ) {
-				$current_current_step->setIsCurrent( false );
+			if ($this->collection->current() !== $current_current_step) {
+				$current_current_step->setIsCurrent(false);
 			}
 			$this->collection->current()->setIsCurrent();
 		} else {
-			$this->collection->setCurrent( $current_current_step->id() );
-			$current_current_step->setIsCurrent( true );
+			$this->collection->setCurrent($current_current_step->id());
+			$current_current_step->setIsCurrent(true);
 		}
 	}
 
@@ -191,14 +191,14 @@ 
 	public function setPreviousStepsCompleted() {
 		$current_current_step = $this->collection->current();
 		$this->collection->rewind();
-		while ( $this->collection->valid() ) {
-			if ( $this->collection->current() === $current_current_step ) {
+		while ($this->collection->valid()) {
+			if ($this->collection->current() === $current_current_step) {
 				break;
 			}
 			$this->setCurrentStepCompleted();
 			$this->collection->next();
 		}
-		$this->collection->setCurrentUsingObject( $current_current_step );
+		$this->collection->setCurrentUsingObject($current_current_step);
 		return false;
 	}
 
@@ -239,7 +239,7 @@ 
 	public function displaySteps() {
 		return \EEH_Template::display_template(
 			$this->display_strategy->getTemplate(),
-			array( 'progress_steps' => $this->collection ),
+			array('progress_steps' => $this->collection),
 			true
 		);
 	}
@@ -250,8 +250,8 @@ 
 	 * @param bool $completed
 	 * @return \EventEspresso\core\services\progress_steps\ProgressStepInterface
 	 */
-	public function setCurrentStepCompleted( $completed = true ) {
-		return $this->collection->current()->setIsCompleted( $completed );
+	public function setCurrentStepCompleted($completed = true) {
+		return $this->collection->current()->setIsCompleted($completed);
 	}
 
 

Unused Use Statements +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 namespace EventEspresso\core\services\progress_steps;
 
 use EE_Request;
-use  EventEspresso\core\exceptions\InvalidClassException;
-use  EventEspresso\core\exceptions\InvalidDataTypeException;
-use  EventEspresso\core\exceptions\InvalidIdentifierException;
-use  EventEspresso\core\exceptions\InvalidInterfaceException;
+use EventEspresso\core\exceptions\InvalidClassException;
+use EventEspresso\core\exceptions\InvalidDataTypeException;
+use EventEspresso\core\exceptions\InvalidIdentifierException;
+use EventEspresso\core\exceptions\InvalidInterfaceException;
 use EventEspresso\core\services\collections\Collection;
 use EventEspresso\core\services\collections\CollectionInterface;
 use EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface;