Completed
Branch BUG-10738-inconsistency-in-ses... (4fb977)
by
unknown
104:46 queued 94:10
created
strategies/validation/EE_Enum_Validation_Strategy.strategy.php 2 patches
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@  discard block
 block discarded – undo
25 25
 		$enum_options = $this->_input->flat_options();
26 26
 		if( $normalized_value === TRUE){
27 27
 			$normalized_value = 1;
28
-		}elseif( $normalized_value === FALSE){
28
+		} elseif( $normalized_value === FALSE){
29 29
 			$normalized_value = 0;
30 30
 		}
31 31
 		if( $normalized_value !== NULL && ! array_key_exists( $normalized_value, $enum_options )){
32 32
 			throw new EE_Validation_Error( $this->get_validation_error_message(),
33 33
 				'invalid_enum_value'
34 34
 			);
35
-		}else{
35
+		} else{
36 36
 			return true;
37 37
 		}
38 38
 	}
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 					__("This is not allowed option. Allowed options are %s.", "event_espresso"),
51 51
 					implode( ', ', $enum_options )
52 52
 				);
53
-		}else{
53
+		} else{
54 54
 			return $parent_validation_error_message;
55 55
 		}
56 56
 	}
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -19,20 +19,20 @@  discard block
 block discarded – undo
19 19
 	 */
