Completed
Branch FET-9998-unit-test-bootstrappi... (db3cac)
by
unknown
111:23 queued 102:09
created
sensitive_data_removal/EE_Sensitive_Data_Removal_Base.strategy.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-abstract class EE_Sensitive_Data_Removal_Base extends EE_Form_Input_Strategy_Base{
28
+abstract class EE_Sensitive_Data_Removal_Base extends EE_Form_Input_Strategy_Base {
29 29
 	/**
30 30
 	 * Removes all the sensitive data from this normalized value.
31 31
 	 * For example, should could 'mask' a credit card from 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
strategies/validation/EE_Credit_Card_Validation_Strategy.strategy.php 2 patches
Spacing   +10 added lines, -10 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_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy{
13
+class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy {
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 ){
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20 20
 			$validation_error_message = __("Please enter a valid credit card number", "event_espresso");
21 21
 		}
22
-		parent::__construct( $validation_error_message );
22
+		parent::__construct($validation_error_message);
23 23
 	}
24 24
 
25 25
 	/**
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @return void
30 30
 	 */
31 31
 	function validate($normalized_value) {
32
-		if( $normalized_value && ! $this->verify_is_credit_card($normalized_value)){
33
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'required');
32
+		if ($normalized_value && ! $this->verify_is_credit_card($normalized_value)) {
33
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
34 34
 		}
35 35
 	}
36 36
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 *
42 42
 	 * @return array
43 43
 	 */
44
-	function get_jquery_validation_rule_array(){
45
-		return array('creditcard'=>true, 'messages' => array( 'creditcard' => $this->get_validation_error_message() ) );
44
+	function get_jquery_validation_rule_array() {
45
+		return array('creditcard'=>true, 'messages' => array('creditcard' => $this->get_validation_error_message()));
46 46
 	}
47 47
 
48 48
 	/**
@@ -50,12 +50,12 @@  discard block
 block discarded – undo
50 50
 	 * @param string $card_number
51 51
 	 * @return boolean
52 52
 	 */
53
-	private function verify_is_credit_card($card_number){
53
+	private function verify_is_credit_card($card_number) {
54 54
 		//Credit card: All major cards
55 55
 		$regex = '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~';
56 56
 		if (preg_match($regex, $card_number) || empty($card_number)) {
57 57
 			return true;
58
-		}else{
58
+		} else {
59 59
 			return false;
60 60
 		}
61 61
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 		$regex = '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~';
56 56
 		if (preg_match($regex, $card_number) || empty($card_number)) {
57 57
 			return true;
58
-		}else{
58
+		} else{
59 59
 			return false;
60 60
 		}
61 61
 
Please login to merge, or discard this patch.
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.
form_sections/strategies/validation/EE_Int_Validation_Strategy.strategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * @subpackage	Expression package is undefined on line 19, column 19 in Templates/Scripting/PHPClass.php.
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base{
9
+class EE_Int_Validation_Strategy extends EE_Validation_Strategy_Base {
10 10
 
11 11
 	/**
12 12
 	 * @param null $validation_error_message
13 13
 	 */
14
-	public function __construct( $validation_error_message = NULL ) {
15
-		if( ! $validation_error_message ){
14
+	public function __construct($validation_error_message = NULL) {
15
+		if ( ! $validation_error_message) {
16 16
 			$validation_error_message = __("Only digits are allowed.", "event_espresso");
17 17
 		}
18
-		parent::__construct( $validation_error_message );
18
+		parent::__construct($validation_error_message);
19 19
 	}
20 20
 
21 21
 
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 	/**
33 33
 	 * @return array
34 34
 	 */
35
-	function get_jquery_validation_rule_array(){
36
-		return array('digits'=>true, 'messages' => array( 'digits' => $this->get_validation_error_message() ) );
35
+	function get_jquery_validation_rule_array() {
36
+		return array('digits'=>true, 'messages' => array('digits' => $this->get_validation_error_message()));
37 37
 	}
38 38
 }
39 39
 
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,12 +41,12 @@  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 ? $line_item->parent()->get_object() : null;
47 47
 		// start of row
48 48
 		$row_class = $options['odd'] ? 'item odd' : 'item';
49
-		$html = EEH_HTML::tr( '', '', $row_class );
49
+		$html = EEH_HTML::tr('', '', $row_class);
50 50
 
51 51
 
52 52
 		//Name Column
@@ -54,48 +54,48 @@  discard block
 block discarded – undo
54 54
 
55 55
 		//related object scope.
56 56
 		$parent_related_object_name = $parent_line_item_related_object instanceof EEI_Line_Item_Object ? $parent_line_item_related_object->name() : '';
57
-		$parent_related_object_name = empty( $parent_related_object_name ) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
57
+		$parent_related_object_name = empty($parent_related_object_name) && $line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->name() : $parent_related_object_name;
58 58
 		$parent_related_object_link = $parent_line_item_related_object instanceof EEI_Admin_Links ? $parent_line_item_related_object->get_admin_details_link() : '';
59 59
 
60 60
 
61 61
 		$name_html = $line_item_related_object instanceof EEI_Line_Item_Object ? $line_item_related_object->name() : $line_item->name();
62
-		$name_html = $name_link ? '<a href="' . $name_link . '">' . $name_html . '</a>' : $name_html;
62
+		$name_html = $name_link ? '<a href="'.$name_link.'">'.$name_html.'</a>' : $name_html;
63 63
 		$name_html .= $line_item->is_taxable() ? ' *' : '';
64 64
 		//maybe preface with icon?
65
-		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon() . $name_html : $name_html;
66
-		$name_html = '<span class="ee-line-item-name linked">' . $name_html . '</span><br>';
67
-		$name_html .=  sprintf(
68
-			_x( '%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
65
+		$name_html = $line_item_related_object instanceof EEI_Has_Icon ? $line_item_related_object->get_icon().$name_html : $name_html;
66
+		$name_html = '<span class="ee-line-item-name linked">'.$name_html.'</span><br>';
67
+		$name_html .= sprintf(
68
+			_x('%1$sfor the %2$s: %3$s%4$s', 'eg. "for the Event: My Cool Event"', 'event_espresso'),
69 69
 			'<span class="ee-line-item-related-parent-object">',
70
-			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __( 'Item:', 'event_espresso' ),
71
-			$parent_related_object_link ? '<a href="' . $parent_related_object_link . '">' . $parent_related_object_name . '</a>' : $parent_related_object_name,
70
+			$line_item->parent() instanceof EE_Line_Item ? $line_item->parent()->OBJ_type_i18n() : __('Item:', 'event_espresso'),
71
+			$parent_related_object_link ? '<a href="'.$parent_related_object_link.'">'.$parent_related_object_name.'</a>' : $parent_related_object_name,
72 72
 			'</span>'
73 73
 		);
74
-		$html .= EEH_HTML::td( $name_html, '', 'jst-left' );
74
+		$html .= EEH_HTML::td($name_html, '', 'jst-left');
75 75
 
76 76
 		//Type Column
77
-		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n() . '<br />' : '';
77
+		$type_html = $line_item->OBJ_type() ? $line_item->OBJ_type_i18n().'<br />' : '';
78 78
 		$code = $line_item_related_object instanceof EEI_Has_Code ? $line_item_related_object->code() : '';
79
-		$type_html .= ! empty( $code ) ? '<span class="ee-line-item-id">' . sprintf( __( 'Code: %s', 'event_espresso' ), $code ) . '</span>' : '';
80
-		$html .= EEH_HTML::td( $type_html, '', 'jst-left' );
79
+		$type_html .= ! empty($code) ? '<span class="ee-line-item-id">'.sprintf(__('Code: %s', 'event_espresso'), $code).'</span>' : '';
80
+		$html .= EEH_HTML::td($type_html, '', 'jst-left');
81 81
 
82 82
 		//Date column
83 83
 		$datetime_content = '';
84
-		if ( $line_item_related_object instanceof EE_Ticket ) {
84
+		if ($line_item_related_object instanceof EE_Ticket) {
85 85
 			$datetimes = $line_item_related_object->datetimes();
86
-			foreach ( $datetimes as $datetime ) {
87
-				if ( $datetime instanceof EE_Datetime ) {
88
-					$datetime_content .= $datetime->get_dtt_display_name() . '<br>';
86
+			foreach ($datetimes as $datetime) {
87
+				if ($datetime instanceof EE_Datetime) {
88
+					$datetime_content .= $datetime->get_dtt_display_name().'<br>';
89 89
 				}
90 90
 			}
91 91
 		}
92
-		$html .= EEH_HTML::td( $datetime_content, '', 'jst-left' );
92
+		$html .= EEH_HTML::td($datetime_content, '', 'jst-left');
93 93
 
94 94
 		//Amount Column
95
-		if ( $line_item->is_percent() ) {
96
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '', 'jst-rght' );
95
+		if ($line_item->is_percent()) {
96
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'jst-rght');
97 97
 		} else {
98
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '', 'jst-rght' );
98
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'jst-rght');
99 99
 		}
100 100
 
101 101
 
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
 	 * @param array        $options
114 114
 	 * @return mixed
115 115
 	 */
116
-	protected function _tax_row( EE_Line_Item $line_item, $options = array() ) {
116
+	protected function _tax_row(EE_Line_Item $line_item, $options = array()) {
117 117
 		// start of row
118
-		$html = EEH_HTML::tr( '', 'admin-primary-mbox-taxes-tr' );
118
+		$html = EEH_HTML::tr('', 'admin-primary-mbox-taxes-tr');
119 119
 		// name th
120
-		$html .= EEH_HTML::th(  $line_item->name() . '(' . $line_item->get_pretty( 'LIN_percent' ) . '%)', '',  'jst-rght', '', ' colspan="3"' );
120
+		$html .= EEH_HTML::th($line_item->name().'('.$line_item->get_pretty('LIN_percent').'%)', '', 'jst-rght', '', ' colspan="3"');
121 121
 		// total th
122
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '', 'jst-rght' );
122
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
123 123
 		// end of row
124 124
 		$html .= EEH_HTML::trx();
125 125
 		return $html;
@@ -136,9 +136,9 @@  discard block
 block discarded – undo
136 136
 	 * @param array        $options
137 137
 	 * @return mixed
138 138
 	 */
139
-	protected function _total_row( EE_Line_Item $line_item, $options = array() ) {
139
+	protected function _total_row(EE_Line_Item $line_item, $options = array()) {
140 140
 
141
-		$registration = isset( $options['EE_Registration'] ) ? $options['EE_Registration'] : null;
141
+		$registration = isset($options['EE_Registration']) ? $options['EE_Registration'] : null;
142 142
 		$registration_total = $registration instanceof EE_Registration ? $registration->pretty_final_price() : 0;
143 143
 		//if no valid registration object then we're not going to show the approximate text.
144 144
 		$total_match = $registration instanceof EE_Registration
@@ -146,26 +146,26 @@  discard block
 block discarded – undo
146 146
 			: true;
147 147
 
148 148
 		// start of row
149
-		$html = EEH_HTML::tr( '', '', 'admin-primary-mbox-total-tr' );
149
+		$html = EEH_HTML::tr('', '', 'admin-primary-mbox-total-tr');
150 150
 		// Total th label
151
-		if ( $total_match ) {
152
-			$total_label = sprintf( __( 'This registration\'s total %s:', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
151
+		if ($total_match) {
152
+			$total_label = sprintf(__('This registration\'s total %s:', 'event_espresso'), '('.EE_Registry::instance()->CFG->currency->code.')');
153 153
 		} else {
154
-			$total_label = sprintf( __( 'This registration\'s approximate total %s', 'event_espresso' ), '(' . EE_Registry::instance()->CFG->currency->code . ')' );
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 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' ),
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 159
 				                '<strong>',
160 160
 				                $registration_total,
161 161
 				                '</strong>'
162 162
 			                )
163 163
 			                . '</p>';
164 164
 		}
165
-		$html .= EEH_HTML::th( $total_label, '',  'jst-rght',  '',  ' colspan="3"' );
165
+		$html .= EEH_HTML::th($total_label, '', 'jst-rght', '', ' colspan="3"');
166 166
 		// total th
167 167
 
168
-		$html .= EEH_HTML::th( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'jst-rght' );
168
+		$html .= EEH_HTML::th(EEH_Template::format_currency($line_item->total(), false, false), '', 'jst-rght');
169 169
 		// end of row
170 170
 		$html .= EEH_HTML::trx();
171 171
 		return $html;
Please login to merge, or discard this patch.
line_item_display/EE_Default_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_Default_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_Default_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
 
15 15
 class EE_Default_Line_Item_Display_Strategy implements EEI_Line_Item_Display {
16 16
 
Please login to merge, or discard this patch.
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -57,29 +57,29 @@  discard block
 block discarded – undo
57 57
 	 * @param array        $options
58 58
 	 * @return mixed
59 59
 	 */
60
-	public function display_line_item( EE_Line_Item $line_item, $options = array() ) {
60
+	public function display_line_item(EE_Line_Item $line_item, $options = array()) {
61 61
 
62 62
 		$html = '';
63 63
 		// set some default options and merge with incoming
64 64
 		$default_options = array(
65
-			'show_desc' => TRUE,  // 	TRUE 		FALSE
65
+			'show_desc' => TRUE, // 	TRUE 		FALSE
66 66
 			'odd' => FALSE
67 67
 		);
68
-		$options = array_merge( $default_options, (array)$options );
68
+		$options = array_merge($default_options, (array) $options);
69 69
 
70
-		switch( $line_item->type() ) {
70
+		switch ($line_item->type()) {
71 71
 
72 72
 			case EEM_Line_Item::type_line_item:
73 73
 				// item row
74
-				$html .= $this->_item_row( $line_item, $options );
74
+				$html .= $this->_item_row($line_item, $options);
75 75
 				// got any kids?
76
-				foreach ( $line_item->children() as $child_line_item ) {
77
-					$this->display_line_item( $child_line_item, $options );
76
+				foreach ($line_item->children() as $child_line_item) {
77
+					$this->display_line_item($child_line_item, $options);
78 78
 				}
79 79
 				break;
80 80
 
81 81
 			case EEM_Line_Item::type_sub_line_item:
82
-				$html .= $this->_sub_item_row( $line_item, $options );
82
+				$html .= $this->_sub_item_row($line_item, $options);
83 83
 				break;
84 84
 
85 85
 			case EEM_Line_Item::type_sub_total:
@@ -90,10 +90,10 @@  discard block
 block discarded – undo
90 90
 				break;
91 91
 
92 92
 			case EEM_Line_Item::type_tax_sub_total:
93
-				foreach ( $line_item->children() as $child_line_item ) {
94
-					if ( $child_line_item->type() == EEM_Line_Item::type_tax ) {
93
+				foreach ($line_item->children() as $child_line_item) {
94
+					if ($child_line_item->type() == EEM_Line_Item::type_tax) {
95 95
 						// recursively feed children back into this method
96
-						$this->display_line_item( $child_line_item, $options );
96
+						$this->display_line_item($child_line_item, $options);
97 97
 					}
98 98
 				}
99 99
 				break;
@@ -101,20 +101,20 @@  discard block
 block discarded – undo
101 101
 			case EEM_Line_Item::type_total:
102 102
 				// get all child line items
103 103
 				$children = $line_item->children();
104
-				if ( $options[ 'set_tax_rate' ] === true  ) {
104
+				if ($options['set_tax_rate'] === true) {
105 105
 					// loop thru tax child line items just to determine tax rate
106
-					foreach ( $children as $child_line_item ) {
107
-						if ( $child_line_item->type() == EEM_Line_Item::type_tax_sub_total ) {
106
+					foreach ($children as $child_line_item) {
107
+						if ($child_line_item->type() == EEM_Line_Item::type_tax_sub_total) {
108 108
 							// recursively feed children back into this method
109
-							$this->display_line_item( $child_line_item, $options );
109
+							$this->display_line_item($child_line_item, $options);
110 110
 						}
111 111
 					}
112 112
 				} else {
113 113
 					// now loop thru all non-tax child line items
114
-					foreach ( $children as $child_line_item ) {
115
-						if ( $child_line_item->type() != EEM_Line_Item::type_tax_sub_total ) {
114
+					foreach ($children as $child_line_item) {
115
+						if ($child_line_item->type() != EEM_Line_Item::type_tax_sub_total) {
116 116
 							// recursively feed children back into this method
117
-							$html .= $this->display_line_item( $child_line_item, $options );
117
+							$html .= $this->display_line_item($child_line_item, $options);
118 118
 						}
119 119
 					}
120 120
 				}
@@ -134,10 +134,10 @@  discard block
 block discarded – undo
134 134
 	 * @param array        $options
135 135
 	 * @return mixed
136 136
 	 */
137
-	private function _item_row( EE_Line_Item $line_item, $options = array() ) {
137
+	private function _item_row(EE_Line_Item $line_item, $options = array()) {
138 138
 		// start of row
139 139
 		$row_class = $options['odd'] ? 'item odd' : 'item';
140
-		$html = EEH_HTML::tr( '', '', $row_class );
140
+		$html = EEH_HTML::tr('', '', $row_class);
141 141
 		// name && desc
142 142
 		$name_and_desc = apply_filters(
143 143
 			'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__name',
@@ -146,22 +146,22 @@  discard block
 block discarded – undo
146 146
 		);
147 147
 		$name_and_desc .= apply_filters(
148 148
 			'FHEE__EE_Default_Line_Item_Display_Strategy__item_row__desc',
149
-			( $options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '' ),
149
+			($options['show_desc'] ? '<span class="line-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : ''),
150 150
 			$line_item,
151 151
 			$options
152 152
 		);
153
-		$name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">' . __( ' * taxable item', 'event_espresso' ) . '</span>' : '';
153
+		$name_and_desc .= $line_item->is_taxable() ? '<span class="smaller-text lt-grey-text" style="margin:0 0 0 2em;">'.__(' * taxable item', 'event_espresso').'</span>' : '';
154 154
 		// name td
155
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l' );
155
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l' );
156 156
 		// quantity td
157
-		$html .= EEH_HTML::td( $line_item->quantity(), '',  'item_l jst-rght' );
158
-		$tax_rate = $line_item->is_taxable() ? 1 + ( $this->_tax_rate / 100 ) : 1;
157
+		$html .= EEH_HTML::td($line_item->quantity(), '', 'item_l jst-rght');
158
+		$tax_rate = $line_item->is_taxable() ? 1 + ($this->_tax_rate / 100) : 1;
159 159
 		// price td
160
-		$unit_price = EEH_Template::format_currency( $line_item->unit_price() * $tax_rate, false, false );
161
-		$html .= EEH_HTML::td( $unit_price, '',  'item_c jst-rght' );
160
+		$unit_price = EEH_Template::format_currency($line_item->unit_price() * $tax_rate, false, false);
161
+		$html .= EEH_HTML::td($unit_price, '', 'item_c jst-rght');
162 162
 		// total td
163
-		$total = EEH_Template::format_currency( $line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false );
164
-		$html .= EEH_HTML::td( $total, '',  'item_r jst-rght' );
163
+		$total = EEH_Template::format_currency($line_item->unit_price() * $line_item->quantity() * $tax_rate, false, false);
164
+		$html .= EEH_HTML::td($total, '', 'item_r jst-rght');
165 165
 		// end of row
166 166
 		$html .= EEH_HTML::trx();
167 167
 
@@ -177,22 +177,22 @@  discard block
 block discarded – undo
177 177
 	 * @param array        $options
178 178
 	 * @return mixed
179 179
 	 */
180
-	private function _sub_item_row( EE_Line_Item $line_item, $options = array() ) {
180
+	private function _sub_item_row(EE_Line_Item $line_item, $options = array()) {
181 181
 		// start of row
182
-		$html = EEH_HTML::tr( '', 'item sub-item-row' );
182
+		$html = EEH_HTML::tr('', 'item sub-item-row');
183 183
 		// name && desc
184 184
 		$name_and_desc = $line_item->name();
185
-		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: ' . $line_item->desc() . '</span>' : '';
185
+		$name_and_desc .= $options['show_desc'] ? '<span class="line-sub-item-desc-spn smaller-text">: '.$line_item->desc().'</span>' : '';
186 186
 		// name td
187
-		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '',  'item_l sub-item' );
187
+		$html .= EEH_HTML::td( /*__FUNCTION__ .*/ $name_and_desc, '', 'item_l sub-item' );
188 188
 		// discount/surcharge td
189
-		if ( $line_item->is_percent() ) {
190
-			$html .= EEH_HTML::td( $line_item->percent() . '%', '',  'item_c' );
189
+		if ($line_item->is_percent()) {
190
+			$html .= EEH_HTML::td($line_item->percent().'%', '', 'item_c');
191 191
 		} else {
192
-			$html .= EEH_HTML::td( $line_item->unit_price_no_code(), '',  'item_c jst-rght' );
192
+			$html .= EEH_HTML::td($line_item->unit_price_no_code(), '', 'item_c jst-rght');
193 193
 		}
194 194
 		// total td
195
-		$html .= EEH_HTML::td( EEH_Template::format_currency( $line_item->total(), false, false ), '',  'item_r jst-rght' );
195
+		$html .= EEH_HTML::td(EEH_Template::format_currency($line_item->total(), false, false), '', 'item_r jst-rght');
196 196
 		// end of row
197 197
 		$html .= EEH_HTML::trx();
198 198
 		return $html;
Please login to merge, or discard this patch.