Completed
Pull Request — master (#2421)
by
unknown
02:49
created
square/models/FrmSquareLiteSettings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,12 +82,12 @@
 block discarded – undo
82 82
 		$settings = $this->default_options();
83 83
 
84 84
 		foreach ( $settings as $setting => $default ) {
85
-			if ( isset( $params[ 'frm_' . $this->param() . '_' . $setting ] ) ) {
86
-				$this->settings->{$setting} = trim( sanitize_text_field( $params[ 'frm_' . $this->param() . '_' . $setting ] ) );
85
+			if ( isset( $params['frm_' . $this->param() . '_' . $setting] ) ) {
86
+				$this->settings->{$setting} = trim( sanitize_text_field( $params['frm_' . $this->param() . '_' . $setting] ) );
87 87
 			}
88 88
 		}
89 89
 
90
-		$this->settings->test_mode = isset( $params[ 'frm_' . $this->param() . '_test_mode' ] ) ? absint( $params[ 'frm_' . $this->param() . '_test_mode' ] ) : 0;
90
+		$this->settings->test_mode = isset( $params['frm_' . $this->param() . '_test_mode'] ) ? absint( $params['frm_' . $this->param() . '_test_mode'] ) : 0;
91 91
 	}
92 92
 
93 93
 	/**
Please login to merge, or discard this patch.
square/controllers/FrmSquareLiteAppController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 		$address_setting    = $action->post_content['billing_address'];
124 124
 
125 125
 		$entry      = self::generate_false_entry();
126
-		$first_name = $first_name_setting && isset( $entry->metas[ $first_name_setting ] ) ? $entry->metas[ $first_name_setting ] : '';
127
-		$last_name  = $last_name_setting && isset( $entry->metas[ $last_name_setting ] ) ? $entry->metas[ $last_name_setting ] : '';
128
-		$address    = $address_setting && isset( $entry->metas[ $address_setting ] ) ? $entry->metas[ $address_setting ] : '';
126
+		$first_name = $first_name_setting && isset( $entry->metas[$first_name_setting] ) ? $entry->metas[$first_name_setting] : '';
127
+		$last_name  = $last_name_setting && isset( $entry->metas[$last_name_setting] ) ? $entry->metas[$last_name_setting] : '';
128
+		$address    = $address_setting && isset( $entry->metas[$address_setting] ) ? $entry->metas[$address_setting] : '';
129 129
 
130 130
 		if ( is_array( $first_name ) && isset( $first_name['first'] ) ) {
131 131
 			$first_name = $first_name['first'];
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 		);
142 142
 
143 143
 		if ( $email_setting ) {
144
-			$shortcode_atts   = array(
144
+			$shortcode_atts = array(
145 145
 				'entry' => $entry,
146 146
 				'form'  => $action->menu_order,
147 147
 				'value' => $email_setting,
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 				if ( is_array( $v ) ) {
182 182
 					foreach ( $v as $f => $value ) {
183 183
 						FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
184
-						$entry->metas[ absint( $f ) ] = $value;
184
+						$entry->metas[absint( $f )] = $value;
185 185
 					}
186 186
 				}
187 187
 			} else {
Please login to merge, or discard this patch.
square/controllers/FrmSquareLiteActionsController.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,8 @@  discard block
 block discarded – undo
139 139
 	 * @return string|true string on error, true on success.
140 140
 	 */
141 141
 	private static function trigger_one_time_payment( $atts ) {
142
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
142
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
143
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
143 144
 			return __( 'Please enter a valid credit card', 'formidable' );
144 145
 		}
145 146
 
@@ -199,7 +200,8 @@  discard block
 block discarded – undo
199 200
 	 * @return bool|string True on success, error message on failure
200 201
 	 */
201 202
 	private static function trigger_recurring_payment( $atts ) {
202
-		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
203
+		if ( empty( $_POST['square-token'] ) || empty( $_POST['square-verification-token'] ) ) {
204
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
203 205
 			return __( 'Please enter a valid credit card', 'formidable' );
204 206
 		}
205 207
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			$gateway   = $payment_action->post_content['gateway'];
77 77
 			$is_square = $gateway === 'square' || ( is_array( $gateway ) && in_array( 'square', $gateway, true ) );
78 78
 			if ( ! $is_square || empty( $payment_action->post_content['amount'] ) ) {
79
-				unset( $payment_actions[ $k ] );
79
+				unset( $payment_actions[$k] );
80 80
 			}
81 81
 		}
82 82
 		return $payment_actions;
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 			'run_triggers' => false,
98 98
 			'show_errors'  => true,
99 99
 		);
