Completed
Branch FET/11104/replace-deprecated-b... (15008a)
by
unknown
13:29 queued 25s
created
form_sections/strategies/display/EE_Text_Area_Display_Strategy.strategy.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 		if( $input instanceof EE_Text_Area_Input ) {
11 11
 			$rows = $input->get_rows();
12 12
 			$cols = $input->get_cols();
13
-		}else{
13
+		} else{
14 14
 			$rows = 4;
15 15
 			$cols = 20;
16 16
 		}
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@
 block discarded – undo
4 4
 
5 5
 
6 6
 	/**
7
-	*
8
-	* @return string of html to display the field
9
-	*/
7
+	 *
8
+	 * @return string of html to display the field
9
+	 */
10 10
 	function display(){
11 11
 		$input = $this->_input;
12 12
 		$raw_value = maybe_serialize($input->raw_value());
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base{
2
+class EE_Text_Area_Display_Strategy extends EE_Display_Strategy_Base {
3 3
 
4 4
 
5 5
 
@@ -7,32 +7,32 @@  discard block
 block discarded – undo
7 7
 	*
8 8
 	* @return string of html to display the field
9 9
 	*/
10
-	function display(){
10
+	function display() {
11 11
 		$input = $this->_input;
12 12
 		$raw_value = maybe_serialize($input->raw_value());
13
-		if( $input instanceof EE_Text_Area_Input ) {
13
+		if ($input instanceof EE_Text_Area_Input) {
14 14
 			$rows = $input->get_rows();
15 15
 			$cols = $input->get_cols();
16
-		}else{
16
+		} else {
17 17
 			$rows = 4;
18 18
 			$cols = 20;
19 19
 		}
20 20
 		$html = '<textarea';
21
-		$html .= ' id="' . $input->html_id() . '"';
22
-		$html .= ' name="' . $input->html_name() . '"';
23
-		$html .= ' class="' . $input->html_class() . '"' ;
24
-		$html .= ' style="' . $input->html_style() . '"';
21
+		$html .= ' id="'.$input->html_id().'"';
22
+		$html .= ' name="'.$input->html_name().'"';
23
+		$html .= ' class="'.$input->html_class().'"';
24
+		$html .= ' style="'.$input->html_style().'"';
25 25
 		$html .= $input->other_html_attributes();
26
-		$html .= ' rows= "' . $rows . '" cols="' . $cols . '">';
26
+		$html .= ' rows= "'.$rows.'" cols="'.$cols.'">';
27 27
 		$html .= esc_textarea($raw_value);
28 28
 		$html .= '</textarea>';
29
-		foreach ( $this->_input->get_validation_strategies() as $validation_strategy ) {
29
+		foreach ($this->_input->get_validation_strategies() as $validation_strategy) {
30 30
 			if (
31 31
 				$validation_strategy instanceof EE_Simple_HTML_Validation_Strategy
32 32
 				|| $validation_strategy instanceof EE_Full_HTML_Validation_Strategy
33 33
 			) {
34 34
 				$html .= sprintf(
35
-					__( '%1$s(allowed tags: %2$s)%3$s', 'event_espresso' ),
35
+					__('%1$s(allowed tags: %2$s)%3$s', 'event_espresso'),
36 36
 					'<p class="ee-question-desc">',
37 37
 					$validation_strategy->get_list_of_allowed_tags(),
38 38
 					'</p>'
Please login to merge, or discard this patch.
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
 /**
7 8
  * Event Espresso
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
 /**
7 8
  * Event Espresso
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
 /**
7 8
  * Event Espresso
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
 /**
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_Many_Valued_Validation_Strategy.strategy.php 3 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,14 +11,14 @@  discard block
 block discarded – undo
11 11
  * @since 				4.6
12 12
  *
13 13
  */
14
-class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base{
14
+class EE_Many_Valued_Validation_Strategy extends EE_Validation_Strategy_Base {
15 15
 	protected $_individual_item_validation_strategies = array();
16 16
 	/**
17 17
 	 *
18 18
 	 * @param EE_Validation_Strategy_Base[] $individual_item_validation_strategies (or a single EE_Validation_Strategy_Base)
19 19
 	 */
20 20
 	public function __construct($individual_item_validation_strategies) {
21
-		if( ! is_array($individual_item_validation_strategies)){
21
+		if ( ! is_array($individual_item_validation_strategies)) {
22 22
 			$individual_item_validation_strategies = array($individual_item_validation_strategies);
23 23
 		}
24 24
 		$this->_individual_item_validation_strategies = $individual_item_validation_strategies;
@@ -30,14 +30,14 @@  discard block
 block discarded – undo
30 30
 	 * @return boolean
31 31
 	 */
32 32
 	function validate($normalized_value) {
33
-		if( is_array($normalized_value)){
33
+		if (is_array($normalized_value)) {
34 34
 			$items_to_validate = $normalized_value;
35
-		}else{
35
+		} else {
36 36
 			$items_to_validate = array($normalized_value);
37 37
 		}
38
-		foreach($items_to_validate as $individual_item){
39
-			foreach($this->_individual_item_validation_strategies as $validation_strategy){
40
-				if ( $validation_strategy instanceof EE_Validation_Strategy_Base ) {
38
+		foreach ($items_to_validate as $individual_item) {
39
+			foreach ($this->_individual_item_validation_strategies as $validation_strategy) {
40
+				if ($validation_strategy instanceof EE_Validation_Strategy_Base) {
41 41
 					$validation_strategy->validate($individual_item);
42 42
 				}
43 43
 			}
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 */
51 51
 	function _construct_finalize(\EE_Form_Input_Base $form_input) {
52 52
 		parent::_construct_finalize($form_input);
53
-		foreach($this->_individual_item_validation_strategies as $item_validation_strategy){
54
-			if ( $item_validation_strategy instanceof EE_Validation_Strategy_Base ) {
53
+		foreach ($this->_individual_item_validation_strategies as $item_validation_strategy) {
54
+			if ($item_validation_strategy instanceof EE_Validation_Strategy_Base) {
55 55
 				$item_validation_strategy->_construct_finalize($form_input);
56 56
 			}
57 57
 		}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
 	function validate($normalized_value) {
33 33
 		if( is_array($normalized_value)){
34 34
 			$items_to_validate = $normalized_value;
35
-		}else{
35
+		} else{
36 36
 			$items_to_validate = array($normalized_value);
37 37
 		}
38 38
 		foreach($items_to_validate as $individual_item){
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@
 block discarded – undo
45 45
 				}
46 46
 			}
47 47
 		}
48
-        return true;
49
-    }
48
+		return true;
49
+	}
50 50
 
51 51
 
52 52
 
Please login to merge, or discard this patch.