Completed
Branch BUG/11302/correct-error-messag... (c1271c)
by
unknown
121:27 queued 108:10
created
strategies/sensitive_data_removal/EE_No_Sensitive_Data_Removal.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
-class EE_No_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
28
+class EE_No_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29 29
 	public function remove_sensitive_data($normalized_value) {
30 30
 		return $normalized_value;
31 31
 	}
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.
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.
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.
core/libraries/line_item_display/EE_Line_Item_Display.class.php 2 patches
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.
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
- * 
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
+  * 
12
+  *
13
+  */
14 14
 class EE_Line_Item_Display {
15 15
 
16 16
 	private $strategy = NULL;
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.