100
-		$atts     = compact( 'action', 'entry', 'form' );
100
+		$atts = compact( 'action', 'entry', 'form' );
101 101
 
102 102
 		$amount = self::prepare_amount( $action->post_content['amount'], $atts );
103 103
 		if ( empty( $amount ) || $amount == 000 ) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 				'value' => $atts['action']->post_content['description'],
151 151
 			)
152 152
 		);
153
-		$result             = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
153
+		$result = FrmSquareLiteConnectHelper::create_payment( $atts['amount'], $currency, $square_token, $verification_token, $description );
154 154
 
155 155
 		if ( false === $result ) {
156 156
 			return FrmSquareLiteConnectHelper::get_latest_error_from_square_api();
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 			false
456 456
 		);
457 457
 
458
-		$square_vars     = array(
458
+		$square_vars = array(
459 459
 			'formId'     => $form_id,
460 460
 			'nonce'      => wp_create_nonce( 'frm_square_ajax' ),
461 461
 			'ajax'       => esc_url_raw( FrmAppHelper::get_ajax_url() ),
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
 		$disallowed = array( ';', ':', '!important' );
573 573
 		foreach ( $settings as $k => $s ) {
574 574
 			if ( is_string( $s ) ) {
575
-				$settings[ $k ] = str_replace( $disallowed, '', $s );
575
+				$settings[$k] = str_replace( $disallowed, '', $s );
576 576
 			}
577 577
 		}
578 578
 
@@ -598,11 +598,11 @@  discard block
 block discarded – undo
598 598
 
599 599
 		$field_id = isset( $field->temp_id ) ? $field->temp_id : $field->id;
600 600
 
601
-		if ( isset( $errors[ 'field' . $field_id . '-cc' ] ) ) {
602
-			unset( $errors[ 'field' . $field_id . '-cc' ] );
601
+		if ( isset( $errors['field' . $field_id . '-cc'] ) ) {
602
+			unset( $errors['field' . $field_id . '-cc'] );
603 603
 		}
604
-		if ( isset( $errors[ 'field' . $field_id ] ) ) {
605
-			unset( $errors[ 'field' . $field_id ] );
604
+		if ( isset( $errors['field' . $field_id] ) ) {
605
+			unset( $errors['field' . $field_id] );
606 606
 		}
607 607
 
608 608
 		return $errors;
Please login to merge, or discard this patch.
stripe/controllers/FrmTransLiteActionsController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -472,8 +472,8 @@  discard block
 block discarded – undo
472 472
 			return $values;
473 473
 		}
474 474
 
475
-		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[ $field->id ] ) ) {
476
-			$values['value'] = $previous_entry->metas[ $field->id ];
475
+		if ( is_array( $previous_entry->metas ) && isset( $previous_entry->metas[$field->id] ) ) {
476
+			$values['value'] = $previous_entry->metas[$field->id];
477 477
 		}
478 478
 
479 479
 		$frm_vars['trans_filled'] = true;
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 			 * @param Closure    $destroy_callback
509 509
 			 * @return void
510 510
 			 */
511
-			function () use ( $entry_id, &$destroy_callback ) {
511
+			function() use ( $entry_id, &$destroy_callback ) {
512 512
 				FrmEntry::destroy( $entry_id );
513 513
 				// Only call this once.
514 514
 				remove_action( 'frm_entry_form', $destroy_callback );
@@ -528,7 +528,7 @@  discard block
 block discarded – undo
528 528
 	 * @return array
529 529
 	 */
530 530
 	public static function before_save_settings( $settings, $action ) {
531
-		$settings['gateway']  = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
531
+		$settings['gateway'] = ! empty( $settings['gateway'] ) ? (array) $settings['gateway'] : array( 'stripe' );
532 532
 
533 533
 		if ( in_array( 'square', $settings['gateway'] ) ) {
534 534
 			$currency = FrmSquareLiteConnectHelper::get_merchant_currency();
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldType.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
 		$field_val = '';
157 157
 		if ( is_object( $this->field ) ) {
158 158
 			$field_val = $this->field->{$column};
159
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
160
-			$field_val = $this->field[ $column ];
159
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
160
+			$field_val = $this->field[$column];
161 161
 		}
162 162
 
163 163
 		return $field_val;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 		if ( is_object( $this->field ) ) {
172 172
 			$this->field->{$column} = $value;
173 173
 		} elseif ( is_array( $this->field ) ) {
174
-			$this->field[ $column ] = $value;
174
+			$this->field[$column] = $value;
175 175
 		}
176 176
 	}
177 177
 
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
 			printf(
638 638
 				/* translators: %s: Field type */
639 639
 				esc_html__( '%s Options', 'formidable' ),
640
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
640
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
641 641
 			);
642 642
 			FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
643 643
 			?>
@@ -737,7 +737,7 @@  discard block
 block discarded – undo
737 737
 	 * New field
738 738
 	 */
739 739
 	public function get_new_field_defaults() {
740
-		$field        = array(
740
+		$field = array(
741 741
 			'name'          => $this->get_new_field_name(),
742 742
 			'description'   => '',
743 743
 			'type'          => $this->type,
@@ -768,8 +768,8 @@  discard block
 block discarded – undo
768 768
 
769 769
 		$fields = array_merge( $fields, $pro_fields );
770 770
 
771
-		if ( isset( $fields[ $this->type ] ) ) {
772
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
771
+		if ( isset( $fields[$this->type] ) ) {
772
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
773 773
 		}
774 774
 
775 775
 		return $name;
@@ -786,7 +786,7 @@  discard block
 block discarded – undo
786 786
 	 * @return array
787 787
 	 */
788 788
 	public function get_default_field_options() {
789
-		$opts        = array(
789
+		$opts = array(
790 790
 			'size'               => '',
791 791
 			'max'                => '',
792 792
 			'label'              => '',
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
 	 * @return void
1031 1031
 	 */
1032 1032
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
1033
-		$shortcode_atts['aria-invalid'] = isset( $args['errors'][ 'field' . $this->field_id ] ) ? 'true' : 'false';
1033
+		$shortcode_atts['aria-invalid'] = isset( $args['errors']['field' . $this->field_id] ) ? 'true' : 'false';
1034 1034
 	}
1035 1035
 
1036 1036
 	/**
@@ -1181,11 +1181,11 @@  discard block
 block discarded – undo
1181 1181
 		}
1182 1182
 
1183 1183
 		$options = array_values( $this->field['options'] );
1184
-		if ( ! isset( $options[ $opt ] ) ) {
1184
+		if ( ! isset( $options[$opt] ) ) {
1185 1185
 			return $hidden;
1186 1186
 		}
1187 1187
 
1188
-		$option = $options[ $opt ];
1188
+		$option = $options[$opt];
1189 1189
 		if ( is_array( $option ) ) {
1190 1190
 			$option = $option['value'];
1191 1191
 		}
@@ -1249,8 +1249,8 @@  discard block
 block discarded – undo
1249 1249
 		$selected = $values['field_value'];
1250 1250
 
1251 1251
 		if ( isset( $values['combo_name'] ) ) {
1252
-			$options  = $options[ $values['combo_name'] ];
1253
-			$selected = is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ? $selected[ $values['combo_name'] ] : '';
1252
+			$options  = $options[$values['combo_name']];
1253
+			$selected = is_array( $selected ) && isset( $selected[$values['combo_name']] ) ? $selected[$values['combo_name']] : '';
1254 1254
 		}
1255 1255
 
1256 1256
 		$input = $this->select_tag( $values );
@@ -1305,7 +1305,7 @@  discard block
 block discarded – undo
1305 1305
 	}
1306 1306
 
1307 1307
 	protected function fill_display_field_values( $args = array() ) {
1308
-		$defaults        = array(
1308
+		$defaults = array(
1309 1309
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
1310 1310
 			'field_id'      => $this->get_field_column( 'id' ),
1311 1311
 			'field_plus_id' => '',
@@ -1362,7 +1362,7 @@  discard block
 block discarded – undo
1362 1362
 			}
1363 1363
 		}
1364 1364
 
1365
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) && ! $custom_error_fields ) {
1365
+		if ( isset( $args['errors']['field' . $args['field_id']] ) && ! $custom_error_fields ) {
1366 1366
 			if ( $error_comes_first ) {
1367 1367
 				array_unshift( $describedby, 'frm_error_' . $args['html_id'] );
1368 1368
 			} else {
@@ -1440,11 +1440,11 @@  discard block
 block discarded – undo
1440 1440
 
1441 1441
 		$field_id = $this->get_field_column( 'id' );
1442 1442
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
1443
-			$frm_validated_unique_values[ $field_id ] = array();
1443
+			$frm_validated_unique_values[$field_id] = array();
1444 1444
 			return false;
1445 1445
 		}
1446 1446
 
1447
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
1447
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
1448 1448
 		return $already_validated_this_value;
1449 1449
 	}
1450 1450
 
@@ -1469,7 +1469,7 @@  discard block
 block discarded – undo
1469 1469
 	private function value_validated_as_unique( $value ) {
1470 1470
 		global $frm_validated_unique_values;
1471 1471
 		$field_id                                   = $this->get_field_column( 'id' );
1472
-		$frm_validated_unique_values[ $field_id ][] = $value;
1472
+		$frm_validated_unique_values[$field_id][] = $value;
1473 1473
 	}
1474 1474
 
1475 1475
 	/**
@@ -1514,8 +1514,8 @@  discard block
 block discarded – undo
1514 1514
 		$value = $this->prepare_display_value( $value, $atts );
1515 1515
 
1516 1516
 		if ( is_array( $value ) ) {
1517
-			if ( ! empty( $atts['show'] ) && isset( $value[ $atts['show'] ] ) ) {
1518
-				$value = $value[ $atts['show'] ];
1517
+			if ( ! empty( $atts['show'] ) && isset( $value[$atts['show']] ) ) {
1518
+				$value = $value[$atts['show']];
1519 1519
 			} elseif ( empty( $atts['return_array'] ) ) {
1520 1520
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
1521 1521
 				$value = FrmAppHelper::safe_implode( $sep, $value );
@@ -1645,8 +1645,8 @@  discard block
 block discarded – undo
1645 1645
 		$saved_entries = $atts['ids'];
1646 1646
 		$new_value     = array();
1647 1647
 		foreach ( (array) $value as $old_child_id ) {
1648
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
1649
-				$new_value[] = $saved_entries[ $old_child_id ];
1648
+			if ( isset( $saved_entries[$old_child_id] ) ) {
1649
+				$new_value[] = $saved_entries[$old_child_id];
1650 1650
 			}
1651 1651
 		}
1652 1652
 
Please login to merge, or discard this patch.
classes/controllers/FrmSettingsController.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 				$section['function'] = $original;
174 174
 			}
175 175
 
176
-			$sections[ $key ] = $section;
176
+			$sections[$key] = $section;
177 177
 		}//end foreach
178 178
 
179 179
 		return $sections;
@@ -193,8 +193,8 @@  discard block
 block discarded – undo
193 193
 
194 194
 		foreach ( $sections as $key => $section ) {
195 195
 			if ( in_array( $key, $payment_section_keys, true ) ) {
196
-				self::$removed_payments_sections[ $key ] = $section;
197
-				unset( $sections[ $key ] );
196
+				self::$removed_payments_sections[$key] = $section;
197
+				unset( $sections[$key] );
198 198
 			}
199 199
 		}
200 200
 
@@ -226,11 +226,11 @@  discard block
 block discarded – undo
226 226
 
227 227
 		$section  = FrmAppHelper::get_post_param( 'tab', '', 'sanitize_text_field' );
228 228
 		$sections = self::get_settings_tabs();
229
-		if ( ! isset( $sections[ $section ] ) ) {
229
+		if ( ! isset( $sections[$section] ) ) {
230 230
 			wp_die();
231 231
 		}
232 232
 
233
-		$section = $sections[ $section ];
233
+		$section = $sections[$section];
234 234
 
235 235
 		if ( isset( $section['class'] ) ) {
236 236
 			call_user_func( array( $section['class'], $section['function'] ) );
Please login to merge, or discard this patch.
classes/views/frm-settings/payments.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@
 block discarded – undo
31 31
 	if ( $is_active ) {
32 32
 		$input_params['checked'] = 'checked';
33 33
 	}
34
-	$other_section_selectors      = array_map(
35
-		function ( $section ) {
34
+	$other_section_selectors = array_map(
35
+		function( $section ) {
36 36
 			return "#frm_{$section}_settings_section";
37 37
 		},
38 38
 		array_diff( array_keys( $payment_sections ), array( $key ) )
Please login to merge, or discard this patch.
classes/views/frm-fields/front-end/combo-field/combo-field.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 			$sub_field_class   = "frm_form_field form-field frm_form_subfield-{$name} {$sub_field['wrapper_classes']}";
42 42
 			$sub_field_desc    = FrmField::get_option( $field, $name . '_desc' );
43 43
 
44
-			if ( isset( $errors[ 'field' . $field_id . '-' . $name ] ) ) {
44
+			if ( isset( $errors['field' . $field_id . '-' . $name] ) ) {
45 45
 				$sub_field_class .= ' frm_blank_field';
46 46
 			}
47 47
 			?>
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 						$attrs = array(
61 61
 							'type'  => $sub_field['type'],
62 62
 							'id'    => $html_id . '_' . $name,
63
-							'value' => isset( $field_value[ $name ] ) ? $field_value[ $name ] : '',
63
+							'value' => isset( $field_value[$name] ) ? $field_value[$name] : '',
64 64
 						);
65 65
 
66
-						if ( ! empty( $field_value[ $name ] ) ) {
67
-							$attrs['data-frmval'] = $field_value[ $name ];
66
+						if ( ! empty( $field_value[$name] ) ) {
67
+							$attrs['data-frmval'] = $field_value[$name];
68 68
 						}
69 69
 						if ( empty( $args['remove_names'] ) ) {
70 70
 							$attrs['name'] = $field_name . '[' . $name . ']';
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
81 81
 				}
82 82
 
83 83
 				// Don't show individual field errors when there is a combo field error.
84
-				if ( ! empty( $errors ) && isset( $errors[ 'field' . $field_id . '-' . $name ] ) && ! isset( $errors[ 'field' . $field_id ] ) ) {
84
+				if ( ! empty( $errors ) && isset( $errors['field' . $field_id . '-' . $name] ) && ! isset( $errors['field' . $field_id] ) ) {
85 85
 					?>
86
-					<div class="frm_error" role="alert"><?php echo esc_html( $errors[ 'field' . $field_id . '-' . $name ] ); ?></div>
86
+					<div class="frm_error" role="alert"><?php echo esc_html( $errors['field' . $field_id . '-' . $name] ); ?></div>
87 87
 				<?php } ?>
88 88
 			</div>
89 89
 			<?php
Please login to merge, or discard this patch.