Completed
Branch BUG-6292-conflict-legacy-wp-me... (9adae4)
by
unknown
44:46 queued 30:08
created
sensitive_data_removal/EE_All_Sensitive_Data_Removal.strategy.php 2 patches
Spacing   +3 added lines, -3 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,9 +25,9 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_All_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
28
+class EE_All_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29 29
 	public function remove_sensitive_data($normalized_value) {
30
-		switch(gettype($normalized_value)){
30
+		switch (gettype($normalized_value)) {
31 31
 			case "boolean":
32 32
 				return false;
33 33
 			case "integer":
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
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
sensitive_data_removal/EE_CCV_Sensitive_Data_Removal.strategy.php 2 patches
Spacing   +5 added lines, -5 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,13 +25,13 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
29
-	public function remove_sensitive_data($normalized_value){
28
+class EE_CCV_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29
+	public function remove_sensitive_data($normalized_value) {
30 30
 		// Get the ccv Length
31 31
 		$ccv_lenght = strlen($normalized_value);
32 32
 		// Replace all characters of credit card except the last four and dashes
33
-		for($i=0; $i<$ccv_lenght; $i++){
34
-			if($normalized_value[$i] == '-'){continue;}
33
+		for ($i = 0; $i < $ccv_lenght; $i++) {
34
+			if ($normalized_value[$i] == '-') {continue; }
35 35
 			$normalized_value[$i] = 'X';
36 36
 		}
37 37
 		// Return the masked Credit Card #
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
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
sensitive_data_removal/EE_Credit_Card_Sensitive_Data_Removal.strategy.php 2 patches
Spacing   +5 added lines, -5 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,13 +25,13 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Credit_Card_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base{
29
-	public function remove_sensitive_data($normalized_value){
28
+class EE_Credit_Card_Sensitive_Data_Removal extends EE_Sensitive_Data_Removal_Base {
29
+	public function remove_sensitive_data($normalized_value) {
30 30
 		// Get the cc Length
31 31
 		$cc_length = strlen($normalized_value);
32 32
 		// Replace all characters of credit card except the last four and dashes
33
-		for($i=0; $i<$cc_length-4; $i++){
34
-			if($normalized_value[$i] == '-'){continue;}
33
+		for ($i = 0; $i < $cc_length - 4; $i++) {
34
+			if ($normalized_value[$i] == '-') {continue; }
35 35
 			$normalized_value[$i] = 'X';
36 36
 		}
37 37
 		// Return the masked Credit Card #
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
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
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
  * Event Espresso
7 8
  *
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
  * Event Espresso
7 8
  *
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
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
 		//so in case teh IPN is arriving later, let's try to process an IPN!
91 91
 		if($_SERVER['REQUEST_METHOD'] == 'POST'){
92 92
 			return $this->handle_ipn($_POST, $transaction );
93
-		}else{
93
+		} else{
94 94
 			return parent::finalize_payment_for( $transaction );
95 95
 		}
96 96
 	}
Please login to merge, or discard this patch.
strategies/validation/EE_Enum_Validation_Strategy.strategy.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3
- * Class EE_Enum_Validation_Strategy
4
- *
5
- * @package 			Event Espresso
6
- * @subpackage 	core
7
- * @author 				Mike Nelson
8
- * @since 				4.6
9
- *
10
- */
3
+    * Class EE_Enum_Validation_Strategy
4
+    *
5
+    * @package 			Event Espresso
6
+    * @subpackage 	core
7
+    * @author 				Mike Nelson
8
+    * @since 				4.6
9
+    *
10
+    */
11 11
 class EE_Enum_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	/**
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
 	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.
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.
strategies/validation/EE_Float_Validation_Strategy.strategy.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,16 +8,16 @@  discard block
 block discarded – undo
8 8
  * @since 				4.6
9 9
  *
10 10
  */
11
-class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base{
11
+class EE_Float_Validation_Strategy extends EE_Validation_Strategy_Base {
12 12
 
13 13
 	/**
14 14
 	 * @param null $validation_error_message
15 15
 	 */
16
-	public function __construct( $validation_error_message = NULL ) {
17
-		if( ! $validation_error_message ){
16
+	public function __construct($validation_error_message = NULL) {
17
+		if ( ! $validation_error_message) {
18 18
 			$validation_error_message = sprintf(__("Only numeric characters, commas, periods, and spaces, please!", "event_espresso"));
19 19
 		}
20
-		parent::__construct( $validation_error_message );
20
+		parent::__construct($validation_error_message);
21 21
 	}
22 22
 
23 23
 
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 	/**
37 37
 	 * @return array
38 38
 	 */
39
-	function get_jquery_validation_rule_array(){
40
-		return array('number'=>true, 'messages' => array( 'number' => $this->get_validation_error_message() ) );
39
+	function get_jquery_validation_rule_array() {
40
+		return array('number'=>true, 'messages' => array('number' => $this->get_validation_error_message()));
41 41
 	}
42 42
 }
43 43
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	 * just checks the field isn't blank
27 27
 	 *
28 28
 	 * @param $normalized_value
29
-	 * @return bool
29
+	 * @return boolean|null
30 30
 	 * @throws \EE_Validation_Error
31 31
 	 */
32 32
 	function validate($normalized_value) {
Please login to merge, or discard this patch.
strategies/validation/EE_Full_HTML_Validation_Strategy.strategy.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -10,21 +10,21 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6
11 11
  *
12 12
  */
13
-class EE_Full_HTML_Validation_Strategy extends EE_Validation_Strategy_Base{
13
+class EE_Full_HTML_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 ) {
18
+	public function __construct($validation_error_message = NULL) {
19
+		if ( ! $validation_error_message) {
20 20
 			global $allowedposttags;
21 21
 			$validation_error_message = sprintf(
22
-				__( 'Only the following HTML tags are allowed:%1$s%2$s', "event_espresso" ),
22
+				__('Only the following HTML tags are allowed:%1$s%2$s', "event_espresso"),
23 23
 				'<br />',
24
-				implode( ",", array_keys( $allowedposttags ) )
24
+				implode(",", array_keys($allowedposttags))
25 25
 			);
26 26
 		}
27
-		parent::__construct( $validation_error_message );
27
+		parent::__construct($validation_error_message);
28 28
 	}
29 29
 
30 30
 
@@ -35,10 +35,10 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function validate($normalized_value) {
37 37
 		global $allowedposttags;
38
-		parent::validate( $normalized_value );
39
-		$normalized_value_sans_tags =  wp_kses( "$normalized_value", $allowedposttags );
40
-		if ( strlen( $normalized_value ) > strlen( $normalized_value_sans_tags ) ) {
41
-			throw new EE_Validation_Error( $this->get_validation_error_message(), 'complex_html_tags' );
38
+		parent::validate($normalized_value);
39
+		$normalized_value_sans_tags = wp_kses("$normalized_value", $allowedposttags);
40
+		if (strlen($normalized_value) > strlen($normalized_value_sans_tags)) {
41
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'complex_html_tags');
42 42
 		}
43 43
 	}
44 44
 }
45 45
\ No newline at end of file
Please login to merge, or discard this patch.