Completed
Pull Request — master (#2579)
by
unknown
41s
created
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' => $field_value[ $name ] ?? '',
63
+							'value' => $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.
classes/views/solutions/_import.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 				$info['url'] = $xml;
12 12
 			}
13 13
 
14
-			$disabled = isset( $imported[ $info['form'] ] ) ? ' disabled' : '';
14
+			$disabled = isset( $imported[$info['form']] ) ? ' disabled' : '';
15 15
 			$url      = $info['url'] ?? '';
16 16
 			$value    = $importing === 'form' ? $info['form'] : $info['key'];
17 17
 			if ( ! isset( $info['img'] ) ) {
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 				continue;
22 22
 			}
23 23
 
24
-			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[ $info['form'] ] ) );
24
+			$hide_views = $importing === 'view' && ( ( $selected && $info['form'] !== $selected ) || isset( $imported[$info['form']] ) );
25 25
 			?>
26 26
 			<div class="frm_radio radio-inline radio frm_image_option<?php echo esc_attr( $importing === 'view' ? ' show_sub_opt show_' . $info['form'] : '' ); ?>" style="<?php echo esc_attr( $hide_views ? 'display:none' : '' ); ?>">
27 27
 				<?php if ( $importing === 'form' ) { ?>
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 							}
55 55
 
56 56
 							if ( $importing === 'form' && $disabled ) {
57
-								FrmAppHelper::kses_echo( FrmFormsHelper::edit_form_link( $imported[ $info['form'] ] ), array( 'a' ) );
57
+								FrmAppHelper::kses_echo( FrmFormsHelper::edit_form_link( $imported[$info['form']] ), array( 'a' ) );
58 58
 							} else {
59 59
 								echo esc_html( $info['name'] );
60 60
 							}
Please login to merge, or discard this patch.
classes/factories/FrmFieldFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
 			FrmFieldGdprHelper::FIELD_TYPE => FrmFieldGdprHelper::get_gdpr_field_class( $field_type ),
113 113
 		);
114 114
 
115
-		$class = $type_classes[ $field_type ] ?? '';
115
+		$class = $type_classes[$field_type] ?? '';
116 116
 
