@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $this->validateBlacklist(); |
62 | 62 | $this->validateAkismet(); |
63 | 63 | $this->validateRecaptcha(); |
64 | - if( !empty( $this->error )) { |
|
64 | + if( !empty($this->error) ) { |
|
65 | 65 | $this->setSessionValues( 'message', $this->error ); |
66 | 66 | } |
67 | 67 | return $this; |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | { |
85 | 85 | $rules = array_intersect_key( |
86 | 86 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
87 | - array_flip( $this->getOption( 'settings.submissions.required', [] )) |
|
87 | + array_flip( $this->getOption( 'settings.submissions.required', [] ) ) |
|
88 | 88 | ); |
89 | - $excluded = isset( $request['excluded'] ) |
|
89 | + $excluded = isset($request['excluded']) |
|
90 | 90 | ? (array)json_decode( $request['excluded'] ) |
91 | 91 | : []; |
92 | - return array_diff_key( $rules, array_flip( $excluded )); |
|
92 | + return array_diff_key( $rules, array_flip( $excluded ) ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) { |
101 | 101 | return true; |
102 | 102 | } |
103 | - if( empty( $this->request['recaptcha-token'] )) { |
|
103 | + if( empty($this->request['recaptcha-token']) ) { |
|
104 | 104 | return null; // @see $this->validateRecaptcha() |
105 | 105 | } |
106 | 106 | return $this->isRecaptchaValid( $this->request['recaptcha-token'] ); |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function isRecaptchaValid( $recaptchaToken ) |
114 | 114 | { |
115 | - $endpoint = add_query_arg([ |
|
115 | + $endpoint = add_query_arg( [ |
|
116 | 116 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
117 | 117 | 'response' => $recaptchaToken, |
118 | 118 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
119 | 119 | ], static::RECAPTCHA_ENDPOINT ); |
120 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
120 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
121 | 121 | glsr_log()->error( $response->get_error_message() ); |
122 | 122 | return false; |
123 | 123 | } |
124 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
125 | - if( !empty( $response->success )) { |
|
124 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
125 | + if( !empty($response->success) ) { |
|
126 | 126 | return boolval( $response->success ); |
127 | 127 | } |
128 | 128 | foreach( $response->{'error-codes'} as $error ) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $rules = $this->getValidationRules( $request ); |
140 | 140 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
141 | - if( empty( $errors )) { |
|
141 | + if( empty($errors) ) { |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | $this->setSessionValues( 'errors', $errors ); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
156 | 156 | { |
157 | 157 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
158 | - if( !empty( $loggedMessage )) { |
|
158 | + if( !empty($loggedMessage) ) { |
|
159 | 159 | glsr_log()->warning( $loggedMessage ); |
160 | 160 | glsr_log()->warning( $this->request ); |
161 | 161 | } |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | */ |
167 | 167 | protected function validateAkismet() |
168 | 168 | { |
169 | - if( !empty( $this->error ))return; |
|
170 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
169 | + if( !empty($this->error) )return; |
|
170 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
171 | 171 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
172 | 172 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
173 | 173 | } |
@@ -177,8 +177,8 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function validateBlacklist() |
179 | 179 | { |
180 | - if( !empty( $this->error ))return; |
|
181 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
180 | + if( !empty($this->error) )return; |
|
181 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
182 | 182 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
183 | 183 | if( $blacklistAction == 'reject' ) { |
184 | 184 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | */ |
194 | 194 | protected function validateCustom() |
195 | 195 | { |
196 | - if( !empty( $this->error ))return; |
|
196 | + if( !empty($this->error) )return; |
|
197 | 197 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
198 | 198 | if( $validated === true )return; |
199 | 199 | $this->setSessionValues( 'errors', [] ); |
@@ -208,8 +208,8 @@ discard block |
||
208 | 208 | */ |
209 | 209 | protected function validateHoneyPot() |
210 | 210 | { |
211 | - if( !empty( $this->error ))return; |
|
212 | - if( empty( $this->request['gotcha'] ))return; |
|
211 | + if( !empty($this->error) )return; |
|
212 | + if( empty($this->request['gotcha']) )return; |
|
213 | 213 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
214 | 214 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
215 | 215 | } |
@@ -219,9 +219,9 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function validateRecaptcha() |
221 | 221 | { |
222 | - if( !empty( $this->error ))return; |
|
222 | + if( !empty($this->error) )return; |
|
223 | 223 | $isValid = $this->isRecaptchaResponseValid(); |
224 | - if( is_null( $isValid )) { |
|
224 | + if( is_null( $isValid ) ) { |
|
225 | 225 | $this->setSessionValues( 'recaptcha', 'unset' ); |
226 | 226 | $this->recaptchaIsUnset = true; |
227 | 227 | } |
@@ -237,11 +237,11 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function validateRequest( array $request ) |
239 | 239 | { |
240 | - if( !$this->isRequestValid( $request )) { |
|
240 | + if( !$this->isRequestValid( $request ) ) { |
|
241 | 241 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
242 | 242 | return $request; |
243 | 243 | } |
244 | - if( empty( $request['title'] )) { |
|
244 | + if( empty($request['title']) ) { |
|
245 | 245 | $request['title'] = __( 'No Title', 'site-reviews' ); |
246 | 246 | } |
247 | 247 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | foreach( $this->rules as $attribute => $rules ) { |
75 | 75 | foreach( $rules as $rule ) { |
76 | 76 | $this->validateAttribute( $attribute, $rule ); |
77 | - if( $this->shouldStopValidating( $attribute ))break; |
|
77 | + if( $this->shouldStopValidating( $attribute ) )break; |
|
78 | 78 | } |
79 | 79 | } |
80 | 80 | return $this->errors; |
@@ -89,13 +89,13 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function validateAttribute( $attribute, $rule ) |
91 | 91 | { |
92 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
92 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
93 | 93 | if( $rule == '' )return; |
94 | 94 | $value = $this->getValue( $attribute ); |
95 | - if( !method_exists( $this, $method = 'validate'.$rule )) { |
|
95 | + if( !method_exists( $this, $method = 'validate'.$rule ) ) { |
|
96 | 96 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
97 | 97 | } |
98 | - if( !$this->$method( $value, $attribute, $parameters )) { |
|
98 | + if( !$this->$method( $value, $attribute, $parameters ) ) { |
|
99 | 99 | $this->addFailure( $attribute, $rule, $parameters ); |
100 | 100 | } |
101 | 101 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | protected function getMessage( $attribute, $rule, array $parameters ) |
146 | 146 | { |
147 | - if( in_array( $rule, $this->sizeRules )) { |
|
147 | + if( in_array( $rule, $this->sizeRules ) ) { |
|
148 | 148 | return $this->getSizeMessage( $attribute, $rule, $parameters ); |
149 | 149 | } |
150 | 150 | $lowerRule = glsr( Helper::class )->snakeCase( $rule ); |
@@ -159,11 +159,11 @@ discard block |
||
159 | 159 | */ |
160 | 160 | protected function getRule( $attribute, $rules ) |
161 | 161 | { |
162 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
162 | + if( !array_key_exists( $attribute, $this->rules ) )return; |
|
163 | 163 | $rules = (array)$rules; |
164 | 164 | foreach( $this->rules[$attribute] as $rule ) { |
165 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
166 | - if( in_array( $rule, $rules )) { |
|
165 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
166 | + if( in_array( $rule, $rules ) ) { |
|
167 | 167 | return [$rule, $parameters]; |
168 | 168 | } |
169 | 169 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | if( is_numeric( $value ) && $hasNumeric ) { |
182 | 182 | return $value; |
183 | 183 | } |
184 | - elseif( is_array( $value )) { |
|
184 | + elseif( is_array( $value ) ) { |
|
185 | 185 | return count( $value ); |
186 | 186 | } |
187 | 187 | return mb_strlen( $value ); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | protected function getValue( $attribute ) |
209 | 209 | { |
210 | - if( isset( $this->data[$attribute] )) { |
|
210 | + if( isset($this->data[$attribute]) ) { |
|
211 | 211 | return $this->data[$attribute]; |
212 | 212 | } |
213 | 213 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function hasRule( $attribute, $rules ) |
222 | 222 | { |
223 | - return !is_null( $this->getRule( $attribute, $rules )); |
|
223 | + return !is_null( $this->getRule( $attribute, $rules ) ); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | { |
259 | 259 | $parameters = []; |
260 | 260 | if( strpos( $rule, ':' ) !== false ) { |
261 | - list( $rule, $parameter ) = explode( ':', $rule, 2 ); |
|
261 | + list($rule, $parameter) = explode( ':', $rule, 2 ); |
|
262 | 262 | $parameters = $this->parseParameters( $rule, $parameter ); |
263 | 263 | } |
264 | 264 | $rule = glsr( Helper::class )->camelCase( $rule ); |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | protected function shouldStopValidating( $attribute ) |
288 | 288 | { |
289 | 289 | return $this->hasRule( $attribute, $this->implicitRules ) |
290 | - && isset( $this->failedRules[$attribute] ) |
|
290 | + && isset($this->failedRules[$attribute]) |
|
291 | 291 | && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules ); |
292 | 292 | } |
293 | 293 | |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | protected function translator( $key, array $parameters ) |
301 | 301 | { |
302 | 302 | $strings = glsr( ValidationStrings::class )->defaults(); |
303 | - if( isset( $strings[$key] )) { |
|
303 | + if( isset($strings[$key]) ) { |
|
304 | 304 | return $this->replace( $strings[$key], $parameters ); |
305 | 305 | } |
306 | 306 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function all() |
30 | 30 | { |
31 | - if( empty( $this->options )) { |
|
31 | + if( empty($this->options) ) { |
|
32 | 32 | $this->reset(); |
33 | 33 | } |
34 | 34 | return $this->options; |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | $options = $this->all(); |
46 | 46 | $pointer = &$options; |
47 | 47 | foreach( $keys as $key ) { |
48 | - if( !isset( $pointer[$key] ) || !is_array( $pointer[$key] ))continue; |
|
48 | + if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) )continue; |
|
49 | 49 | $pointer = &$pointer[$key]; |
50 | 50 | } |
51 | - unset( $pointer[$last] ); |
|
51 | + unset($pointer[$last]); |
|
52 | 52 | return $this->set( $options ); |
53 | 53 | } |
54 | 54 | |
@@ -80,8 +80,8 @@ discard block |
||
80 | 80 | glsr( DefaultsManager::class )->defaults() |
81 | 81 | ); |
82 | 82 | array_walk( $options, function( &$value ) { |
83 | - if( !is_string( $value ))return; |
|
84 | - $value = wp_kses( $value, wp_kses_allowed_html( 'post' )); |
|
83 | + if( !is_string( $value ) )return; |
|
84 | + $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) ); |
|
85 | 85 | }); |
86 | 86 | return glsr( Helper::class )->convertDotNotationArray( $options ); |
87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | public function isRecaptchaEnabled() |
93 | 93 | { |
94 | 94 | $integration = $this->get( 'settings.submissions.recaptcha.integration' ); |
95 | - return $integration == 'all' || ( $integration == 'guest' && !is_user_logged_in() ); |
|
95 | + return $integration == 'all' || ($integration == 'guest' && !is_user_logged_in()); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | public function reset() |
102 | 102 | { |
103 | 103 | $options = get_option( static::databaseKey(), [] ); |
104 | - if( !is_array( $options ) || empty( $options )) { |
|
104 | + if( !is_array( $options ) || empty($options) ) { |
|
105 | 105 | delete_option( static::databaseKey() ); |
106 | 106 | $options = wp_parse_args( glsr()->defaults, ['settings' => []] ); |
107 | 107 | } |
@@ -115,10 +115,10 @@ discard block |
||
115 | 115 | */ |
116 | 116 | public function set( $pathOrOptions, $value = '' ) |
117 | 117 | { |
118 | - if( is_string( $pathOrOptions )) { |
|
118 | + if( is_string( $pathOrOptions ) ) { |
|
119 | 119 | $pathOrOptions = glsr( Helper::class )->setPathValue( $pathOrOptions, $value, $this->all() ); |
120 | 120 | } |
121 | - if( $result = update_option( static::databaseKey(), (array)$pathOrOptions )) { |
|
121 | + if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) { |
|
122 | 122 | $this->reset(); |
123 | 123 | } |
124 | 124 | return $result; |
@@ -27,21 +27,21 @@ discard block |
||
27 | 27 | public function __construct( $input ) |
28 | 28 | { |
29 | 29 | $this->request = $input; |
30 | - $this->ajax_request = isset( $input['ajax_request'] ); |
|
30 | + $this->ajax_request = isset($input['ajax_request']); |
|
31 | 31 | $this->assigned_to = $this->getNumeric( 'assign_to' ); |
32 | - $this->author = sanitize_text_field( $this->get( 'name' )); |
|
33 | - $this->avatar = get_avatar_url( $this->get( 'email' )); |
|
34 | - $this->blacklisted = isset( $input['blacklisted'] ); |
|
35 | - $this->category = sanitize_key( $this->get( 'category' )); |
|
36 | - $this->content = sanitize_textarea_field( $this->get( 'content' )); |
|
32 | + $this->author = sanitize_text_field( $this->get( 'name' ) ); |
|
33 | + $this->avatar = get_avatar_url( $this->get( 'email' ) ); |
|
34 | + $this->blacklisted = isset($input['blacklisted']); |
|
35 | + $this->category = sanitize_key( $this->get( 'category' ) ); |
|
36 | + $this->content = sanitize_textarea_field( $this->get( 'content' ) ); |
|
37 | 37 | $this->custom = $this->getCustom(); |
38 | - $this->email = sanitize_email( $this->get( 'email' )); |
|
39 | - $this->form_id = sanitize_key( $this->get( 'form_id' )); |
|
38 | + $this->email = sanitize_email( $this->get( 'email' ) ); |
|
39 | + $this->form_id = sanitize_key( $this->get( 'form_id' ) ); |
|
40 | 40 | $this->ip_address = $this->get( 'ip_address' ); |
41 | - $this->rating = intval( $this->get( 'rating' )); |
|
41 | + $this->rating = intval( $this->get( 'rating' ) ); |
|
42 | 42 | $this->referer = $this->get( 'referer' ); |
43 | - $this->terms = isset( $input['terms'] ); |
|
44 | - $this->title = sanitize_text_field( $this->get( 'title' )); |
|
43 | + $this->terms = isset($input['terms']); |
|
44 | + $this->title = sanitize_text_field( $this->get( 'title' ) ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | */ |
51 | 51 | protected function get( $key ) |
52 | 52 | { |
53 | - return isset( $this->request[$key] ) |
|
53 | + return isset($this->request[$key]) |
|
54 | 54 | ? (string)$this->request[$key] |
55 | 55 | : ''; |
56 | 56 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ]; |
68 | 68 | $custom = $this->request; |
69 | 69 | foreach( $unset as $value ) { |
70 | - unset( $custom[$value] ); |
|
70 | + unset($custom[$value]); |
|
71 | 71 | } |
72 | 72 | return $custom; |
73 | 73 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function callbackRegisterSettings( $input ) |
18 | 18 | { |
19 | - if( !is_array( $input )) { |
|
19 | + if( !is_array( $input ) ) { |
|
20 | 20 | $input = ['settings' => []]; |
21 | 21 | } |
22 | 22 | if( key( $input ) == 'settings' ) { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $options = $this->sanitizeGeneral( $input, $options ); |
25 | 25 | $options = $this->sanitizeSubmissions( $input, $options ); |
26 | 26 | $options = $this->sanitizeTranslations( $input, $options ); |
27 | - glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' )); |
|
27 | + glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) ); |
|
28 | 28 | return $options; |
29 | 29 | } |
30 | 30 | return $input; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | { |
39 | 39 | register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [ |
40 | 40 | 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
41 | - ]); |
|
41 | + ] ); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | protected function sanitizeGeneral( array $input, array $options ) |
48 | 48 | { |
49 | 49 | $inputForm = $input['settings']['general']; |
50 | - if( !isset( $inputForm['notifications'] )) { |
|
50 | + if( !isset($inputForm['notifications']) ) { |
|
51 | 51 | $options['settings']['general']['notifications'] = []; |
52 | 52 | } |
53 | 53 | if( trim( $inputForm['notification_message'] ) == '' ) { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | protected function sanitizeSubmissions( array $input, array $options ) |
63 | 63 | { |
64 | 64 | $inputForm = $input['settings']['submissions']; |
65 | - if( !isset( $inputForm['required'] )) { |
|
65 | + if( !isset($inputForm['required']) ) { |
|
66 | 66 | $options['settings']['submissions']['required'] = []; |
67 | 67 | } |
68 | 68 | return $options; |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | */ |
74 | 74 | protected function sanitizeTranslations( array $input, array $options ) |
75 | 75 | { |
76 | - if( isset( $input['settings']['strings'] )) { |
|
77 | - $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] )); |
|
76 | + if( isset($input['settings']['strings']) ) { |
|
77 | + $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) ); |
|
78 | 78 | array_walk( $options['settings']['strings'], function( &$string ) { |
79 | - if( isset( $string['s2'] )) { |
|
79 | + if( isset($string['s2']) ) { |
|
80 | 80 | $string['s2'] = wp_strip_all_tags( $string['s2'] ); |
81 | 81 | } |
82 | - if( isset( $string['p2'] )) { |
|
82 | + if( isset($string['p2']) ) { |
|
83 | 83 | $string['p2'] = wp_strip_all_tags( $string['p2'] ); |
84 | 84 | } |
85 | 85 | }); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | { |
67 | 67 | $instance = new static; |
68 | 68 | $instance->setTagFromMethod( $method ); |
69 | - call_user_func_array( [$instance, 'normalize'], $args += ['',''] ); |
|
69 | + call_user_func_array( [$instance, 'normalize'], $args += ['', ''] ); |
|
70 | 70 | $tags = array_merge( static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT ); |
71 | 71 | do_action_ref_array( 'site-reviews/builder', [&$instance] ); |
72 | 72 | $generatedTag = in_array( $instance->tag, $tags ) |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | 'render' => 'is_bool', |
91 | 91 | 'tag' => 'is_string', |
92 | 92 | ]; |
93 | - if( !isset( $properties[$property] ) |
|
94 | - || empty( array_filter( [$value], $properties[$property] )) |
|
93 | + if( !isset($properties[$property]) |
|
94 | + || empty(array_filter( [$value], $properties[$property] )) |
|
95 | 95 | )return; |
96 | 96 | $this->$property = $value; |
97 | 97 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | */ |
102 | 102 | public function getClosingTag() |
103 | 103 | { |
104 | - if( empty( $this->tag ))return; |
|
104 | + if( empty($this->tag) )return; |
|
105 | 105 | return '</'.$this->tag.'>'; |
106 | 106 | } |
107 | 107 | |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function getOpeningTag() |
112 | 112 | { |
113 | - if( empty( $this->tag ))return; |
|
114 | - $attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString(); |
|
113 | + if( empty($this->tag) )return; |
|
114 | + $attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString(); |
|
115 | 115 | return '<'.trim( $this->tag.' '.$attributes ).'>'; |
116 | 116 | } |
117 | 117 | |
@@ -120,8 +120,8 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function raw( array $field ) |
122 | 122 | { |
123 | - unset( $field['label'] ); |
|
124 | - return $this->{$field['type']}( $field ); |
|
123 | + unset($field['label']); |
|
124 | + return $this->{$field['type']}($field); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | protected function buildCustomField() |
131 | 131 | { |
132 | 132 | $className = $this->getCustomFieldClassName(); |
133 | - if( class_exists( $className )) { |
|
133 | + if( class_exists( $className ) ) { |
|
134 | 134 | return (new $className( $this ))->build(); |
135 | 135 | } |
136 | 136 | glsr_log()->error( 'Field missing: '.$className ); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | */ |
142 | 142 | protected function buildDefaultTag( $text = '' ) |
143 | 143 | { |
144 | - if( empty( $text )) { |
|
144 | + if( empty($text) ) { |
|
145 | 145 | $text = $this->args['text']; |
146 | 146 | } |
147 | 147 | return $this->getOpeningTag().$text.$this->getClosingTag(); |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function buildFieldDescription() |
154 | 154 | { |
155 | - if( empty( $this->args['description'] ))return; |
|
155 | + if( empty($this->args['description']) )return; |
|
156 | 156 | if( $this->args['is_widget'] ) { |
157 | 157 | return $this->small( $this->args['description'] ); |
158 | 158 | } |
@@ -164,13 +164,13 @@ discard block |
||
164 | 164 | */ |
165 | 165 | protected function buildFormInput() |
166 | 166 | { |
167 | - if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) { |
|
168 | - if( isset( $this->args['multiple'] )) { |
|
169 | - $this->args['name'].= '[]'; |
|
167 | + if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) { |
|
168 | + if( isset($this->args['multiple']) ) { |
|
169 | + $this->args['name'] .= '[]'; |
|
170 | 170 | } |
171 | 171 | return $this->buildFormLabel().$this->getOpeningTag(); |
172 | 172 | } |
173 | - return empty( $this->args['options'] ) |
|
173 | + return empty($this->args['options']) |
|
174 | 174 | ? $this->buildFormInputChoice() |
175 | 175 | : $this->buildFormInputMultiChoice(); |
176 | 176 | } |
@@ -180,19 +180,19 @@ discard block |
||
180 | 180 | */ |
181 | 181 | protected function buildFormInputChoice() |
182 | 182 | { |
183 | - if( !empty( $this->args['text'] )) { |
|
183 | + if( !empty($this->args['text']) ) { |
|
184 | 184 | $this->args['label'] = $this->args['text']; |
185 | 185 | } |
186 | 186 | if( !$this->args['is_public'] ) { |
187 | - return $this->buildFormLabel([ |
|
187 | + return $this->buildFormLabel( [ |
|
188 | 188 | 'class' => 'glsr-'.$this->args['type'].'-label', |
189 | 189 | 'text' => $this->getOpeningTag().' '.$this->args['label'].'<span></span>', |
190 | - ]); |
|
190 | + ] ); |
|
191 | 191 | } |
192 | - return $this->getOpeningTag().$this->buildFormLabel([ |
|
192 | + return $this->getOpeningTag().$this->buildFormLabel( [ |
|
193 | 193 | 'class' => 'glsr-'.$this->args['type'].'-label', |
194 | 194 | 'text' => $this->args['label'].'<span></span>', |
195 | - ]); |
|
195 | + ] ); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
@@ -201,22 +201,22 @@ discard block |
||
201 | 201 | protected function buildFormInputMultiChoice() |
202 | 202 | { |
203 | 203 | if( $this->args['type'] == 'checkbox' ) { |
204 | - $this->args['name'].= '[]'; |
|
204 | + $this->args['name'] .= '[]'; |
|
205 | 205 | } |
206 | 206 | $index = 0; |
207 | - $options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use( &$index ) { |
|
207 | + $options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) use(&$index) { |
|
208 | 208 | return $carry.$this->li( $this->{$this->args['type']}([ |
209 | 209 | 'checked' => in_array( $key, (array)$this->args['value'] ), |
210 | 210 | 'id' => $this->args['id'].'-'.$index++, |
211 | 211 | 'name' => $this->args['name'], |
212 | 212 | 'text' => $this->args['options'][$key], |
213 | 213 | 'value' => $key, |
214 | - ])); |
|
214 | + ]) ); |
|
215 | 215 | }); |
216 | 216 | return $this->ul( $options, [ |
217 | 217 | 'class' => $this->args['class'], |
218 | 218 | 'id' => $this->args['id'], |
219 | - ]); |
|
219 | + ] ); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | /** |
@@ -224,13 +224,13 @@ discard block |
||
224 | 224 | */ |
225 | 225 | protected function buildFormLabel( array $customArgs = [] ) |
226 | 226 | { |
227 | - if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return; |
|
227 | + if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return; |
|
228 | 228 | return $this->label( wp_parse_args( $customArgs, [ |
229 | 229 | 'for' => $this->args['id'], |
230 | 230 | 'is_public' => $this->args['is_public'], |
231 | 231 | 'text' => $this->args['label'], |
232 | 232 | 'type' => $this->args['type'], |
233 | - ])); |
|
233 | + ] ) ); |
|
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
@@ -247,11 +247,11 @@ discard block |
||
247 | 247 | protected function buildFormSelectOptions() |
248 | 248 | { |
249 | 249 | return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) { |
250 | - return $carry.$this->option([ |
|
250 | + return $carry.$this->option( [ |
|
251 | 251 | 'selected' => $this->args['value'] == $key, |
252 | 252 | 'text' => $this->args['options'][$key], |
253 | 253 | 'value' => $key, |
254 | - ]); |
|
254 | + ] ); |
|
255 | 255 | }); |
256 | 256 | } |
257 | 257 | |
@@ -269,10 +269,10 @@ discard block |
||
269 | 269 | protected function buildTag() |
270 | 270 | { |
271 | 271 | $this->mergeArgsWithRequiredDefaults(); |
272 | - if( in_array( $this->tag, static::TAGS_SINGLE )) { |
|
272 | + if( in_array( $this->tag, static::TAGS_SINGLE ) ) { |
|
273 | 273 | return $this->getOpeningTag(); |
274 | 274 | } |
275 | - if( !in_array( $this->tag, static::TAGS_FORM )) { |
|
275 | + if( !in_array( $this->tag, static::TAGS_FORM ) ) { |
|
276 | 276 | return $this->buildDefaultTag(); |
277 | 277 | } |
278 | 278 | return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription(); |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | protected function mergeArgsWithRequiredDefaults() |
293 | 293 | { |
294 | 294 | $className = $this->getCustomFieldClassName(); |
295 | - if( class_exists( $className )) { |
|
295 | + if( class_exists( $className ) ) { |
|
296 | 296 | $this->args = array_merge( |
297 | 297 | wp_parse_args( $this->args, $className::defaults() ), |
298 | 298 | $className::required() |
@@ -307,16 +307,16 @@ discard block |
||
307 | 307 | */ |
308 | 308 | protected function normalize( ...$params ) |
309 | 309 | { |
310 | - if( is_string( $params[0] ) || is_numeric( $params[0] )) { |
|
310 | + if( is_string( $params[0] ) || is_numeric( $params[0] ) ) { |
|
311 | 311 | $this->setNameOrTextAttributeForTag( $params[0] ); |
312 | 312 | } |
313 | - if( is_array( $params[0] )) { |
|
313 | + if( is_array( $params[0] ) ) { |
|
314 | 314 | $this->args += $params[0]; |
315 | 315 | } |
316 | - else if( is_array( $params[1] )) { |
|
316 | + else if( is_array( $params[1] ) ) { |
|
317 | 317 | $this->args += $params[1]; |
318 | 318 | } |
319 | - if( !isset( $this->args['is_public'] )) { |
|
319 | + if( !isset($this->args['is_public']) ) { |
|
320 | 320 | $this->args['is_public'] = false; |
321 | 321 | } |
322 | 322 | } |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | protected function setTagFromMethod( $method ) |
341 | 341 | { |
342 | 342 | $this->tag = strtolower( $method ); |
343 | - if( in_array( $this->tag, static::INPUT_TYPES )) { |
|
343 | + if( in_array( $this->tag, static::INPUT_TYPES ) ) { |
|
344 | 344 | $this->args['type'] = $this->tag; |
345 | 345 | $this->tag = 'input'; |
346 | 346 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | protected function getFieldDefault( array $field ) |
31 | 31 | { |
32 | - return isset( $field['default'] ) |
|
32 | + return isset($field['default']) |
|
33 | 33 | ? $field['default'] |
34 | 34 | : ''; |
35 | 35 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | protected function getSettingFields( $path ) |
41 | 41 | { |
42 | 42 | $settings = glsr( DefaultsManager::class )->settings(); |
43 | - return array_filter( $settings, function( $key ) use( $path ) { |
|
43 | + return array_filter( $settings, function( $key ) use($path) { |
|
44 | 44 | return glsr( Helper::class )->startsWith( $path, $key ); |
45 | 45 | }, ARRAY_FILTER_USE_KEY ); |
46 | 46 | } |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $field = wp_parse_args( $field, [ |
56 | 56 | 'is_setting' => true, |
57 | 57 | 'name' => $name, |
58 | - ]); |
|
59 | - $rows.= new Field( $this->normalize( $field )); |
|
58 | + ] ); |
|
59 | + $rows .= new Field( $this->normalize( $field ) ); |
|
60 | 60 | } |
61 | 61 | return $rows; |
62 | 62 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | protected function getTemplateData( $id ) |
69 | 69 | { |
70 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
70 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
71 | 71 | return [ |
72 | 72 | 'context' => [ |
73 | 73 | 'rows' => $this->getSettingRows( $fields ), |
@@ -81,12 +81,12 @@ discard block |
||
81 | 81 | */ |
82 | 82 | protected function getTemplateDataForAddons( $id ) |
83 | 83 | { |
84 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
84 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
85 | 85 | $settings = glsr( Helper::class )->convertDotNotationArray( $fields ); |
86 | 86 | $settingKeys = array_keys( $settings['settings']['addons'] ); |
87 | 87 | $results = []; |
88 | 88 | foreach( $settingKeys as $key ) { |
89 | - $addonFields = array_filter( $fields, function( $path ) use( $key ) { |
|
89 | + $addonFields = array_filter( $fields, function( $path ) use($key) { |
|
90 | 90 | return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path ); |
91 | 91 | }, ARRAY_FILTER_USE_KEY ); |
92 | 92 | $results[$key] = $this->getSettingRows( $addonFields ); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | protected function getTemplateDataForTranslations() |
103 | 103 | { |
104 | 104 | $translations = glsr( Translator::class )->renderAll(); |
105 | - $class = empty( $translations ) |
|
105 | + $class = empty($translations) |
|
106 | 106 | ? 'glsr-hidden' |
107 | 107 | : ''; |
108 | 108 | return [ |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | $path, |
126 | 126 | glsr( Helper::class )->getPathValue( $path, glsr()->defaults ) |
127 | 127 | ); |
128 | - if( is_array( $expectedValue )) { |
|
128 | + if( is_array( $expectedValue ) ) { |
|
129 | 129 | return is_array( $optionValue ) |
130 | - ? count( array_intersect( $optionValue, $expectedValue )) === 0 |
|
130 | + ? count( array_intersect( $optionValue, $expectedValue ) ) === 0 |
|
131 | 131 | : !in_array( $optionValue, $expectedValue ); |
132 | 132 | } |
133 | 133 | return $optionValue != $expectedValue; |
@@ -149,17 +149,17 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function normalizeDependsOn( array $field ) |
151 | 151 | { |
152 | - if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) { |
|
152 | + if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) { |
|
153 | 153 | $path = key( $field['depends_on'] ); |
154 | 154 | $expectedValue = $field['depends_on'][$path]; |
155 | 155 | $fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ); |
156 | - if( is_array( $expectedValue )) { |
|
157 | - $fieldName.= '[]'; |
|
156 | + if( is_array( $expectedValue ) ) { |
|
157 | + $fieldName .= '[]'; |
|
158 | 158 | } |
159 | - $field['data-depends'] = json_encode([ |
|
159 | + $field['data-depends'] = json_encode( [ |
|
160 | 160 | 'name' => $fieldName, |
161 | 161 | 'value' => $expectedValue, |
162 | - ], JSON_HEX_APOS|JSON_HEX_QUOT ); |
|
162 | + ], JSON_HEX_APOS | JSON_HEX_QUOT ); |
|
163 | 163 | $field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue ); |
164 | 164 | } |
165 | 165 | return $field; |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | */ |
171 | 171 | protected function normalizeLabelAndLegend( array $field ) |
172 | 172 | { |
173 | - if( !empty( $field['label'] )) { |
|
173 | + if( !empty($field['label']) ) { |
|
174 | 174 | $field['legend'] = $field['label']; |
175 | - unset( $field['label'] ); |
|
175 | + unset($field['label']); |
|
176 | 176 | } |
177 | 177 | else { |
178 | 178 | $field['is_valid'] = false; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | */ |
187 | 187 | protected function normalizeValue( array $field ) |
188 | 188 | { |
189 | - if( !isset( $field['value'] )) { |
|
189 | + if( !isset($field['value']) ) { |
|
190 | 190 | $field['value'] = glsr( OptionManager::class )->get( |
191 | 191 | $field['name'], |
192 | 192 | $this->getFieldDefault( $field ) |
@@ -17,14 +17,14 @@ |
||
17 | 17 | $review = glsr( ReviewManager::class )->create( $command ); |
18 | 18 | if( !$review ) { |
19 | 19 | glsr( Session::class )->set( $command->form_id.'errors', [] ); |
20 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' )); |
|
20 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) ); |
|
21 | 21 | return; |
22 | 22 | } |
23 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
|
23 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) ); |
|
24 | 24 | glsr( Notification::class )->send( $review ); |
25 | 25 | do_action( 'site-reviews/local/review/submitted', $review ); |
26 | 26 | if( $command->ajax_request )return; |
27 | - if( empty( $command->referer )) { |
|
27 | + if( empty($command->referer) ) { |
|
28 | 28 | glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->info( $command ); |
29 | 29 | $command->referer = home_url(); |
30 | 30 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | 'response' => $this->buildResponse(), |
66 | 66 | 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(), |
67 | 67 | ], |
68 | - ]); |
|
68 | + ] ); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | 'context' => [ |
78 | 78 | 'text' => trim( $this->getLoginText().' '.$this->getRegisterText() ), |
79 | 79 | ], |
80 | - ]); |
|
80 | + ] ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -86,12 +86,12 @@ discard block |
||
86 | 86 | protected function buildRecaptcha() |
87 | 87 | { |
88 | 88 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return; |
89 | - return glsr( Builder::class )->div([ |
|
89 | + return glsr( Builder::class )->div( [ |
|
90 | 90 | 'class' => 'glsr-recaptcha-holder', |
91 | 91 | 'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ), |
92 | - 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )), |
|
92 | + 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ), |
|
93 | 93 | 'data-size' => 'invisible', |
94 | - ]); |
|
94 | + ] ); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function buildResponse() |
101 | 101 | { |
102 | - $classes = !empty( $this->errors ) |
|
102 | + $classes = !empty($this->errors) |
|
103 | 103 | ? glsr( StyleValidationDefaults::class )->defaults()['message_error_class'] |
104 | 104 | : ''; |
105 | 105 | return glsr( Template::class )->build( 'templates/form/response', [ |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | 'class' => $classes, |
108 | 108 | 'message' => wpautop( $this->message ), |
109 | 109 | ], |
110 | - 'has_errors' => !empty( $this->errors ), |
|
111 | - ]); |
|
110 | + 'has_errors' => !empty($this->errors), |
|
111 | + ] ); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | 'context' => [ |
121 | 121 | 'text' => __( 'Submit your review', 'site-reviews' ), |
122 | 122 | ], |
123 | - ]); |
|
123 | + ] ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $fields = array_merge( |
140 | 140 | $this->getHiddenFields(), |
141 | 141 | [$this->getHoneypotField()], |
142 | - $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )) |
|
142 | + $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ) |
|
143 | 143 | ); |
144 | 144 | return $fields; |
145 | 145 | } |
@@ -149,10 +149,10 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function getLoginText() |
151 | 151 | { |
152 | - $loginLink = glsr( Builder::class )->a([ |
|
153 | - 'href' => wp_login_url( strval( get_permalink() )), |
|
152 | + $loginLink = glsr( Builder::class )->a( [ |
|
153 | + 'href' => wp_login_url( strval( get_permalink() ) ), |
|
154 | 154 | 'text' => __( 'logged in', 'site-reviews' ), |
155 | - ]); |
|
155 | + ] ); |
|
156 | 156 | return sprintf( __( 'You must be %s to submit a review.', 'site-reviews' ), $loginLink ); |
157 | 157 | } |
158 | 158 | |
@@ -162,10 +162,10 @@ discard block |
||
162 | 162 | protected function getRegisterText() |
163 | 163 | { |
164 | 164 | if( !get_option( 'users_can_register' ) || glsr( OptionManager::class )->get( 'settings.general.require.login' ) != 'yes' )return; |
165 | - $registerLink = glsr( Builder::class )->a([ |
|
165 | + $registerLink = glsr( Builder::class )->a( [ |
|
166 | 166 | 'href' => wp_registration_url(), |
167 | 167 | 'text' => __( 'register', 'site-reviews' ), |
168 | - ]); |
|
168 | + ] ); |
|
169 | 169 | return sprintf( __( 'You may also %s for an account.', 'site-reviews' ), $registerLink ); |
170 | 170 | } |
171 | 171 | |
@@ -177,27 +177,27 @@ discard block |
||
177 | 177 | $fields = [[ |
178 | 178 | 'name' => 'action', |
179 | 179 | 'value' => 'submit-review', |
180 | - ],[ |
|
180 | + ], [ |
|
181 | 181 | 'name' => 'assign_to', |
182 | 182 | 'value' => $this->args['assign_to'], |
183 | - ],[ |
|
183 | + ], [ |
|
184 | 184 | 'name' => 'category', |
185 | 185 | 'value' => $this->args['category'], |
186 | - ],[ |
|
186 | + ], [ |
|
187 | 187 | 'name' => 'excluded', |
188 | 188 | 'value' => $this->args['excluded'], // @todo should default to "[]" |
189 | - ],[ |
|
189 | + ], [ |
|
190 | 190 | 'name' => 'form_id', |
191 | 191 | 'value' => $this->args['id'], |
192 | - ],[ |
|
192 | + ], [ |
|
193 | 193 | 'name' => 'nonce', |
194 | 194 | 'value' => wp_create_nonce( 'submit-review' ), |
195 | - ],[ |
|
195 | + ], [ |
|
196 | 196 | 'name' => 'referer', |
197 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), |
|
197 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), |
|
198 | 198 | ]]; |
199 | 199 | return array_map( function( $field ) { |
200 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
200 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
201 | 201 | }, $fields ); |
202 | 202 | } |
203 | 203 | |
@@ -206,10 +206,10 @@ discard block |
||
206 | 206 | */ |
207 | 207 | protected function getHoneypotField() |
208 | 208 | { |
209 | - return new Field([ |
|
209 | + return new Field( [ |
|
210 | 210 | 'name' => 'gotcha', |
211 | 211 | 'type' => 'honeypot', |
212 | - ]); |
|
212 | + ] ); |
|
213 | 213 | } |
214 | 214 | |
215 | 215 | /** |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | */ |
218 | 218 | protected function normalizeFieldErrors( Field &$field ) |
219 | 219 | { |
220 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
220 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
221 | 221 | $field->field['errors'] = $this->errors[$field->field['path']]; |
222 | 222 | } |
223 | 223 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | */ |
227 | 227 | protected function normalizeFieldRequired( Field &$field ) |
228 | 228 | { |
229 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
229 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
230 | 230 | $field->field['required'] = true; |
231 | 231 | } |
232 | 232 | |
@@ -249,8 +249,8 @@ discard block |
||
249 | 249 | */ |
250 | 250 | protected function normalizeFieldValue( Field &$field ) |
251 | 251 | { |
252 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
253 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
252 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
253 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
254 | 254 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
255 | 255 | } |
256 | 256 | else { |