Completed
Pull Request — staging (#840)
by
unknown
18:46
created
src/View/PostEscapedView.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 	 * @return string Rendered HTML.
56 56
 	 * @throws FailedToLoadView If the View URI could not be loaded.
57 57
 	 */
58
-	public function render( array $context = [] ) {
58
+	public function render( array $context = [ ] ) {
59 59
 		return wp_kses_post( $this->view->render( $context ) );
60 60
 	}
61 61
 
Please login to merge, or discard this patch.
src/View/View.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 	 * @return string Rendered HTML.
34 34
 	 * @throws FailedToLoadView If the View URI could not be loaded.
35 35
 	 */
36
-	public function render( array $context = [] );
36
+	public function render( array $context = [ ] );
37 37
 
38 38
 	/**
39 39
 	 * Render a partial view.
Please login to merge, or discard this patch.
src/Shortcode/BaseShortcode.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	public function register() {
41 41
 		$this->register_assets();
42 42
 
43
-		add_action( 'init', function () {
43
+		add_action( 'init', function() {
44 44
 			add_shortcode( $this->get_tag(), [ $this, 'process_shortcode' ] );
45 45
 		} );
46 46
 	}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 *
71 71
 	 * @return string Rendered HTML.
72 72
 	 */
73
-	public function render( array $context = [] ) {
73
+	public function render( array $context = [ ] ) {
74 74
 		try {
75 75
 			$this->enqueue_assets();
76 76
 			$view = new PostEscapedView( new TemplatedView( $this->get_view_uri() ) );
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * @return array Context to pass onto view.
111 111
 	 */
112 112
 	protected function get_context( array $atts ) {
113
-		return [];
113
+		return [ ];
114 114
 	}
115 115
 
116 116
 	/**
Please login to merge, or discard this patch.
src/View/FormEscapedView.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 *
95 95
 	 * @var array
96 96
 	 */
97
-	private $allowed_tags = [];
97
+	private $allowed_tags = [ ];
98 98
 
99 99
 	/**
100 100
 	 * Instantiate a FormEscapedView object.
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 * @return string Rendered HTML.
142 142
 	 * @throws FailedToLoadView If the View URI could not be loaded.
143 143
 	 */
144
-	public function render( array $context = [] ) {
144
+	public function render( array $context = [ ] ) {
145 145
 		return wp_kses( $this->view->render( $context ), $this->allowed_tags );
146 146
 	}
147 147
 
Please login to merge, or discard this patch.
src/Model/OptinForm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 * @return bool Whether the form was successfully updated.
49 49
 	 */
50 50
 	public function update_form( $form_id, $data ) {
51
-		$data['id'] = $form_id;
51
+		$data[ 'id' ] = $form_id;
52 52
 		$all_forms  = $this->get_all_forms();
53 53
 
54 54
 		if ( ! isset( $all_forms[ $form_id ] ) ) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 		$all_ids         = $this->get_form_ids();
80 80
 		$last_id         = end( $all_ids );
81 81
 		$new_id          = false === $last_id ? 1 : $last_id + 1;
82
-		$form_data['id'] = $new_id;
82
+		$form_data[ 'id' ] = $new_id;
83 83
 
84 84
 		// Ensure our data is consistently sorted
85 85
 		ksort( $form_data );
Please login to merge, or discard this patch.
src/Exception/InvalidRecaptcha.php 3 patches
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,6 @@  discard block
 block discarded – undo
23 23
 	 *
24 24
 	 * @since %VERSION%
25 25
 	 *
26
-	 * @param string $field Class name of the service that was not recognized.
27 26
 	 *
28 27
 	 * @return static
29 28
 	 */
@@ -41,7 +40,6 @@  discard block
 block discarded – undo
41 40
 	 *
42 41
 	 * @since %VERSION%
43 42
 	 *
44
-	 * @param string $field Class name of the service that was not recognized.
45 43
 	 *
46 44
 	 * @return static
47 45
 	 */
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,25 +29,25 @@
 block discarded – undo
29 29
 	 */
30 30
 	public static function from_site_key() {
31 31
 		$message = sprintf(
32
-            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
32
+				__( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
33 33
 		);
34 34
 
35 35
 		return new static( $message );
36 36
 	}
37 37
 
38
-    /**
39
-	 * Create a new instance of the exception for a field class name that is
40
-	 * not recognized.
41
-	 *
42
-	 * @since %VERSION%
43
-	 *
44
-	 * @param string $field Class name of the service that was not recognized.
45
-	 *
46
-	 * @return static
47
-	 */
38
+	 /**
39
+	  * Create a new instance of the exception for a field class name that is
40
+	  * not recognized.
41
+	  *
42
+	  * @since %VERSION%
43
+	  *
44
+	  * @param string $field Class name of the service that was not recognized.
45
+	  *
46
+	  * @return static
47
+	  */
48 48
 	public static function from_secret_key() {
49 49
 		$message = sprintf(
50
-            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
50
+				__( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
51 51
 		);
52 52
 
53 53
 		return new static( $message );
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public static function from_site_key() {
31 31
 		$message = sprintf(
32
-            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
32
+            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!', 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
33 33
 		);
34 34
 
35 35
 		return new static( $message );
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public static function from_secret_key() {
49 49
 		$message = sprintf(
50
-            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!' , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
50
+            __( 'Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!', 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>'
51 51
 		);
52 52
 
53 53
 		return new static( $message );
Please login to merge, or discard this patch.
src/Field/BaseInput.php 4 patches
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,6 @@
 block discarded – undo
9 9
 
10 10
 namespace YIKES\EasyForms\Field;
11 11
 
12
-use YIKES\EasyForms\Exception\MustExtend;
13
-
14 12
 /**
15 13
  * Class BaseInput
16 14
  *
Please login to merge, or discard this patch.
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -57,10 +57,8 @@
 block discarded – undo
57 57
 	/**
58 58
 	 * Construct Field
59 59
 	 *
60
-	 * @param string $id          Fields ID.
61 60
 	 * @param array  $classes     Field and label classes.
62 61
 	 * @param string $placeholder Fields placeholder.
63
-	 * @param string $name        Field name.
64 62
 	 */
65 63
 	public function __construct( $classes, $placeholder, $label, $value, $description, $merge, $form_id, $hidden ) {
66 64
 		$this->classes     = $classes;
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -102,8 +102,8 @@  discard block
 block discarded – undo
102 102
 	}
103 103
 
104 104
 	public function get_id() {
105
-        return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge;
106
-    }
105
+		  return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge;
106
+	 }
107 107
 
108 108
 	public function get_value() {
109 109
 		return $this->value;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		</p>
140 140
 
141 141
         <?php
142
-        endif;
142
+		  endif;
143 143
 		?>
144 144
 		<input type="<?= esc_attr( $this->get_type() ); ?>"
145 145
 			class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>"
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 *
32 32
 	 * @var array
33 33
 	 */
34
-	private $classes = [];
34
+	private $classes = [ ];
35 35
 
36 36
 	/**
37 37
 	 * Field placeholder.
@@ -90,14 +90,14 @@  discard block
 block discarded – undo
90 90
 	}
91 91
 
92 92
 	public function field_classes() {
93
-		return $this->classes['field_classes'];
93
+		return $this->classes[ 'field_classes' ];
94 94
 	}
95 95
 
96 96
 	public function label_classes() {
97 97
 		if ( true === static::REQUIRED ) {
98
-			$this->classes['label_classes'][] = 'yikes-mailchimp-field-required';
98
+			$this->classes[ 'label_classes' ][ ] = 'yikes-mailchimp-field-required';
99 99
 		}
100
-		return $this->classes['label_classes'];
100
+		return $this->classes[ 'label_classes' ];
101 101
 	}
102 102
 
103 103
 	public function get_name() {
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
 	}
114 114
 
115 115
 	public function set_description( $description ) {
116
-		$this->show_desc   = $description['show_description'];
117
-		$this->desc_above  = $description['description_above'];
118
-		$this->description = $description['description'];
116
+		$this->show_desc   = $description[ 'show_description' ];
117
+		$this->desc_above  = $description[ 'description_above' ];
118
+		$this->description = $description[ 'description' ];
119 119
 	}
120 120
 
121 121
 	/**
@@ -125,12 +125,12 @@  discard block
 block discarded – undo
125 125
 	 */
126 126
 	public function render() {
127 127
 		?>
128
-		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ' , $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ' , $this->label['props'] ) ); ?> >
128
+		<label for="<?= esc_attr( $this->get_id() ); ?>" class="<?= esc_html( implode( ' ', $this->label_classes() ) ); ?>" <?= esc_html( implode( ' ', $this->label[ 'props' ] ) ); ?> >
129 129
 
130 130
 		<!-- dictate label visibility -->
131
-		<?php if ( ! isset( $this->label['hide-label'] ) ) { ?>
131
+		<?php if ( ! isset( $this->label[ 'hide-label' ] ) ) { ?>
132 132
 			<span class="<?= esc_attr( $this->merge ) . '-label'; ?>">
133
-				<?= esc_html( apply_filters( 'yikes-mailchimp-'. $this->merge .'-label' , esc_attr( $this->label['value'] ), $this->form_id ) ); ?>
133
+				<?= esc_html( apply_filters( 'yikes-mailchimp-' . $this->merge . '-label', esc_attr( $this->label[ 'value' ] ), $this->form_id ) ); ?>
134 134
 			</span>
135 135
 		<?php }
136 136
 
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         endif;
146 146
 		?>
147 147
 		<input type="<?= esc_attr( $this->get_type() ); ?>"
148
-			class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>"
148
+			class="<?= esc_attr( implode( ' ', $this->field_classes() ) ); ?>"
149 149
 			name="<?= esc_attr( $this->get_name() ); ?>"
150 150
 			placeholder="<?= esc_attr( $this->get_placeholder() ); ?>"
151 151
 			id="<?= esc_attr( $this->get_id() ); ?>"
Please login to merge, or discard this patch.
src/Field/Hidden.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,6 @@
 block discarded – undo
9 9
 
10 10
 namespace YIKES\EasyForms\Field;
11 11
 
12
-use YIKES\EasyForms\Exception\InvalidField;
13
-
14 12
 /**
15 13
  * Class Hidden
16 14
  *
Please login to merge, or discard this patch.
src/Form/FieldBuilder.php 3 patches
Doc Comments   +19 added lines patch added patch discarded remove patch
@@ -10,6 +10,10 @@  discard block
 block discarded – undo
10 10
 namespace YIKES\EasyForms\Form;
11 11
 
12 12
 trait FieldBuilder {
13
+
14
+    /**
15
+     * @param string $field
16
+     */
13 17
     protected function get_field_classes( $field ) {
14 18
         $field_classes = [];
15 19
         $label_classes = [];
@@ -77,6 +81,9 @@  discard block
 block discarded – undo
77 81
         $this->hidden_label_count = $this->hidden_label_count++;
78 82
     }
79 83
 
84
+    /**
85
+     * @param string $field
86
+     */
80 87
     protected function get_label( $field ) {
81 88
         $label = [];
82 89
         if( $field['type'] == 'email' ) {
@@ -93,6 +100,9 @@  discard block
 block discarded – undo
93 100
         return $label;
94 101
     }
95 102
 
103
+    /**
104
+     * @param string $field
105
+     */
96 106
     protected function get_value( $field ) {
97 107
         // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
98 108
         $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
@@ -100,10 +110,16 @@  discard block
 block discarded – undo
100 110
         return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
101 111
     }
102 112
 
113
+    /**
114
+     * @param string $field
115
+     */
103 116
     protected function get_placeholder( $field ) {
104 117
         return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
105 118
     }
106 119
 
120
+    /**
121
+     * @param string $field
122
+     */
107 123
     protected function get_hidden( $field ) {
108 124
         $visible = true;
109 125
         // if both hide label and hide field are checked, we gotta hide the field!
@@ -115,6 +131,9 @@  discard block
 block discarded – undo
115 131
         return $visible;
116 132
     }
117 133
 
134
+    /**
135
+     * @param string $field
136
+     */
118 137
     protected function get_description( $field ) {
119 138
         $show_description  = false;
120 139
         $description_above = false;
Please login to merge, or discard this patch.
Indentation   +125 added lines, -125 removed lines patch added patch discarded remove patch
@@ -10,131 +10,131 @@
 block discarded – undo
10 10
 namespace YIKES\EasyForms\Form;
11 11
 
12 12
 trait FieldBuilder {
13
-    protected function get_field_classes( $field ) {
14
-        $field_classes = [];
15
-        $label_classes = [];
16
-
17
-        $label_classes[] = $field['merge'] . '-label';
18
-
19
-        if( $field['additional-classes'] != '' ) {
20
-
21
-            $field_classes = explode( ' ' , $field['additional-classes'] );
22
-
23
-            if( in_array( 'field-left-half' , $field_classes ) ) {
24
-                $$label_classes[] = 'field-left-half';
25
-                $key = array_search( 'field-left-half' , $field_classes );
26
-                unset( $field_classes[$key] );
27
-            } // input half right
28
-            if( in_array( 'field-right-half' , $field_classes ) ) {
29
-                $$label_classes[] = 'field-right-half';
30
-                $key = array_search( 'field-right-half' , $field_classes );
31
-                unset( $field_classes[$key] );
32
-            } // input thirds (1/3 width, floated left)
33
-            if( in_array( 'field-third' , $field_classes ) ) {
34
-                $$label_classes[] = 'field-third';
35
-                $key = array_search( 'field-third' , $field_classes );
36
-                unset( $field_classes[$key] );
37
-            } // 2 column radio
38
-            if( in_array( 'option-2-col' , $field_classes ) ) {
39
-                $$label_classes[] = 'option-2-col';
40
-                $key = array_search( 'option-2-col' , $field_classes );
41
-                unset( $field_classes[$key] );
42
-            } // 3 column radio
43
-            if( in_array( 'option-3-col' , $field_classes ) ) {
44
-                $$label_classes[] = 'option-3-col';
45
-                $key = array_search( 'option-3-col' , $field_classes );
46
-                unset( $field_classes[$key] );
47
-            } // 4 column radio
48
-            if( in_array( 'option-4-col' , $field_classes ) ) {
49
-                $$label_classes[] = 'option-4-col';
50
-                $key = array_search( 'option-4-col' , $field_classes );
51
-                unset( $field_classes[$key] );
52
-            } // inline radio & checkboxes etc
53
-            if( in_array( 'option-inline' , $field_classes ) ) {
54
-                $$label_classes[] = 'option-inline';
55
-                $key = array_search( 'option-inline' , $field_classes );
56
-                unset( $field_classes[$key] );
57
-            }
58
-        }
59
-
60
-        // if the form is set to inline, add the inline class to our labels
61
-        if( $this->form_inline ) {
62
-            $label_classes[] = 'label-inline';
63
-        }
13
+	 protected function get_field_classes( $field ) {
14
+		  $field_classes = [];
15
+		  $label_classes = [];
16
+
17
+		  $label_classes[] = $field['merge'] . '-label';
18
+
19
+		  if( $field['additional-classes'] != '' ) {
20
+
21
+				$field_classes = explode( ' ' , $field['additional-classes'] );
22
+
23
+				if( in_array( 'field-left-half' , $field_classes ) ) {
24
+					 $$label_classes[] = 'field-left-half';
25
+					 $key = array_search( 'field-left-half' , $field_classes );
26
+					 unset( $field_classes[$key] );
27
+				} // input half right
28
+				if( in_array( 'field-right-half' , $field_classes ) ) {
29
+					 $$label_classes[] = 'field-right-half';
30
+					 $key = array_search( 'field-right-half' , $field_classes );
31
+					 unset( $field_classes[$key] );
32
+				} // input thirds (1/3 width, floated left)
33
+				if( in_array( 'field-third' , $field_classes ) ) {
34
+					 $$label_classes[] = 'field-third';
35
+					 $key = array_search( 'field-third' , $field_classes );
36
+					 unset( $field_classes[$key] );
37
+				} // 2 column radio
38
+				if( in_array( 'option-2-col' , $field_classes ) ) {
39
+					 $$label_classes[] = 'option-2-col';
40
+					 $key = array_search( 'option-2-col' , $field_classes );
41
+					 unset( $field_classes[$key] );
42
+				} // 3 column radio
43
+				if( in_array( 'option-3-col' , $field_classes ) ) {
44
+					 $$label_classes[] = 'option-3-col';
45
+					 $key = array_search( 'option-3-col' , $field_classes );
46
+					 unset( $field_classes[$key] );
47
+				} // 4 column radio
48
+				if( in_array( 'option-4-col' , $field_classes ) ) {
49
+					 $$label_classes[] = 'option-4-col';
50
+					 $key = array_search( 'option-4-col' , $field_classes );
51
+					 unset( $field_classes[$key] );
52
+				} // inline radio & checkboxes etc
53
+				if( in_array( 'option-inline' , $field_classes ) ) {
54
+					 $$label_classes[] = 'option-inline';
55
+					 $key = array_search( 'option-inline' , $field_classes );
56
+					 unset( $field_classes[$key] );
57
+				}
58
+		  }
59
+
60
+		  // if the form is set to inline, add the inline class to our labels
61
+		  if( $this->form_inline ) {
62
+				$label_classes[] = 'label-inline';
63
+		  }
64 64
         
65
-        if( isset( $field['hide-label'] ) ) {
66
-            if( absint( $field['hide-label'] ) === 1 ) {
67
-                $this->increase_hidden_label_count();
68
-                $field_classes[] = 'field-no-label';
69
-            }
70
-        }
71
-
72
-        return [
73
-            'field_classes' => $field_classes,
74
-            'label_classes' => $label_classes,
75
-        ];
76
-    }
77
-
78
-    protected function increase_hidden_label_count() {
79
-        $this->hidden_label_count = $this->hidden_label_count++;
80
-    }
81
-
82
-    protected function get_label( $field ) {
83
-        $label = [];
84
-        if( $field['type'] == 'email' ) {
85
-            $label['props']['visible'] = '';
86
-        } else {
87
-            $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
88
-        }
89
-        if ( isset( $field['hide-label'] ) ) {
90
-            $label['hide-label'] = true;
91
-        }
92
-        if ( isset( $field['label'] ) ) {
93
-            $label['value'] = $field['label'];
94
-        }
95
-        return $label;
96
-    }
97
-
98
-    protected function get_value( $field ) {
99
-        // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
100
-        $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
101
-        $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
102
-        return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
103
-    }
104
-
105
-    protected function get_placeholder( $field ) {
106
-        return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
107
-    }
108
-
109
-    protected function get_hidden( $field ) {
110
-        $visible = true;
111
-        // if both hide label and hide field are checked, we gotta hide the field!
112
-        if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
113
-            if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
114
-                $visible = false;
115
-            }
116
-        }
117
-        return $visible;
118
-    }
119
-
120
-    protected function get_description( $field ) {
121
-        $show_description  = false;
122
-        $description_above = false;
123
-        $description       = '';
124
-
125
-        if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) {
126
-            $show_description = true;
127
-            $description = $field['description'];
128
-        }
129
-
130
-        if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) {
131
-            $description_above = true;
132
-        }
65
+		  if( isset( $field['hide-label'] ) ) {
66
+				if( absint( $field['hide-label'] ) === 1 ) {
67
+					 $this->increase_hidden_label_count();
68
+					 $field_classes[] = 'field-no-label';
69
+				}
70
+		  }
71
+
72
+		  return [
73
+				'field_classes' => $field_classes,
74
+				'label_classes' => $label_classes,
75
+		  ];
76
+	 }
77
+
78
+	 protected function increase_hidden_label_count() {
79
+		  $this->hidden_label_count = $this->hidden_label_count++;
80
+	 }
81
+
82
+	 protected function get_label( $field ) {
83
+		  $label = [];
84
+		  if( $field['type'] == 'email' ) {
85
+				$label['props']['visible'] = '';
86
+		  } else {
87
+				$label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
88
+		  }
89
+		  if ( isset( $field['hide-label'] ) ) {
90
+				$label['hide-label'] = true;
91
+		  }
92
+		  if ( isset( $field['label'] ) ) {
93
+				$label['value'] = $field['label'];
94
+		  }
95
+		  return $label;
96
+	 }
97
+
98
+	 protected function get_value( $field ) {
99
+		  // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
100
+		  $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
101
+		  $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
102
+		  return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
103
+	 }
104
+
105
+	 protected function get_placeholder( $field ) {
106
+		  return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
107
+	 }
108
+
109
+	 protected function get_hidden( $field ) {
110
+		  $visible = true;
111
+		  // if both hide label and hide field are checked, we gotta hide the field!
112
+		  if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
113
+				if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
114
+					 $visible = false;
115
+				}
116
+		  }
117
+		  return $visible;
118
+	 }
119
+
120
+	 protected function get_description( $field ) {
121
+		  $show_description  = false;
122
+		  $description_above = false;
123
+		  $description       = '';
124
+
125
+		  if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) {
126
+				$show_description = true;
127
+				$description = $field['description'];
128
+		  }
129
+
130
+		  if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) {
131
+				$description_above = true;
132
+		  }
133 133
         
134
-        return [
135
-            'show_description'  => $show_description,
136
-            'description_above' => $description_above,
137
-            'description'       => $description,
138
-        ];
139
-    }
134
+		  return [
135
+				'show_description'  => $show_description,
136
+				'description_above' => $description_above,
137
+				'description'       => $description,
138
+		  ];
139
+	 }
140 140
 }
Please login to merge, or discard this patch.
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -11,61 +11,61 @@  discard block
 block discarded – undo
11 11
 
12 12
 trait FieldBuilder {
13 13
     protected function get_field_classes( $field ) {
14
-        $field_classes = [];
15
-        $label_classes = [];
14
+        $field_classes = [ ];
15
+        $label_classes = [ ];
16 16
 
17
-        $label_classes[] = $field['merge'] . '-label';
17
+        $label_classes[ ] = $field[ 'merge' ] . '-label';
18 18
 
19
-        if( $field['additional-classes'] != '' ) {
19
+        if ( $field[ 'additional-classes' ] != '' ) {
20 20
 
21
-            $field_classes = explode( ' ' , $field['additional-classes'] );
21
+            $field_classes = explode( ' ', $field[ 'additional-classes' ] );
22 22
 
23
-            if( in_array( 'field-left-half' , $field_classes ) ) {
24
-                $$label_classes[] = 'field-left-half';
25
-                $key = array_search( 'field-left-half' , $field_classes );
26
-                unset( $field_classes[$key] );
23
+            if ( in_array( 'field-left-half', $field_classes ) ) {
24
+                $$label_classes[ ] = 'field-left-half';
25
+                $key = array_search( 'field-left-half', $field_classes );
26
+                unset( $field_classes[ $key ] );
27 27
             } // input half right
28
-            if( in_array( 'field-right-half' , $field_classes ) ) {
29
-                $$label_classes[] = 'field-right-half';
30
-                $key = array_search( 'field-right-half' , $field_classes );
31
-                unset( $field_classes[$key] );
28
+            if ( in_array( 'field-right-half', $field_classes ) ) {
29
+                $$label_classes[ ] = 'field-right-half';
30
+                $key = array_search( 'field-right-half', $field_classes );
31
+                unset( $field_classes[ $key ] );
32 32
             } // input thirds (1/3 width, floated left)
33
-            if( in_array( 'field-third' , $field_classes ) ) {
34
-                $$label_classes[] = 'field-third';
35
-                $key = array_search( 'field-third' , $field_classes );
36
-                unset( $field_classes[$key] );
33
+            if ( in_array( 'field-third', $field_classes ) ) {
34
+                $$label_classes[ ] = 'field-third';
35
+                $key = array_search( 'field-third', $field_classes );
36
+                unset( $field_classes[ $key ] );
37 37
             } // 2 column radio
38
-            if( in_array( 'option-2-col' , $field_classes ) ) {
39
-                $$label_classes[] = 'option-2-col';
40
-                $key = array_search( 'option-2-col' , $field_classes );
41
-                unset( $field_classes[$key] );
38
+            if ( in_array( 'option-2-col', $field_classes ) ) {
39
+                $$label_classes[ ] = 'option-2-col';
40
+                $key = array_search( 'option-2-col', $field_classes );
41
+                unset( $field_classes[ $key ] );
42 42
             } // 3 column radio
43
-            if( in_array( 'option-3-col' , $field_classes ) ) {
44
-                $$label_classes[] = 'option-3-col';
45
-                $key = array_search( 'option-3-col' , $field_classes );
46
-                unset( $field_classes[$key] );
43
+            if ( in_array( 'option-3-col', $field_classes ) ) {
44
+                $$label_classes[ ] = 'option-3-col';
45
+                $key = array_search( 'option-3-col', $field_classes );
46
+                unset( $field_classes[ $key ] );
47 47
             } // 4 column radio
48
-            if( in_array( 'option-4-col' , $field_classes ) ) {
49
-                $$label_classes[] = 'option-4-col';
50
-                $key = array_search( 'option-4-col' , $field_classes );
51
-                unset( $field_classes[$key] );
48
+            if ( in_array( 'option-4-col', $field_classes ) ) {
49
+                $$label_classes[ ] = 'option-4-col';
50
+                $key = array_search( 'option-4-col', $field_classes );
51
+                unset( $field_classes[ $key ] );
52 52
             } // inline radio & checkboxes etc
53
-            if( in_array( 'option-inline' , $field_classes ) ) {
54
-                $$label_classes[] = 'option-inline';
55
-                $key = array_search( 'option-inline' , $field_classes );
56
-                unset( $field_classes[$key] );
53
+            if ( in_array( 'option-inline', $field_classes ) ) {
54
+                $$label_classes[ ] = 'option-inline';
55
+                $key = array_search( 'option-inline', $field_classes );
56
+                unset( $field_classes[ $key ] );
57 57
             }
58 58
         }
59 59
 
60 60
         // if the form is set to inline, add the inline class to our labels
61
-        if( $this->form_inline ) {
62
-            $label_classes[] = 'label-inline';
61
+        if ( $this->form_inline ) {
62
+            $label_classes[ ] = 'label-inline';
63 63
         }
64 64
         
65
-        if( isset( $field['hide-label'] ) ) {
66
-            if( absint( $field['hide-label'] ) === 1 ) {
65
+        if ( isset( $field[ 'hide-label' ] ) ) {
66
+            if ( absint( $field[ 'hide-label' ] ) === 1 ) {
67 67
                 $this->increase_hidden_label_count();
68
-                $field_classes[] = 'field-no-label';
68
+                $field_classes[ ] = 'field-no-label';
69 69
             }
70 70
         }
71 71
 
@@ -80,37 +80,37 @@  discard block
 block discarded – undo
80 80
     }
81 81
 
82 82
     protected function get_label( $field ) {
83
-        $label = [];
84
-        if( $field['type'] == 'email' ) {
85
-            $label['props']['visible'] = '';
83
+        $label = [ ];
84
+        if ( $field[ 'type' ] == 'email' ) {
85
+            $label[ 'props' ][ 'visible' ] = '';
86 86
         } else {
87
-            $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
87
+            $label[ 'props' ][ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
88 88
         }
89
-        if ( isset( $field['hide-label'] ) ) {
90
-            $label['hide-label'] = true;
89
+        if ( isset( $field[ 'hide-label' ] ) ) {
90
+            $label[ 'hide-label' ] = true;
91 91
         }
92
-        if ( isset( $field['label'] ) ) {
93
-            $label['value'] = $field['label'];
92
+        if ( isset( $field[ 'label' ] ) ) {
93
+            $label[ 'value' ] = $field[ 'label' ];
94 94
         }
95 95
         return $label;
96 96
     }
97 97
 
98 98
     protected function get_value( $field ) {
99 99
         // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
100
-        $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
100
+        $default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
101 101
         $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
102
-        return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
102
+        return apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $this->form_id );
103 103
     }
104 104
 
105 105
     protected function get_placeholder( $field ) {
106
-        return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
106
+        return isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : '';
107 107
     }
108 108
 
109 109
     protected function get_hidden( $field ) {
110 110
         $visible = true;
111 111
         // if both hide label and hide field are checked, we gotta hide the field!
112
-        if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
113
-            if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
112
+        if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
113
+            if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
114 114
                 $visible = false;
115 115
             }
116 116
         }
@@ -122,12 +122,12 @@  discard block
 block discarded – undo
122 122
         $description_above = false;
123 123
         $description       = '';
124 124
 
125
-        if ( isset( $field['description'] ) && trim( $field['description'] ) !== '' ) {
125
+        if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ) {
126 126
             $show_description = true;
127
-            $description = $field['description'];
127
+            $description = $field[ 'description' ];
128 128
         }
129 129
 
130
-        if ( isset( $field['description_above'] ) && $field['description_above'] === '1' ) {
130
+        if ( isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ) {
131 131
             $description_above = true;
132 132
         }
133 133
         
Please login to merge, or discard this patch.