117 117
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
118 118
 	}
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldUserID.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 	protected function get_field_value( $args ) {
59 59
 		$user_ID      = get_current_user_id();
60 60
 		$user_ID      = ( $user_ID ? $user_ID : '' );
61
-		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][ $this->field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
61
+		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][$this->field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
62 62
 		$action       = ( $args['action'] ?? $args['form_action'] ?? '' );
63 63
 		$updating     = $action === 'update';
64 64
 		return is_numeric( $this->field['value'] ) || $posted_value || $updating ? $this->field['value'] : $user_ID;
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldCombo.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
 			if ( is_array( $sub_field ) ) {
62 62
 				$sub_field                 = wp_parse_args( $sub_field, $defaults );
63 63
 				$sub_field['name']         = $name;
64
-				$this->sub_fields[ $name ] = $sub_field;
64
+				$this->sub_fields[$name] = $sub_field;
65 65
 				continue;
66 66
 			}
67 67
 
68 68
 			if ( is_string( $sub_field ) ) {
69
-				$this->sub_fields[ $name ] = wp_parse_args(
69
+				$this->sub_fields[$name] = wp_parse_args(
70 70
 					array(
71 71
 						'name'  => $name,
72 72
 						'label' => $sub_field,
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 */
90 90
 	public function set_aria_invalid_error( &$shortcode_atts, $args ) {
91 91
 		foreach ( $this->get_sub_fields() as $sub_field ) {
92
-			$shortcode_atts[ 'aria-invalid-' . $sub_field['name'] ] = isset( $args['errors'][ 'field' . $this->field_id . '-' . $sub_field['name'] ] ) ? 'true' : 'false';
92
+			$shortcode_atts['aria-invalid-' . $sub_field['name']] = isset( $args['errors']['field' . $this->field_id . '-' . $sub_field['name']] ) ? 'true' : 'false';
93 93
 		}
94 94
 	}
95 95
 
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
 				}
136 136
 
137 137
 				if ( is_string( $option ) ) {
138
-					$extra_options[ $key . '_' . $option ] = '';
138
+					$extra_options[$key . '_' . $option] = '';
139 139
 				} elseif ( ! empty( $option['name'] ) ) {
140
-					$extra_options[ $key . '_' . $option['name'] ] = '';
140
+					$extra_options[$key . '_' . $option['name']] = '';
141 141
 				}
142 142
 			}
143 143
 		}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		foreach ( $this->sub_fields as $name => $sub_field ) {
164 164
 			$sub_field['name'] = $name;
165 165
 			$wrapper_classes   = 'frm_grid_container frm_sub_field_options frm_sub_field_options-' . $sub_field['name'];
166
-			if ( ! isset( $processed_sub_fields[ $name ] ) ) {
166
+			if ( ! isset( $processed_sub_fields[$name] ) ) {
167 167
 				// Options for this subfield should be hidden.
168 168
 				$wrapper_classes .= ' frm_hidden';
169 169
 			}
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 			$default_value = array();
194 194
 
195 195
 			foreach ( $this->sub_fields as $name => $sub_field ) {
196
-				$default_value[ $name ] = '';
196
+				$default_value[$name] = '';
197 197
 			}
198 198
 
199 199
 			return $default_value;
@@ -375,8 +375,8 @@  discard block
 block discarded – undo
375 375
 		// Placeholder.
376 376
 		if ( in_array( 'placeholder', $sub_field['options'], true ) ) {
377 377
 			$placeholders = FrmField::get_option( $field, 'placeholder' );
378
-			if ( ! empty( $placeholders[ $sub_field['name'] ] ) ) {
379
-				$field['placeholder'] = $placeholders[ $sub_field['name'] ];
378
+			if ( ! empty( $placeholders[$sub_field['name']] ) ) {
379
+				$field['placeholder'] = $placeholders[$sub_field['name']];
380 380
 			}
381 381
 		}
382 382
 
@@ -437,9 +437,9 @@  discard block
 block discarded – undo
437 437
 
438 438
 		// Validate not empty.
439 439
 		foreach ( $sub_fields as $name => $sub_field ) {
440
-			if ( empty( $sub_field['optional'] ) && empty( $args['value'][ $name ] ) ) {
441
-				$errors[ 'field' . $args['id'] . '-' . $name ] = '';
442
-				$errors[ 'field' . $args['id'] ]               = $blank_msg;
440
+			if ( empty( $sub_field['optional'] ) && empty( $args['value'][$name] ) ) {
441
+				$errors['field' . $args['id'] . '-' . $name] = '';
442
+				$errors['field' . $args['id']]               = $blank_msg;
443 443
 			}
444 444
 		}
445 445
 
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 		$field_key  = $this->field->field_key ?? $this->field['field_key'];
459 459
 		$sub_fields = $this->get_processed_sub_fields();
460 460
 		foreach ( $sub_fields as $name => $sub_field ) {
461
-			$headings[ $field_id . '_' . $name ] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
461
+			$headings[$field_id . '_' . $name] = $field_name . ' (' . $field_key . ') - ' . $sub_field['label'];
462 462
 		}
463 463
 
464 464
 		return $headings;
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldName.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -58,19 +58,19 @@  discard block
 block discarded – undo
58 58
 		$result = array();
59 59
 
60 60
 		foreach ( $names as $name ) {
61
-			if ( empty( $this->sub_fields[ $name ] ) ) {
61
+			if ( empty( $this->sub_fields[$name] ) ) {
62 62
 				continue;
63 63
 			}
64 64
 
65
-			if ( ! isset( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
66
-				$this->sub_fields[ $name ]['wrapper_classes'] = $col_class;
67
-			} elseif ( is_array( $this->sub_fields[ $name ]['wrapper_classes'] ) ) {
68
-				$this->sub_fields[ $name ]['wrapper_classes'] = implode( ' ', $this->sub_fields[ $name ]['wrapper_classes'] ) . ' ' . $col_class;
65
+			if ( ! isset( $this->sub_fields[$name]['wrapper_classes'] ) ) {
66
+				$this->sub_fields[$name]['wrapper_classes'] = $col_class;
67
+			} elseif ( is_array( $this->sub_fields[$name]['wrapper_classes'] ) ) {
68
+				$this->sub_fields[$name]['wrapper_classes'] = implode( ' ', $this->sub_fields[$name]['wrapper_classes'] ) . ' ' . $col_class;
69 69
 			} else {
70
-				$this->sub_fields[ $name ]['wrapper_classes'] .= ' ' . $col_class;
70
+				$this->sub_fields[$name]['wrapper_classes'] .= ' ' . $col_class;
71 71
 			}
72 72
 
73
-			$result[ $name ] = $this->sub_fields[ $name ];
73
+			$result[$name] = $this->sub_fields[$name];
74 74
 		}
75 75
 
76 76
 		return $result;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 
102 102
 		// Default desc.
103 103
 		foreach ( $this->sub_fields as $name => $sub_field ) {
104
-			$extra_options[ $name . '_desc' ] = $sub_field['label'];
104
+			$extra_options[$name . '_desc'] = $sub_field['label'];
105 105
 		}
106 106
 
107 107
 		return $extra_options;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		$name_layout = $this->get_name_layout();
140 140
 
141 141
 		if ( ! empty( $atts['show'] ) ) {
142
-			return $value[ $atts['show'] ] ?? '';
142
+			return $value[$atts['show']] ?? '';
143 143
 		}
144 144
 
145 145
 		$value = wp_parse_args(
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 			$args['sub_fields'] = $this->sub_fields;
217 217
 
218 218
 			foreach ( $hidden_fields as $name => $hidden_field ) {
219
-				$args['sub_fields'][ $name ]['wrapper_classes'] .= ' frm_hidden';
219
+				$args['sub_fields'][$name]['wrapper_classes'] .= ' frm_hidden';
220 220
 			}
221 221
 		}
222 222
 	}
Please login to merge, or discard this patch.
classes/models/FrmHoneypot.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
 			return '';
275 275
 		}
276 276
 
277
-		return $item_meta[ $field_id ] ?? '';
277
+		return $item_meta[$field_id] ?? '';
278 278
 	}
279 279
 
280 280
 	/**
Please login to merge, or discard this patch.
classes/models/FrmYoutubeFeedApi.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,6 +40,6 @@
 block discarded – undo
40 40
 	 */
41 41
 	public function get_video( $type = 'welcome' ) {
42 42
 		$videos = $this->get_api_info();
43
-		return $videos[ $type ] ?? array();
43
+		return $videos[$type] ?? array();
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
classes/models/FrmSettings.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 		}
240 240
 
241 241
 		foreach ( $settings as $setting => $default ) {
242
-			if ( isset( $params[ 'frm_' . $setting ] ) ) {
243
-				$this->{$setting} = $params[ 'frm_' . $setting ];
242
+			if ( isset( $params['frm_' . $setting] ) ) {
243
+				$this->{$setting} = $params['frm_' . $setting];
244 244
 			} elseif ( ! isset( $this->{$setting} ) ) {
245 245
 				$this->{$setting} = $default;
246 246
 			}
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 			'denylist_check',
433 433
 		);
434 434
 		foreach ( $checkboxes as $set ) {
435
-			$this->$set = isset( $params[ 'frm_' . $set ] ) ? absint( $params[ 'frm_' . $set ] ) : 0;
435
+			$this->$set = isset( $params['frm_' . $set] ) ? absint( $params['frm_' . $set] ) : 0;
436 436
 		}
437 437
 	}
438 438
 
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
 		$frm_roles = FrmAppHelper::frm_capabilities();
446 446
 		$roles     = get_editable_roles();
447 447
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
448
-			$this->$frm_role = (array) ( $params[ $frm_role ] ?? 'administrator' );
448
+			$this->$frm_role = (array) ( $params[$frm_role] ?? 'administrator' );
449 449
 
450 450
 			// Make sure administrators always have permissions
451 451
 			if ( ! in_array( 'administrator', $this->$frm_role, true ) ) {
Please login to merge, or discard this patch.