Completed
Branch BUG-7527-answer-question-group (0815fc)
by
unknown
23:31 queued 13:12
created
core/libraries/form_sections/inputs/EE_Text_Area_Input.input.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 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_Area_Input extends EE_Form_Input_Base{
11
+class EE_Text_Area_Input extends EE_Form_Input_Base {
12 12
 
13 13
 
14 14
 	protected $_rows = 2;
@@ -18,28 +18,28 @@  discard block
 block discarded – undo
18 18
 	 * sets the rows property on this input
19 19
 	 * @param int $rows
20 20
 	 */
21
-	public function set_rows( $rows ) {
21
+	public function set_rows($rows) {
22 22
 		$this->_rows = $rows;
23 23
 	}
24 24
 	/**
25 25
 	 * sets the cols html property on this input
26 26
 	 * @param int $cols
27 27
 	 */
28
-	public function set_cols( $cols ) {
28
+	public function set_cols($cols) {
29 29
 		$this->_cols = $cols;
30 30
 	}
31 31
 	/**
32 32
 	 *
33 33
 	 * @return int
34 34
 	 */
35
-	public function get_rows(){
35
+	public function get_rows() {
36 36
 		return $this->_rows;
37 37
 	}
38 38
 	/**
39 39
 	 *
40 40
 	 * @return int
41 41
 	 */
42
-	public function get_cols(){
42
+	public function get_cols() {
43 43
 		return $this->_cols;
44 44
 	}
45 45
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
54 54
 		//by default we use the plaintext validation. If you want something else,
55 55
 		//just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
56
-		$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
56
+		$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
57 57
 		parent::__construct($options_array);
58 58
 	}
59 59
 }
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.
core/libraries/form_sections/inputs/EE_Year_Input.input.php 2 patches
Spacing   +7 added lines, -7 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,18 +24,18 @@  discard block
 block discarded – undo
24 24
  *
25 25
  * ------------------------------------------------------------------------
26 26
  */
27
-class EE_Year_Input extends EE_Select_Input{
27
+class EE_Year_Input extends EE_Select_Input {
28 28
 
29
-	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 1, $years_ahead = 15 ){
30
-		if($four_digit_year){
29
+	function __construct($input_settings = array(), $four_digit_year = true, $years_behind = 1, $years_ahead = 15) {
30
+		if ($four_digit_year) {
31 31
 			$current_year_int = intval(date('Y'));
32
-		}else{
32
+		} else {
33 33
 			$current_year_int = intval(date('y'));
34 34
 		}
35 35
 		$answer_options = array();
36
-		for( $start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++){
36
+		for ($start = $current_year_int - $years_behind; $start <= ($current_year_int + $years_ahead); $start++) {
37 37
 			$answer_options[$start] = $start;
38 38
 		}
39
-		parent::__construct( $answer_options, $input_settings );
39
+		parent::__construct($answer_options, $input_settings);
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 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
@@ -29,7 +30,7 @@  discard block
 block discarded – undo
29 30
 	function __construct( $input_settings = array(), $four_digit_year = true, $years_behind = 1, $years_ahead = 15 ){
30 31
 		if($four_digit_year){
31 32
 			$current_year_int = intval(date('Y'));
32
-		}else{
33
+		} else{
33 34
 			$current_year_int = intval(date('y'));
34 35
 		}
35 36
 		$answer_options = array();
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Yes_No_Input.input.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,14 +6,14 @@
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_Yes_No_Input extends EE_Select_Input{
9
+class EE_Yes_No_Input extends EE_Select_Input {
10 10
 
11 11
 	/**
12 12
 	 * @param array $options
13 13
 	 */
14
-	function __construct( $options = array()){
15
-		$select_options = array(true=>  __("Yes", "event_espresso"),false=>  __("No", "event_espresso"));
14
+	function __construct($options = array()) {
15
+		$select_options = array(true=>  __("Yes", "event_espresso"), false=>  __("No", "event_espresso"));
16 16
 
17
-		parent::__construct($select_options,$options);
17
+		parent::__construct($select_options, $options);
18 18
 	}
19 19
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  *
4 4
  * EE_Billing_Info_Form
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @author				Mike Nelson
12 12
  *
13 13
  */
14
-class EE_Billing_Info_Form extends EE_Form_Section_Proper{
14
+class EE_Billing_Info_Form extends EE_Form_Section_Proper {
15 15
 
16 16
 	/**
17 17
 	 * The payment method this billing form is for
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
 	 * @param EE_Payment_Method $payment_method
27 27
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
28 28
 	 */
29
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
29
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
30 30
 		$this->_pm_instance = $payment_method;
31 31
 		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
32
-		parent::__construct( $options_array );
32
+		parent::__construct($options_array);
33 33
 
34 34
 	}
35 35
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param EE_Payment_Method $payment_method
41 41
 	 * @return void
42 42
 	 */
43
-	public function set_payment_method( EE_Payment_Method $payment_method ){
43
+	public function set_payment_method(EE_Payment_Method $payment_method) {
44 44
 		$this->_pm_instance = $payment_method;
45 45
 	}
46 46
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * Returns the instance of the payment method this billing form is for
51 51
 	 * @return EE_Payment_Method
52 52
 	 */
53
-	public function payment_method(){
53
+	public function payment_method() {
54 54
 		return $this->_pm_instance;
55 55
 	}
56 56
 
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 	 * payment_fields_autofilled_notice_html
61 61
 	 * @return string
62 62
 	 */
63
-	public function payment_fields_autofilled_notice_html(){
64
-		EE_Registry::instance()->load_helper( 'HTML' );
63
+	public function payment_fields_autofilled_notice_html() {
64
+		EE_Registry::instance()->load_helper('HTML');
65 65
 		return  new EE_Form_Section_HTML(
66 66
 			EEH_HTML::p(
67
-				apply_filters( 'FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __( 'Payment fields have been autofilled because you are in debug mode', 'event_espresso' )),
67
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
68 68
 				'',
69 69
 				'important-notice'
70 70
 			)
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
 	/**
77 77
 	 * @return string
78 78
 	 */
79
-	public function html_class(){
80
-		return ! empty( $this->_html_class ) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
79
+	public function html_class() {
80
+		return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
81 81
 	}
82 82
 
83 83
 
Please login to merge, or discard this patch.
libraries/form_sections/strategies/EE_Form_Input_Strategy_Base.strategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,14 +3,14 @@  discard block
 block discarded – undo
3 3
  * base class for all strategies which operate on form inputs. Generally, they
4 4
  * all need to know about the form input they are operating on.
5 5
  */
6
-abstract class EE_Form_Input_Strategy_Base{
6
+abstract class EE_Form_Input_Strategy_Base {
7 7
 	/**
8 8
 	 * Form Input to display
9 9
 	 * @var EE_Form_Input_Base
10 10
 	 */
11 11
 	protected $_input;
12 12
 	
13
-	function __construct(){
13
+	function __construct() {
14 14
 		
15 15
 	}
16 16
 
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * The form input on which this strategy is to perform
19 19
 	 * @param EE_Form_Input_Base $form_input
20 20
 	 */
21
-	function _construct_finalize(EE_Form_Input_Base $form_input){
21
+	function _construct_finalize(EE_Form_Input_Base $form_input) {
22 22
 		$this->_input = $form_input;
23 23
 	}
24 24
 }
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
strategies/display/EE_Admin_File_Uploader_Display_Strategy.strategy.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @since                4.6
9 9
  *
10 10
  */
11
-class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base{
11
+class EE_Admin_File_Uploader_Display_Strategy extends EE_Display_Strategy_Base {
12 12
 
13 13
 	/**
14 14
 	 * return EE_Admin_File_Uploader_Display_Strategy
@@ -29,10 +29,10 @@  discard block
 block discarded – undo
29 29
 	 * Besides that, no special consideration should be required to make the media uploader appear, besides having
30 30
 	 * this input displayed.
31 31
 	 */
32
-	static function enqueue_scripts(){
32
+	static function enqueue_scripts() {
33 33
 		wp_enqueue_media();
34 34
 		wp_enqueue_script('media-upload');
35
-		wp_enqueue_script('ee-payments',EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
35
+		wp_enqueue_script('ee-payments', EE_GLOBAL_ASSETS_URL.'scripts/ee-media-uploader.js');
36 36
 	}
37 37
 
38 38
 
@@ -42,20 +42,20 @@  discard block
 block discarded – undo
42 42
 	 * @return string of html to display the field
43 43
 	 */
44 44
 
45
-	function display(){
45
+	function display() {
46 46
 
47
-		EE_Registry::instance()->load_helper( 'HTML' );
47
+		EE_Registry::instance()->load_helper('HTML');
48 48
 		// the actual input
49 49
 		$input = '<input type="text" size="34" ';
50
-		$input .= 'name="' . $this->_input->html_name() . '" ';
51
-		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url ' . $this->_input->html_class() . '" ' : 'class="large-text ee_media_url" ';
52
-		$input .= 'value="' . $this->_input->raw_value_in_form() . '">';
50
+		$input .= 'name="'.$this->_input->html_name().'" ';
51
+		$input .= $this->_input->html_class() != '' ? 'class="large-text ee_media_url '.$this->_input->html_class().'" ' : 'class="large-text ee_media_url" ';
52
+		$input .= 'value="'.$this->_input->raw_value_in_form().'">';
53 53
 		// image uploader
54
-		$uploader = EEH_HTML::link( '#', '<img src="' . admin_url( 'images/media-button-image.gif' ) . '" >', __( 'click to add an image', 'event_espresso' ), '', 'ee_media_upload' );
54
+		$uploader = EEH_HTML::link('#', '<img src="'.admin_url('images/media-button-image.gif').'" >', __('click to add an image', 'event_espresso'), '', 'ee_media_upload');
55 55
 		//only attempt to show the image if it at least exists
56
-		$image = $this->src_exists( $this->_input->raw_value() ) ? EEH_HTML::br(2) . EEH_HTML::img( $this->_input->raw_value(), __( 'logo', 'event_espresso' ), '', 'ee_media_image' ) : '';
56
+		$image = $this->src_exists($this->_input->raw_value()) ? EEH_HTML::br(2).EEH_HTML::img($this->_input->raw_value(), __('logo', 'event_espresso'), '', 'ee_media_image') : '';
57 57
 		// html string
58
-		return EEH_HTML::div( $input . EEH_HTML::nbsp() . $uploader . $image, '', 'ee_media_uploader_area' );
58
+		return EEH_HTML::div($input.EEH_HTML::nbsp().$uploader.$image, '', 'ee_media_uploader_area');
59 59
 	}
60 60
 
61 61
 
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 	 * @param string $src
67 67
 	 * @return boolean
68 68
 	 */
69
-	protected function src_exists( $src ){
70
-		$results = wp_remote_head( $src );
71
-		if( is_array( $results) && ! $results instanceof WP_Error){
72
-			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
73
-		}else{
69
+	protected function src_exists($src) {
70
+		$results = wp_remote_head($src);
71
+		if (is_array($results) && ! $results instanceof WP_Error) {
72
+			return strpos($results['headers']['content-type'], "image") !== FALSE;
73
+		} else {
74 74
 			return FALSE;
75 75
 		}
76 76
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 		$results = wp_remote_head( $src );
71 71
 		if( is_array( $results) && ! $results instanceof WP_Error){
72 72
 			return strpos($results['headers']['content-type'], "image" ) !== FALSE;
73
-		}else{
73
+		} else{
74 74
 			return FALSE;
75 75
 		}
76 76
 	}
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Display_Strategy_Base.strategy.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @since               	4.6
9 9
  *
10 10
  */
11
-abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base{
11
+abstract class EE_Display_Strategy_Base extends EE_Form_Input_Strategy_Base {
12 12
 	/**
13 13
 	 * returns HTML and javascript related to the displaying of this input
14 14
 	 * @return string
@@ -24,10 +24,10 @@  discard block
 block discarded – undo
24 24
 	 * @param string $chars - exact string of characters to remove
25 25
 	 * @return string
26 26
 	 */
27
-	protected function _remove_chars( $string = '', $chars = '-' ) {
28
-		$char_length = strlen( $chars ) * -1;
27
+	protected function _remove_chars($string = '', $chars = '-') {
28
+		$char_length = strlen($chars) * -1;
29 29
 		// if last three characters of string is  " - ", then remove it
30
-		return substr( $string, $char_length ) == $chars ? substr( $string, 0, $char_length ) : $string;
30
+		return substr($string, $char_length) == $chars ? substr($string, 0, $char_length) : $string;
31 31
 	}
32 32
 
33 33
 
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	 * @param string $chars - exact string of characters to be added to end of string
40 40
 	 * @return string
41 41
 	 */
42
-	protected function _append_chars( $string = '', $chars = '-' ) {
43
-		return  $this->_remove_chars( $string, $chars ) . $chars;
42
+	protected function _append_chars($string = '', $chars = '-') {
43
+		return  $this->_remove_chars($string, $chars).$chars;
44 44
 	}
45 45
 
46 46
 
Please login to merge, or discard this patch.
form_sections/strategies/display/EE_Hidden_Display_Strategy.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,12 +25,12 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base{
28
+class EE_Hidden_Display_Strategy extends EE_Display_Strategy_Base {
29 29
 	/**
30 30
 	 * 
31 31
 	 * @return string of html to display the HIDDEN field
32 32
 	 */
33
-	function display(){
33
+	function display() {
34 34
 		$input = $this->_input;		
35 35
 		return "<input type='hidden' id='{$input->html_id()}' name='{$input->html_name()}' class='{$input->html_class()}' style='{$input->html_style()}' value='{$input->raw_value_in_form()}'/>";
36 36
 	}
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.