20 20
 	public function validate($normalized_value) {
21 21
 		parent::validate($normalized_value);
22
-		if( ! $this->_input instanceof EE_Form_Input_With_Options_Base){
22
+		if ( ! $this->_input instanceof EE_Form_Input_With_Options_Base) {
23 23
 			throw new EE_Error(sprintf(__("Cannot use Enum Validation Strategy with an input that doesn't have options", "event_espresso")));
24 24
 		}
25 25
 		$enum_options = $this->_input->flat_options();
26
-		if( $normalized_value === TRUE){
26
+		if ($normalized_value === TRUE) {
27 27
 			$normalized_value = 1;
28
-		}elseif( $normalized_value === FALSE){
28
+		}elseif ($normalized_value === FALSE) {
29 29
 			$normalized_value = 0;
30 30
 		}
31
-		if( $normalized_value !== NULL && ! array_key_exists( $normalized_value, $enum_options )){
32
-			throw new EE_Validation_Error( $this->get_validation_error_message(),
31
+		if ($normalized_value !== NULL && ! array_key_exists($normalized_value, $enum_options)) {
32
+			throw new EE_Validation_Error($this->get_validation_error_message(),
33 33
 				'invalid_enum_value'
34 34
 			);
35
-		}else{
35
+		} else {
36 36
 			return true;
37 37
 		}
38 38
 	}
@@ -42,15 +42,15 @@  discard block
 block discarded – undo
42 42
 	 * on the allowed options.
43 43
 	 * @return string
44 44
 	 */
45
-	public function get_validation_error_message(){
45
+	public function get_validation_error_message() {
46 46
 		$parent_validation_error_message = parent::get_validation_error_message();
47
-		if( ! $parent_validation_error_message ) {
47
+		if ( ! $parent_validation_error_message) {
48 48
 			$enum_options = $this->_input instanceof EE_Form_Input_With_Options_Base ? $this->_input->flat_options() : '';
49 49
 			return sprintf(
50 50
 					__("This is not allowed option. Allowed options are %s.", "event_espresso"),
51
-					implode( ', ', $enum_options )
51
+					implode(', ', $enum_options)
52 52
 				);
53
-		}else{
53
+		} else {
54 54
 			return $parent_validation_error_message;
55 55
 		}
56 56
 	}
Please login to merge, or discard this patch.
strategies/validation/EE_Min_Length_Validation_Strategy.strategy.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -8,32 +8,32 @@
 block discarded – undo
8 8
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
9 9
  * @author				Mike Nelson
10 10
  */
11
-class EE_Min_Length_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_Min_Length_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	protected $_min_length;
14 14
 
15
-	public function __construct( $validation_error_message = NULL, $min_length = 0 ) {
15
+	public function __construct($validation_error_message = NULL, $min_length = 0) {
16 16
 		$this->_min_length = $min_length;
17
-		parent::__construct( $validation_error_message );
17
+		parent::__construct($validation_error_message);
18 18
 	}
19 19
 
20 20
 	/**
21 21
 	 * @param $normalized_value
22 22
 	 */
23 23
 	public function validate($normalized_value) {
24
-		if( $this->_min_length > 0 &&
24
+		if ($this->_min_length > 0 &&
25 25
 				$normalized_value &&
26
-				is_string( $normalized_value ) &&
27
-				strlen( $normalized_value ) < $this->_min_length){
28
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'minlength' );
26
+				is_string($normalized_value) &&
27
+				strlen($normalized_value) < $this->_min_length) {
28
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'minlength');
29 29
 		}
30 30
 	}
31 31
 
32 32
 	/**
33 33
 	 * @return array
34 34
 	 */
35
-	function get_jquery_validation_rule_array(){
36
-		return array( 'minlength'=> $this->_min_length, 'messages' => array( 'minlength' => $this->get_validation_error_message() ) );
35
+	function get_jquery_validation_rule_array() {
36
+		return array('minlength'=> $this->_min_length, 'messages' => array('minlength' => $this->get_validation_error_message()));
37 37
 	}
38 38
 }
39 39
 
Please login to merge, or discard this patch.
strategies/validation/EE_Plaintext_Validation_Strategy.strategy.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base{
13
+class EE_Plaintext_Validation_Strategy extends EE_Validation_Strategy_Base {
14 14
 
15 15
 	/**
16 16
 	 * @param null $validation_error_message
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL ) {
19
-		if( ! $validation_error_message ){
20
-			$validation_error_message = __( "HTML tags are not permitted in this field", "event_espresso" );
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20
+			$validation_error_message = __("HTML tags are not permitted in this field", "event_espresso");
21 21
 		}
22
-		parent::__construct( $validation_error_message );
22
+		parent::__construct($validation_error_message);
23 23
 	}
24 24
 
25 25
 	/**
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 	 * @throws \EE_Validation_Error
28 28
 	 */
29 29
 	public function validate($normalized_value) {
30
-		$no_tags = wp_strip_all_tags( $normalized_value );
31
-		if( strlen( $no_tags ) < strlen( trim( $normalized_value ) ) ) {
32
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'no_html_tags' );
30
+		$no_tags = wp_strip_all_tags($normalized_value);
31
+		if (strlen($no_tags) < strlen(trim($normalized_value))) {
32
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'no_html_tags');
33 33
 		}
34 34
 		parent::validate($normalized_value);
35 35
 	}
Please login to merge, or discard this patch.
strategies/validation/EE_Text_Validation_Strategy.strategy.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 	function get_jquery_validation_rule_array(){
33 33
 		if( $this->_regex !== null ){
34 34
 			return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
35
-		}else{
35
+		} else{
36 36
 			return array();
37 37
 		}
38 38
 
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
8 8
  * @author				Mike Nelson
9 9
  */
10
-class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base{
10
+class EE_Text_Validation_Strategy extends EE_Validation_Strategy_Base {
11 11
 
12 12
 	protected $_regex = null;
13 13
 	/**
@@ -15,18 +15,18 @@  discard block
 block discarded – undo
15 15
 	 * @param string $validation_error_message
16 16
 	 * @param string $regex a PHP regex; the javascript regex will be derived from this
17 17
 	 */
18
-	public function __construct( $validation_error_message = NULL, $regex = null ) {
18
+	public function __construct($validation_error_message = NULL, $regex = null) {
19 19
 		$this->_regex = $regex;
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 	/**
24 24
 	 * @param $normalized_value
25 25
 	 */
26 26
 	public function validate($normalized_value) {
27
-		if( $this->_regex && $normalized_value) {
28
-			if( ! preg_match( $this->_regex, $normalized_value ) ) {
29
-				throw new EE_Validation_Error( $this->get_validation_error_message(), 'regex' );
27
+		if ($this->_regex && $normalized_value) {
28
+			if ( ! preg_match($this->_regex, $normalized_value)) {
29
+				throw new EE_Validation_Error($this->get_validation_error_message(), 'regex');
30 30
 			}
31 31
 		}
32 32
 	}
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 	/**
35 35
 	 * @return array
36 36
 	 */
37
-	function get_jquery_validation_rule_array(){
38
-		if( $this->_regex !== null ){
39
-			return array( 'regex'=> $this->regex_js(), 'messages' => array( 'regex' => $this->get_validation_error_message() ) );
40
-		}else{
37
+	function get_jquery_validation_rule_array() {
38
+		if ($this->_regex !== null) {
39
+			return array('regex'=> $this->regex_js(), 'messages' => array('regex' => $this->get_validation_error_message()));
40
+		} else {
41 41
 			return array();
42 42
 		}
43 43
 
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
 	function regex_js() {
52 52
 		//first character must be the delimiter
53 53
 		$delimeter = $this->_regex[0];
54
-		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter );
55
-		return substr( $this->_regex, 1, $last_occurence_of_delimieter - 1 );
54
+		$last_occurence_of_delimieter = strrpos($this->_regex, $delimeter);
55
+		return substr($this->_regex, 1, $last_occurence_of_delimieter - 1);
56 56
 	}
57 57
 }
58 58
 
Please login to merge, or discard this patch.
EE_Admin_Table_Registration_Line_Item_Display_Strategy.strategy.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -154,13 +154,13 @@
 block discarded – undo
154 154
 			$total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
155 155
 			$total_label .= '<br>';
156 156
 			$total_label .= '<p class="ee-footnote-text">'
157
-			                . sprintf(
158
-				                __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
159
-				                '<strong>',
160
-				                $registration_total,
161
-				                '</strong>'
162
-			                )
163
-			                . '</p>';
157
+							. sprintf(
158
+								__( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
159
+								'<strong>',
160
+								$registration_total,
161
+								'</strong>'
162
+							)
163
+							. '</p>';
164 164
 		}
165 165
 		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="3"' );
166 166
 		// total th
Please login to merge, or discard this patch.
Spacing   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  *
11 11
  */
12 12
 
13
-class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy  {
13
+class EE_Admin_Table_Registration_Line_Item_Display_Strategy extends EE_Admin_Table_Line_Item_Display_Strategy {
14 14
 
15 15
 	/**
16 16
 	 * Table header for display.
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 	 * @param array $options
19 19
 	 * @return string
20 20
 	 */
21
-	protected function _table_header( $options ) {
22
-		$html = EEH_HTML::table( '','', $options['table_css_class'] );
21
+	protected function _table_header($options) {
22
+		$html = EEH_HTML::table('', '', $options['table_css_class']);
23 23
 		$html .= EEH_HTML::thead();
24 24
 		$html .= EEH_HTML::tr();
25
-		$html .= EEH_HTML::th( __( 'Name', 'event_espresso' ), '', 'jst-left' );
26
-		$html .= EEH_HTML::th( __( 'Type', 'event_espresso'), '', 'jst-left' );
27
-		$html .= EEH_HTML::th( __( 'Date(s)', 'event_espresso' ), '', 'jst-left' );
28
-		$html .= EEH_HTML::th( __( 'Amount', 'event_espresso' ), '', 'jst-cntr' );
25
+		$html .= EEH_HTML::th(__('Name', 'event_espresso'), '', 'jst-left');
26
+		$html .= EEH_HTML::th(__('Type', 'event_espresso'), '', 'jst-left');
27
+		$html .= EEH_HTML::th(__('Date(s)', 'event_espresso'), '', 'jst-left');
28
+		$html .= EEH_HTML::th(__('Amount', 'event_espresso'), '', 'jst-cntr');
29 29
 		$html .= EEH_HTML::tbody();
30 30
 		return $html;
31 31
 	}
@@ -41,14 +41,14 @@  discard block
 block discarded – undo
41 41
 	 * @param array        $options
42 42
 	 * @return mixed
43 43
 	 */
44
-	protected function _item_row( EE_Line_Item $line_item, $options = array() ) {
44
+	protected function _item_row(EE_Line_Item $line_item, $options = array()) {
45 45
 		$line_item_related_object = $line_item->get_object();
46 46
 		$parent_line_item_related_object = $line_item->parent() instanceof EE_Line_Item
47 47
 			? $line_item->parent()->get_object()
48 48
 			: null;
49 49
 		// start of row
50 50
 		$row_class = $options['odd'] ? 'item odd' : 'item';
51
-		$html = EEH_HTML::tr( '', '', $row_class );
51
+		$html = EEH_HTML::tr('', '', $row_class);
52 52
 
53 53
 
54 54
 		//Name Column
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object
59 59
 			? $parent_line_item_related_object->name()
60 60
 			: '';
61
-		$parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item
61
+		$parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item
62 62
 			? $line_item->parent()->name()
63 63
 			: $parent_related_object_name;
64 64
 		$parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links
@@ -68,51 +68,51 @@  discard block
 block discarded – undo
68 68
 
69 69
 		$name_html = $line_item_related_object instanceof EEI_Line_Item_Object
70 70
 			? $line_item_related_object->name() : $line_item->name();
71
-		$name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>'
71
+		$name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>'
72 72
 			: $name_html;
73 73
 		$name_html .= $line_item->is_taxable() ? ' *' : '';
74 74
 		//maybe preface with icon?
75 75
 		$name_html = $line_item_related_object instanceof EEI_Has_Icon
76
-			? $line_item_related_object->get_icon() . $name_html
76
+			? $line_item_related_object->get_icon().$name_html
77 77
 			: $name_html;
78
-		$name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>';
79
-		$name_html .=  sprintf(
80
-			_x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
78
+		$name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>';
79
+		$name_html .= sprintf(
80
+			_x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
81 81
 			'<span class="ee-line-item-related-parent-object">',
82 82
 			$line_item->parent() instanceof EE_Line_Item
83 83
 				? $line_item->parent()->OBJ_type_i18n()
84
-				: __( 'Item:', 'event_espresso' ),
84
+				: __('Item:', 'event_espresso'),
85 85
 			$parent_related_object_link
86
-				? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>'
86
+				? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>'
87 87
 				: $parent_related_object_name,
88 88
 			'</span>'
89 89
 		);
90
-		$html .= EEH_HTML::td( $name_html, '', 'jst-left' );
90
+		$html .= EEH_HTML::td($name_html, '', 'jst-left');
91 91
 		//Type Column
92 92
 		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() : '';
93
-		$type_html .= $this->_get_cancellations( $line_item );
93
+		$type_html .= $this->_get_cancellations($line_item);
94 94
 		$type_html .= $line_item->OBJ_type() ? '<br />' : '';
95 95
 		$code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : '';
96
-		$type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : '';
97
-		$html .= EEH_HTML::td( $type_html, '', 'jst-left' );
96
+		$type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : '';
97
+		$html .= EEH_HTML::td($type_html, '', 'jst-left');
98 98
 
99 99
 		//Date column
100 100
 		$datetime_content = '';
101
-		if ( $line_item_related_object instanceof EE_Ticket ) {
101
+		if ($line_item_related_object instanceof EE_Ticket) {
102 102
 			$datetimes = $line_item_related_object->datetimes();
103
-			foreach ( $datetimes as $datetime ) {
104
-				if ( $datetime instanceof EE_Datetime ) {
105
-					$datetime_content .= $datetime->get_dtt_display_name() . '<br>';
103
+			foreach ($datetimes as $datetime) {
104
+				if ($datetime instanceof EE_Datetime) {
105
+					$datetime_content .= $datetime->get_dtt_display_name().'<br>';
106 106
 				}
107 107
 			}
108 108
 		}
109
-		$html .= EEH_HTML::td( $datetime_content, '', 'jst-left' );
109
+		$html .= EEH_HTML::td($datetime_content, '', 'jst-left');
110 110
 
111 111
 		//Amount Column
112
-		if ( $line_item->is_percent() ) {
113
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' );
112
+		if ($line_item->is_percent()) {
113
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght');
114 114
 		} else {
115
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' );
115
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght');
116 116
 		}
117 117
 
118 118
 
@@ -130,13 +130,13 @@  discard block
 block discarded – undo
130 130
 	 * @param array        $options
131 131
 	 * @return mixed
132 132
 	 */
133
-	protected function _tax_row( EE_Line_Item $line_item, $options = array() ) {
133
+	protected function _tax_row(EE_Line_Item $line_item, $options = array()) {
134 134
 		// start of row
135
-		$html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' );
135
+		$html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr');
136 136
 		// name th
137
-		$html .= EEH_HTML::th(  $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '',  'jst-rght', '', ' colspan="3"' );
137
+		$html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="3"');
138 138
 		// total th
139
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
139
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
140 140
 		// end of row
141 141
 		$html .= EEH_HTML::trx();
142 142
 		return $html;
@@ -153,9 +153,9 @@  discard block
 block discarded – undo
153 153
 	 * @param array        $options
154 154
 	 * @return mixed
155 155
 	 */
156
-	protected function _total_row( EE_Line_Item $line_item, $options = array() ) {
156
+	protected function _total_row(EE_Line_Item $line_item, $options = array()) {
157 157
 
158
-		$registration = isset( $options['EE_Registration'] ) ? $options['EE_Registration'] : null;
158
+		$registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null;
159 159
 		$registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0;
160 160
 		//if no valid registration object then we're not going to show the approximate text.
161 161
 		$total_match = $registration instanceof EE_Registration
@@ -163,26 +163,26 @@  discard block
 block discarded – undo
163 163
 			: true;
164 164
 
165 165
 		// start of row
166
-		$html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' );
166
+		$html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr');
167 167
 		// Total th label
168
-		if ( $total_match ) {
169
-			$total_label = sprintf( __( 'This registration\'s total %s:', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
168
+		if ($total_match) {
169
+			$total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
170 170
 		} else {
171
-			$total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
171
+			$total_label = sprintf(__('This registration\'s approximate total %s', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
172 172
 			$total_label .= '<br>';
173 173
 			$total_label .= '<p class="ee-footnote-text">'
174 174
 			                . sprintf(
175
-				                __( 'The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso' ),
175
+				                __('The registrations\' share of the transaction total is approximate because it might not be possible to evenly divide the transaction total among each registration, and so some registrations may need to pay a penny more than others.  This registration\'s final share is actually %1$s%2$s%3$s.', 'event_espresso'),
176 176
 				                '<strong>',
177 177
 				                $registration_total,
178 178
 				                '</strong>'
179 179
 			                )
180 180
 			                . '</p>';
181 181
 		}
182
-		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="3"' );
182
+		$html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"');
183 183
 		// total th
184 184
 
185
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'jst-rght' );
185
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
186 186
 		// end of row
187 187
 		$html .= EEH_HTML::trx();
188 188
 		return $html;
Please login to merge, or discard this patch.
line_item_display/EE_Invoice_Line_Item_Display_Strategy.strategy.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
  /**
3
- *
4
- * Class EE_Invoice_Line_Item_Display_Strategy
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_Invoice_Line_Item_Display_Strategy
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 class EE_Invoice_Line_Item_Display_Strategy implements EEI_Line_Item_Display {
15 15
 
16 16
 	/**
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @param array        $options
19 19
 	 * @return mixed
20 20
 	 */
21
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
21
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
22 22
 
23 23
 		$html = '';
24 24
 		// set some default options and merge with incoming
@@ -26,58 +26,58 @@  discard block
 block discarded – undo
26 26
 			'show_desc' => TRUE,
27 27
 			'odd' => FALSE
28 28
 		);
29
-		$options = array_merge( $default_options, (array)$options );
29
+		$options = array_merge($default_options, (array) $options);
30 30
 
31
-		switch( $line_item->type() ) {
31
+		switch ($line_item->type()) {
32 32
 
33 33
 			case EEM_Line_Item::type_total:
34 34
 				// loop thru children
35
-				foreach( $line_item->children() as $child_line_item ) {
35
+				foreach ($line_item->children() as $child_line_item) {
36 36
 					// recursively feed children back into this method
37
-					$html .= $this->display_line_item( $child_line_item, $options );
37
+					$html .= $this->display_line_item($child_line_item, $options);
38 38
 				}
39
-				$html .= $this->_separator_row( $options );
40
-				$html .= $this->_total_row( $line_item, __('Total', 'event_espresso'), $options );
39
+				$html .= $this->_separator_row($options);
40
+				$html .= $this->_total_row($line_item, __('Total', 'event_espresso'), $options);
41 41
 				 break;
42 42
 
43 43
 
44 44
 			case EEM_Line_Item::type_sub_total:
45 45
 				// loop thru children
46
-				foreach( $line_item->children() as $child_line_item ) {
46
+				foreach ($line_item->children() as $child_line_item) {
47 47
 					// recursively feed children back into this method
48
-					$html .= $this->display_line_item( $child_line_item, $options );
48
+					$html .= $this->display_line_item($child_line_item, $options);
49 49
 				}
50
-				$html .= $this->_total_row( $line_item, __('Sub-Total', 'event_espresso'), $options );
50
+				$html .= $this->_total_row($line_item, __('Sub-Total', 'event_espresso'), $options);
51 51
 				break;
52 52
 
53 53
 
54 54
 			case EEM_Line_Item::type_tax_sub_total:
55 55
 				// loop thru children
56
-				foreach( $line_item->children() as $child_line_item ) {
56
+				foreach ($line_item->children() as $child_line_item) {
57 57
 					// recursively feed children back into this method
58
-					$html .= $this->display_line_item( $child_line_item, $options );
58
+					$html .= $this->display_line_item($child_line_item, $options);
59 59
 				}
60
-				$html .= $this->_total_row( $line_item, __('Tax Total', 'event_espresso'), $options );
60
+				$html .= $this->_total_row($line_item, __('Tax Total', 'event_espresso'), $options);
61 61
 				break;
62 62
 
63 63
 
64 64
 			case EEM_Line_Item::type_line_item:
65 65
 				// item row
66
-				$html .= $this->_item_row( $line_item, $options );
66
+				$html .= $this->_item_row($line_item, $options);
67 67
 				// got any kids?
68
-				foreach( $line_item->children() as $child_line_item ) {
69
-					$this->display_line_item( $child_line_item, $options );
68
+				foreach ($line_item->children() as $child_line_item) {
69
+					$this->display_line_item($child_line_item, $options);
70 70
 				}
71 71
 				break;
72 72
 
73 73
 
74 74
 			case EEM_Line_Item::type_sub_line_item:
75
-				$html .= $this->_sub_item_row( $line_item, $options );
75
+				$html .= $this->_sub_item_row($line_item, $options);
76 76
 				break;
77 77
 
78 78
 
79 79
 			case EEM_Line_Item::type_tax:
80
-				$html .= $this->_tax_row( $line_item, $options );
80
+				$html .= $this->_tax_row($line_item, $options);
81 81
 				break;
82 82
 
83 83
 		}
@@ -94,21 +94,21 @@  discard block
 block discarded – undo
94 94
 	 * @param array        $options
95 95
 	 * @return mixed
96 96
 	 */
97
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
97
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
98 98
 		// start of row
99 99
 		$row_class = $options['odd'] ? 'item odd' : 'item';
100
-		$html = EEH_HTML::tr( '', $row_class );
100
+		$html = EEH_HTML::tr('', $row_class);
101 101
 		// name td
102
-		$html .= EEH_HTML::td( $line_item->name(), '',  'item_l' );
102
+		$html .= EEH_HTML::td($line_item->name(), '', 'item_l');
103 103
 		// desc td
104
-		$html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '',  'item_l' ) : '';
104
+		$html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : '';
105 105
 		// quantity td
106
-		$html .= EEH_HTML::td( $line_item->quantity(), '',  'item_l' );
106
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l');
107 107
 		// price td
108
-		$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c' );
108
+		$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c');
109 109
 		// total td
110
-		$total = $line_item->is_taxable() ? $line_item->total_no_code() . '*' : $line_item->total_no_code();
111
-		$html .= EEH_HTML::td( $total, '',  'item_r' );
110
+		$total = $line_item->is_taxable() ? $line_item->total_no_code().'*' : $line_item->total_no_code();
111
+		$html .= EEH_HTML::td($total, '', 'item_r');
112 112
 		// end of row
113 113
 		$html .= EEH_HTML::trx();
114 114
 		return $html;
@@ -123,22 +123,22 @@  discard block
 block discarded – undo
123 123
 	 * @param array        $options
124 124
 	 * @return mixed
125 125
 	 */
126
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
126
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
127 127
 		// start of row
128
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
128
+		$html = EEH_HTML::tr('', 'item sub-item-row');
129 129
 		// name td
130
-		$html .= EEH_HTML::td( $line_item->name(), '',  'item_l sub-item' );
130
+		$html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item');
131 131
 		// desc td
132
-		$html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '',  'item_l' ) : '';
133
-		$html .= EEH_HTML::td() . EEH_HTML::tdx();
132
+		$html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : '';
133
+		$html .= EEH_HTML::td().EEH_HTML::tdx();
134 134
 		// discount/surcharge td
135
-		if ( $line_item->is_percent() ) {
136
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
135
+		if ($line_item->is_percent()) {
136
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
137 137
 		} else {
138
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c' );
138
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c');
139 139
 		}
140 140
 		// total td
141
-		$html .= EEH_HTML::td( $line_item->total_no_code(), '',  'item_r' );
141
+		$html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r');
142 142
 		// end of row
143 143
 		$html .= EEH_HTML::trx();
144 144
 		return $html;
@@ -153,17 +153,17 @@  discard block
 block discarded – undo
153 153
 	 * @param array        $options
154 154
 	 * @return mixed
155 155
 	 */
156
-	private function _tax_row( EE_Line_Item $line_item, $options = array() ) {
156
+	private function _tax_row(EE_Line_Item $line_item, $options = array()) {
157 157
 		// start of row
158
-		$html = EEH_HTML::tr( '', 'item sub-item tax-total' );
158
+		$html = EEH_HTML::tr('', 'item sub-item tax-total');
159 159
 		// name td
160
-		$html .= EEH_HTML::td( $line_item->name(), '',  'item_l sub-item' );
160
+		$html .= EEH_HTML::td($line_item->name(), '', 'item_l sub-item');
161 161
 		// desc td
162
-		$html .= $options['show_desc'] ? EEH_HTML::td( $line_item->desc(), '',  'item_l' ) : '';
162
+		$html .= $options['show_desc'] ? EEH_HTML::td($line_item->desc(), '', 'item_l') : '';
163 163
 		// percent td
164
-		$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c', '', ' colspan="2"' );
164
+		$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c', '', ' colspan="2"');
165 165
 		// total td
166
-		$html .= EEH_HTML::td( $line_item->total_no_code(), '',  'item_r' );
166
+		$html .= EEH_HTML::td($line_item->total_no_code(), '', 'item_r');
167 167
 		// end of row
168 168
 		$html .= EEH_HTML::trx();
169 169
 		return $html;
@@ -179,17 +179,17 @@  discard block
 block discarded – undo
179 179
 	 * @param array        $options
180 180
 	 * @return mixed
181 181
 	 */
182
-	private function _total_row( EE_Line_Item $line_item, $text = '', $options = array() ) {
182
+	private function _total_row(EE_Line_Item $line_item, $text = '', $options = array()) {
183 183
 		// colspan
184 184
 		$colspan = $options['show_desc'] ? ' colspan="2"' : '';
185 185
 		// start of row
186
-		$html = EEH_HTML::tr( '', '', 'total_tr odd' );
186
+		$html = EEH_HTML::tr('', '', 'total_tr odd');
187 187
 		// empty td
188
-		$html .= EEH_HTML::td( EEH_HTML::nbsp(), '',  '',  '',  $colspan );
188
+		$html .= EEH_HTML::td(EEH_HTML::nbsp(), '', '', '', $colspan);
189 189
 		// total td
190
-		$html .= EEH_HTML::td( $text, '',  'total_currency total',  '',  $colspan );
190
+		$html .= EEH_HTML::td($text, '', 'total_currency total', '', $colspan);
191 191
 		// total td
192
-		$html .= EEH_HTML::td( $line_item->total_no_code(), '',  'total' );
192
+		$html .= EEH_HTML::td($line_item->total_no_code(), '', 'total');
193 193
 		// end of row
194 194
 		$html .= EEH_HTML::trx();
195 195
 		return $html;
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
203 203
 	 * @param array        $options
204 204
 	 * @return mixed
205 205
 	 */
206
-	private function _separator_row( $options = array() ) {
206
+	private function _separator_row($options = array()) {
207 207
 		// colspan
208 208
 		$colspan = $options['show_desc'] ? ' colspan="5"' : ' colspan="4"';
209 209
 		// start of row
210
-		$html = EEH_HTML::tr( EEH_HTML::td( '<hr>', '',  '',  '',  $colspan ));
210
+		$html = EEH_HTML::tr(EEH_HTML::td('<hr>', '', '', '', $colspan));
211 211
 //		// separator td
212 212
 //		$html .= EEH_HTML::td( '<hr>', '',  '',  '',  $colspan );
213 213
 //		// end of row
Please login to merge, or discard this patch.
core/libraries/line_item_display/EE_Line_Item_Display.class.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
  /**
3
- *
4
- * Class EE_Line_Item_Display
5
- *
6
- * Description
7
- *
8
- * @package         Event Espresso
9
- * @subpackage    core
10
- * @author				Brent Christensen
11
- * @since		 	   $VID:$
12
- *
13
- */
3
+  *
4
+  * Class EE_Line_Item_Display
5
+  *
6
+  * Description
7
+  *
8
+  * @package         Event Espresso
9
+  * @subpackage    core
10
+  * @author				Brent Christensen
11
+  * @since		 	   $VID:$
12
+  *
13
+  */
14 14
 class EE_Line_Item_Display {
15 15
 
16 16
 	private $strategy = NULL;
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@  discard block
 block discarded – undo
21 21
 	 * @param string $context - where/how the line items are being displayed
22 22
 	 * @param string $other_line_item_display_strategy
23 23
 	 */
24
-	public function __construct( $context = '', $other_line_item_display_strategy = '' ) {
25
-		$context = strtolower( $context );
26
-		switch ( $context ) {
24
+	public function __construct($context = '', $other_line_item_display_strategy = '') {
25
+		$context = strtolower($context);
26
+		switch ($context) {
27 27
 			case 'invoice' :
28 28
 				$this->strategy = new EE_Invoice_Line_Item_Display_Strategy();
29 29
 				break;
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 				break;
36 36
 			default :
37 37
 				if (
38
-					! empty( $other_line_item_display_strategy ) &&
39
-					class_exists( $other_line_item_display_strategy )
38
+					! empty($other_line_item_display_strategy) &&
39
+					class_exists($other_line_item_display_strategy)
40 40
 				) {
41 41
 					$this->strategy = new  $other_line_item_display_strategy();
42 42
 				} else {
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 * @param array        $options
51 51
 	 * @return mixed
52 52
 	 */
53
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
54
-		return $this->strategy->display_line_item( $line_item, $options );
53
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
54
+		return $this->strategy->display_line_item($line_item, $options);
55 55
 	}
56 56
 
57 57
 
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Billable_Line_Item_Filter.class.php 1 patch
Spacing   +11 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Billable_Line_Item_Filter
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 	 * EE_Billable_Line_Item_Filter constructor.
26 26
 	 * @param EE_Registration[] $registrations
27 27
 	 */
28
-	public function __construct( $registrations ) {
29
-		parent::__construct( $this->_remove_unbillable_registrations( $registrations ) );
28
+	public function __construct($registrations) {
29
+		parent::__construct($this->_remove_unbillable_registrations($registrations));
30 30
 	}
31 31
 
32 32
 
@@ -39,25 +39,24 @@  discard block
 block discarded – undo
39 39
 	 * @param EE_Registration[] $registrations
40 40
 	 * @return mixed
41 41
 	 */
42
-	protected function _remove_unbillable_registrations( $registrations = array() ) {
43
-		if ( ! empty( $registrations ) ) {
42
+	protected function _remove_unbillable_registrations($registrations = array()) {
43
+		if ( ! empty($registrations)) {
44 44
 			// these reg statuses require payment (if event is not free)
45 45
 			$requires_payment = EEM_Registration::reg_statuses_that_allow_payment();
46
-			foreach ( $registrations as $key => $registration ) {
47
-				if ( ! $registration instanceof EE_Registration ) {
46
+			foreach ($registrations as $key => $registration) {
47
+				if ( ! $registration instanceof EE_Registration) {
48 48
 					continue;
49 49
 				}
50 50
 				// are we billing for this registration at this moment ?
51
-				if ( !
52
-					$registration->owes_monies_and_can_pay( $requires_payment ) &&
51
+				if ( ! $registration->owes_monies_and_can_pay($requires_payment) &&
53 52
 					! (
54 53
 						// free registration with valid reg status
55 54
 						$registration->final_price() == 0 &&
56
-						in_array( $registration->status_ID(), $requires_payment )
55
+						in_array($registration->status_ID(), $requires_payment)
57 56
 					)
58 57
 				) {
59 58
 					// not billable. remove it
60
-					unset( $registrations[ $key ] );
59
+					unset($registrations[$key]);
61 60
 				}
62 61
 			}
63 62
 		}
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Line_Item_Filter_Collection.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Line_Item_Filter_Collection
Please login to merge, or discard this patch.