Completed
Branch FET-9413-questions-refactor (536482)
by
unknown
1359:50 queued 1344:50
created
core/libraries/form_sections/base/EE_Form_Section_Validatable.form.php 2 patches
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 
5 5
 /**
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
  *
35 35
  * ------------------------------------------------------------------------
36 36
  */
37
-abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base{
37
+abstract class EE_Form_Section_Validatable extends EE_Form_Section_Base {
38 38
 
39 39
 	/**
40 40
 	 * Array of validation errors in this section. Does not contain validation errors in subsections, however.
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 * called get_validation_errors_accumulated
50 50
 	 * @return EE_Validation_Error[]
51 51
 	 */
52
-	public function get_validation_errors(){
52
+	public function get_validation_errors() {
53 53
 		return $this->_validation_errors;
54 54
 	}
55 55
 	/**
@@ -57,16 +57,16 @@  discard block
 block discarded – undo
57 57
 	 * If we want this to be customizable, we may decide to create a strategy for displaying it.
58 58
 	 * @return string
59 59
 	 */
60
-	public function get_validation_error_string(){
60
+	public function get_validation_error_string() {
61 61
 		$validation_error_messages = array();
62
-		if($this->get_validation_errors()){
63
-			foreach($this->get_validation_errors() as $validation_error){
64
-				if ( $validation_error instanceof EE_Validation_Error ) {
65
-					$validation_error_messages[] =$validation_error->getMessage();
62
+		if ($this->get_validation_errors()) {
63
+			foreach ($this->get_validation_errors() as $validation_error) {
64
+				if ($validation_error instanceof EE_Validation_Error) {
65
+					$validation_error_messages[] = $validation_error->getMessage();
66 66
 				}
67 67
 			}
68 68
 		}
69
-		return implode(", ",$validation_error_messages);
69
+		return implode(", ", $validation_error_messages);
70 70
 	}
71 71
 
72 72
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @return boolean
83 83
 	 */
84 84
 	public function is_valid() {
85
-		if(count($this->_validation_errors)){
85
+		if (count($this->_validation_errors)) {
86 86
 			return false;
87
-		}else{
87
+		} else {
88 88
 			return true;
89 89
 		}
90 90
 	}
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
 	 * @param Exception $previous_exception if there was an exception that caused the error, that exception
110 110
 	 * @return void
111 111
 	 */
112
-	function add_validation_error( $message_or_object, $error_code = NULL, $previous_exception = NULL ){
113
-		if($message_or_object instanceof EE_Validation_Error){
114
-			$validation_error= $message_or_object;
112
+	function add_validation_error($message_or_object, $error_code = NULL, $previous_exception = NULL) {
113
+		if ($message_or_object instanceof EE_Validation_Error) {
114
+			$validation_error = $message_or_object;
115 115
 			$validation_error->set_form_section($this);
116
-		}else{
116
+		} else {
117 117
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
118 118
 		}
119 119
 		$this->_validation_errors[] = $validation_error;
Please login to merge, or discard this patch.
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if (!defined('EVENT_ESPRESSO_VERSION')) {
3 3
 	exit('No direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
@@ -84,7 +85,7 @@  discard block
 block discarded – undo
84 85
 	public function is_valid() {
85 86
 		if(count($this->_validation_errors)){
86 87
 			return false;
87
-		}else{
88
+		} else{
88 89
 			return true;
89 90
 		}
90 91
 	}
@@ -113,7 +114,7 @@  discard block
 block discarded – undo
113 114
 		if($message_or_object instanceof EE_Validation_Error){
114 115
 			$validation_error= $message_or_object;
115 116
 			$validation_error->set_form_section($this);
116
-		}else{
117
+		} else{
117 118
 			$validation_error = new EE_Validation_Error($message_or_object, $error_code, $this, $previous_exception);
118 119
 		}
119 120
 		$this->_validation_errors[] = $validation_error;
Please login to merge, or discard this patch.
core/libraries/form_sections/helpers/EE_Validation_Error.error.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class EE_Validation_Error extends Exception{
3
+class EE_Validation_Error extends Exception {
4 4
 	/**
5 5
 	 * Form Section from which this error originated.
6 6
 	 * @var EE_Form_Section
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 	 * @param EE_Form_Section_Validatable $form_section
21 21
 	 * @param Exception $previous if there was an exception that caused this exception
22 22
 	 */
23
-	function __construct( $message = null, $string_code = null,$form_section = null, $previous = null){
23
+	function __construct($message = null, $string_code = null, $form_section = null, $previous = null) {
24 24
 		$this->_form_section = $form_section;
25 25
 		$this->_string_code = $string_code;
26 26
 		parent::__construct($message, 500, $previous);
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * returns teh form section which caused the error.
31 31
 	 * @return EE_Form_Section_Validatable
32 32
 	 */
33
-	public function get_form_section(){
33
+	public function get_form_section() {
34 34
 		return $this->_form_section;
35 35
 	}
36 36
 	/**
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 * @param EE_Form_Section_Validatable $form_section
39 39
 	 * @return void
40 40
 	 */
41
-	public function set_form_section($form_section){
41
+	public function set_form_section($form_section) {
42 42
 		$this->_form_section = $form_section;
43 43
 	}
44 44
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Credit_Card_Month_Input.input.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 
5 5
 /**
@@ -24,14 +24,14 @@  discard block
 block discarded – undo
24 24
  *
25 25
  * ------------------------------------------------------------------------
26 26
  */
27
-class EE_Credit_Card_Month_Input extends EE_Month_Input{
27
+class EE_Credit_Card_Month_Input extends EE_Month_Input {
28 28
 
29 29
 	/**
30 30
 	 * @param bool  $leading_zero
31 31
 	 * @param array $input_settings
32 32
 	 */
33
-	function __construct( $leading_zero = false, $input_settings = array()){
34
-		$this->set_sensitive_data_removal_strategy( new EE_All_Sensitive_Data_Removal() );
35
-		parent::__construct($leading_zero,$input_settings);
33
+	function __construct($leading_zero = false, $input_settings = array()) {
34
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
35
+		parent::__construct($leading_zero, $input_settings);
36 36
 	}
37 37
 }
38 38
\ No newline at end of file
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.
core/libraries/form_sections/inputs/EE_Credit_Card_Year_Input.input.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION'))
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('No direct script access allowed');
4 4
 
5 5
 /**
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  * @subpackage
10 10
  * @author				Mike Nelson
11 11
  */
12
-class EE_Credit_Card_Year_Input extends EE_Year_Input{
12
+class EE_Credit_Card_Year_Input extends EE_Year_Input {
13 13
 
14 14
 	/**
15 15
 	 * @param array $input_settings
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param int   $years_behind
18 18
 	 * @param int   $years_ahead
19 19
 	 */
20
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15 ){
21
-		$this->set_sensitive_data_removal_strategy( new EE_All_Sensitive_Data_Removal() );
22
-		parent::__construct( $input_settings, $four_digit_year, $years_behind, $years_ahead );
20
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 0, $years_ahead = 15) {
21
+		$this->set_sensitive_data_removal_strategy(new EE_All_Sensitive_Data_Removal());
22
+		parent::__construct($input_settings, $four_digit_year, $years_behind, $years_ahead);
23 23
 	}
24 24
 }
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.
core/libraries/form_sections/inputs/EE_Fixed_Hidden_Input.input.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Brent Christensen
8 8
  */
9
-class EE_Fixed_Hidden_Input extends EE_Hidden_Input{
9
+class EE_Fixed_Hidden_Input extends EE_Hidden_Input {
10 10
 
11 11
 
12 12
 	/**
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	 * @param array $req_data like $_POST
18 18
 	 * @return boolean whether or not there was an error
19 19
 	 */
20
-	protected function _normalize( $req_data ) {
20
+	protected function _normalize($req_data) {
21 21
 	}
22 22
 
23 23
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Month_Input.input.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Month_Input extends EE_Select_Input{
9
+class EE_Month_Input extends EE_Select_Input {
10 10
 
11 11
 	/**
12 12
 	 * @param bool  $leading_zero
13 13
 	 * @param array $input_settings
14 14
 	 */
15
-	function __construct( $leading_zero = false, $input_settings = array()){
16
-		if($leading_zero){
15
+	function __construct($leading_zero = false, $input_settings = array()) {
16
+		if ($leading_zero) {
17 17
 			$select_options = array(
18 18
 			'01'=>'01',
19 19
 			'02'=>'02',
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 			'11'=>'11',
29 29
 			'12'=>'12'
30 30
 			);
31
-		}else{
31
+		} else {
32 32
 			$select_options = array(
33 33
 				1=>'01',
34 34
 				2=>'02',
@@ -44,6 +44,6 @@  discard block
 block discarded – undo
44 44
 				12=>'12'
45 45
 			);
46 46
 		}
47
-		parent::__construct($select_options,$input_settings);
47
+		parent::__construct($select_options, $input_settings);
48 48
 	}
49 49
 }
50 50
\ No newline at end of file
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.
core/libraries/form_sections/inputs/EE_Select_Multi_Model_Input.input.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		foreach( $answer_options as $model_obj ){
53 53
 			if( $this->_naming_method ){
54 54
 				$display_value = call_user_func( array( $model_obj, $this->_naming_method ));
55
-			}else{
55
+			} else{
56 56
 				$display_value = $model_obj->name();
57 57
 			}
58 58
 			$select_options[ $model_obj->ID() ] = $display_value;
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		foreach($values as $key => $value){
73 73
 			if($value instanceof EE_Base_Class){
74 74
 				$defaults_as_simple_ids[] = $value->ID();
75
-			}else{
75
+			} else{
76 76
 				$defaults_as_simple_ids[] = $value;
77 77
 			}
78 78
 		}
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @subpackage
9 9
  * @author				Mike Nelson
10 10
  */
11
-class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input{
11
+class EE_Select_Multi_Model_Input extends EE_Select_Multiple_Input {
12 12
 
13 13
 
14 14
 	protected $_naming_method;
@@ -24,18 +24,18 @@  discard block
 block discarded – undo
24 24
 	 *     example: 	if the class were an EE_Event, this could be slug(), description(), name() (default)
25 25
 	 * }
26 26
 	 */
27
-	public function __construct( $answer_options = array(), $input_settings = array() ) {
28
-		if( isset( $input_settings['naming_method'] )){
29
-			$this->set_option_naming_method( $input_settings['naming_method'] );
27
+	public function __construct($answer_options = array(), $input_settings = array()) {
28
+		if (isset($input_settings['naming_method'])) {
29
+			$this->set_option_naming_method($input_settings['naming_method']);
30 30
 		}
31
-		parent::__construct( $answer_options, $input_settings );
31
+		parent::__construct($answer_options, $input_settings);
32 32
 	}
33 33
 
34 34
 	/**
35 35
 	 * Sets the method name which will be called when outputting the options list
36 36
 	 * @param string $method
37 37
 	 */
38
-	public function set_option_naming_method($method){
38
+	public function set_option_naming_method($method) {
39 39
 		$this->_naming_method = $method;
40 40
 	}
41 41
 
@@ -46,19 +46,19 @@  discard block
 block discarded – undo
46 46
 	 * @param EE_Base_Class[] $answer_options
47 47
 	 * @return null|void
48 48
 	 */
49
-	public function set_select_options( $answer_options = array() ) {
49
+	public function set_select_options($answer_options = array()) {
50 50
 		//convert the model objects to select from into normal select options
51 51
 		$select_options = array();
52
-		foreach( $answer_options as $model_obj ){
53
-			if ( ! $model_obj instanceof EE_Base_Class ) {
52
+		foreach ($answer_options as $model_obj) {
53
+			if ( ! $model_obj instanceof EE_Base_Class) {
54 54
 				continue;
55 55
 			}
56
-			if( $this->_naming_method ){
57
-				$display_value = call_user_func( array( $model_obj, $this->_naming_method ));
58
-			}else{
56
+			if ($this->_naming_method) {
57
+				$display_value = call_user_func(array($model_obj, $this->_naming_method));
58
+			} else {
59 59
 				$display_value = $model_obj->name();
60 60
 			}
61
-			$select_options[ $model_obj->ID() ] = $display_value;
61
+			$select_options[$model_obj->ID()] = $display_value;
62 62
 		}
63 63
 		parent::set_select_options($select_options);
64 64
 	}
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
 	 * into the format EE_Select_Multiple expects
71 71
 	 * @param EE_Base_Class[]|array $values
72 72
 	 */
73
-	public function set_default($values){
73
+	public function set_default($values) {
74 74
 		$defaults_as_simple_ids = array();
75
-		foreach($values as $key => $value){
76
-			if($value instanceof EE_Base_Class){
75
+		foreach ($values as $key => $value) {
76
+			if ($value instanceof EE_Base_Class) {
77 77
 				$defaults_as_simple_ids[] = $value->ID();
78
-			}else{
78
+			} else {
79 79
 				$defaults_as_simple_ids[] = $value;
80 80
 			}
81 81
 		}
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Submit_Input.input.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,15 +8,15 @@
 block discarded – undo
8 8
  *
9 9
  * This input has a default validation strategy of plaintext (which can be removed after construction)
10 10
  */
11
-class EE_Submit_Input extends EE_Form_Input_Base{
11
+class EE_Submit_Input extends EE_Form_Input_Base {
12 12
 
13 13
 	/**
14 14
 	 * @param array $options
15 15
 	 */
16
-	function __construct($options = array()){
16
+	function __construct($options = array()) {
17 17
 		$this->_set_display_strategy(new EE_Submit_Input_Display_Strategy());
18 18
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
19
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
19
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
20 20
 		parent::__construct($options);
21 21
 	}
22 22
 }
23 23
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Text_Input.input.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,18 +8,18 @@
 block discarded – undo
8 8
  *
9 9
  * This input has a default validation strategy of plaintext (which can be removed after construction)
10 10
  */
11
-class EE_Text_Input extends EE_Form_Input_Base{
11
+class EE_Text_Input extends EE_Form_Input_Base {
12 12
 
13 13
 
14 14
 	/**
15 15
 	 * @param array $options
16 16
 	 */
17
-	function __construct($options = array()){
17
+	function __construct($options = array()) {
18 18
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
19 19
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
20 20
 		//by default we use the plaintext validation. If you want something else,
21 21
 		//just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
22
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
22
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
23 23
 		parent::__construct($options);
24 24
 	}
25 25
 
Please login to merge, or discard this patch.