@@ -11,14 +11,14 @@ discard block |
||
11 | 11 | */ |
12 | 12 | public function isBlacklisted( array $review ) |
13 | 13 | { |
14 | - $target = implode( "\n", array_filter([ |
|
14 | + $target = implode( "\n", array_filter( [ |
|
15 | 15 | $review['name'], |
16 | 16 | $review['content'], |
17 | 17 | $review['email'], |
18 | 18 | $review['ip_address'], |
19 | 19 | $review['title'], |
20 | - ])); |
|
21 | - return (bool) apply_filters( 'site-reviews/blacklist/is-blacklisted', |
|
20 | + ] ) ); |
|
21 | + return (bool)apply_filters( 'site-reviews/blacklist/is-blacklisted', |
|
22 | 22 | $this->check( $target ), |
23 | 23 | $review |
24 | 24 | ); |
@@ -30,16 +30,16 @@ discard block |
||
30 | 30 | */ |
31 | 31 | protected function check( $target ) |
32 | 32 | { |
33 | - $blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' )); |
|
34 | - if( empty( $blacklist )) { |
|
33 | + $blacklist = trim( glsr( OptionManager::class )->get( 'settings.submissions.blacklist.entries' ) ); |
|
34 | + if( empty($blacklist) ) { |
|
35 | 35 | return false; |
36 | 36 | } |
37 | 37 | $lines = explode( "\n", $blacklist ); |
38 | - foreach( (array) $lines as $line ) { |
|
38 | + foreach( (array)$lines as $line ) { |
|
39 | 39 | $line = trim( $line ); |
40 | - if( empty( $line ) || 256 < strlen( $line ))continue; |
|
41 | - $pattern = sprintf( '#%s#i', preg_quote( $line, '#' )); |
|
42 | - if( preg_match( $pattern, $target )) { |
|
40 | + if( empty($line) || 256 < strlen( $line ) )continue; |
|
41 | + $pattern = sprintf( '#%s#i', preg_quote( $line, '#' ) ); |
|
42 | + if( preg_match( $pattern, $target ) ) { |
|
43 | 43 | return true; |
44 | 44 | } |
45 | 45 | } |
@@ -22,11 +22,11 @@ discard block |
||
22 | 22 | $this->args = $this->normalize( $args ); |
23 | 23 | if( $this->args['total'] < 2 )return; |
24 | 24 | $links = $this->buildLinksForDeprecatedThemes(); |
25 | - if( empty( $links )) { |
|
25 | + if( empty($links) ) { |
|
26 | 26 | $links = $this->buildLinks(); |
27 | 27 | } |
28 | 28 | $links = apply_filters( 'site-reviews/reviews/navigation_links', $links, $this->args ); |
29 | - if( empty( $links ))return; |
|
29 | + if( empty($links) )return; |
|
30 | 30 | return $this->buildTemplate( $links ); |
31 | 31 | } |
32 | 32 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | 'total' => $this->args['total'], |
46 | 46 | ]; |
47 | 47 | if( is_front_page() ) { |
48 | - unset( $paginateArgs['format'] ); |
|
48 | + unset($paginateArgs['format']); |
|
49 | 49 | } |
50 | 50 | return paginate_links( $paginateArgs ); |
51 | 51 | } |
@@ -56,17 +56,17 @@ discard block |
||
56 | 56 | protected function buildLinksForDeprecatedThemes() |
57 | 57 | { |
58 | 58 | $theme = wp_get_theme()->get( 'TextDomain' ); |
59 | - if( !in_array( $theme, ['twentyten','twentyeleven','twentytwelve','twentythirteen'] ))return; |
|
59 | + if( !in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve', 'twentythirteen'] ) )return; |
|
60 | 60 | $links = ''; |
61 | 61 | if( $this->args['paged'] > 1 ) { |
62 | - $links.= sprintf( '<div class="nav-previous"><a href="%s"><span class="meta-nav">←</span> %s</a></div>', |
|
62 | + $links .= sprintf( '<div class="nav-previous"><a href="%s"><span class="meta-nav">←</span> %s</a></div>', |
|
63 | 63 | $this->buildUrlForDeprecatedThemes(-1), |
64 | 64 | __( 'Previous', 'site-reviews' ) |
65 | 65 | ); |
66 | 66 | } |
67 | 67 | if( $this->args['paged'] < $this->args['total'] ) { |
68 | - $links.= sprintf( '<div class="nav-next"><a href="%s">%s <span class="meta-nav">→</span></a></div>', |
|
69 | - $this->buildUrlForDeprecatedThemes(1), |
|
68 | + $links .= sprintf( '<div class="nav-next"><a href="%s">%s <span class="meta-nav">→</span></a></div>', |
|
69 | + $this->buildUrlForDeprecatedThemes( 1 ), |
|
70 | 70 | __( 'Next', 'site-reviews' ) |
71 | 71 | ); |
72 | 72 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $screenReaderTemplate = '<h2 class="screen-reader-text">%2$s</h2>'; |
85 | 85 | $screenReaderText = __( 'Site Reviews navigation', 'site-reviews' ); |
86 | 86 | $innerTemplate = $screenReaderTemplate.'<div class="nav-links">%3$s</div>'; |
87 | - if( in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve'] )) { |
|
87 | + if( in_array( $theme, ['twentyten', 'twentyeleven', 'twentytwelve'] ) ) { |
|
88 | 88 | $innerTemplate = '%3$s'; |
89 | 89 | } |
90 | 90 | else if( $theme == 'twentyfourteen' ) { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $template = sprintf( $template, $class, $screenReaderText, $links ); |
97 | 97 | return glsr( Builder::class )->div( $template.'<div class="glsr-loader"></div>', [ |
98 | 98 | 'class' => 'glsr-navigation', |
99 | - ]) |
|
99 | + ] ) |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -119,6 +119,6 @@ discard block |
||
119 | 119 | return wp_parse_args( $args, [ |
120 | 120 | 'paged' => glsr( QueryBuilder::class )->getPaged(), |
121 | 121 | 'total' => 1, |
122 | - ]); |
|
122 | + ] ); |
|
123 | 123 | } |
124 | 124 | } |
@@ -19,10 +19,10 @@ discard block |
||
19 | 19 | public function build( array $args = [] ) |
20 | 20 | { |
21 | 21 | $this->errors = $args['errors']; |
22 | - if( empty( $args['message'] ))return; |
|
22 | + if( empty($args['message']) )return; |
|
23 | 23 | return glsr( Builder::class )->div( wpautop( $args['message'] ), [ |
24 | 24 | 'class' => $this->getClass(), |
25 | - ]); |
|
25 | + ] ); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | protected function getClass() |
32 | 32 | { |
33 | - $errorClass = !empty( $this->errors ) |
|
33 | + $errorClass = !empty($this->errors) |
|
34 | 34 | ? 'glsr-has-errors' |
35 | 35 | : ''; |
36 | 36 | return trim( 'glsr-form-messages '.$errorClass ); |
@@ -19,7 +19,9 @@ |
||
19 | 19 | public function build( array $args = [] ) |
20 | 20 | { |
21 | 21 | $this->errors = $args['errors']; |
22 | - if( empty( $args['message'] ))return; |
|
22 | + if( empty( $args['message'] )) { |
|
23 | + return; |
|
24 | + } |
|
23 | 25 | return glsr( Builder::class )->div( wpautop( $args['message'] ), [ |
24 | 26 | 'class' => $this->getClass(), |
25 | 27 | ]); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | 'submit_button' => $this->buildSubmitButton(), |
58 | 58 | ], |
59 | 59 | 'fields' => $this->getFields(), |
60 | - ]); |
|
60 | + ] ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | return glsr( Partial::class )->build( 'form-results', [ |
69 | 69 | 'errors' => $this->errors, |
70 | 70 | 'message' => $this->message, |
71 | - ]); |
|
71 | + ] ); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | { |
79 | 79 | return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [ |
80 | 80 | 'type' => 'submit', |
81 | - ]); |
|
81 | + ] ); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | $fields = array_merge( |
99 | 99 | $this->getHiddenFields(), |
100 | 100 | [$this->getHoneypotField()], |
101 | - $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )) |
|
101 | + $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ) |
|
102 | 102 | ); |
103 | 103 | // glsr_debug( $fields ); |
104 | 104 | return $fields; |
@@ -112,27 +112,27 @@ discard block |
||
112 | 112 | $fields = [[ |
113 | 113 | 'name' => 'action', |
114 | 114 | 'value' => 'submit-review', |
115 | - ],[ |
|
115 | + ], [ |
|
116 | 116 | 'name' => 'assign_to', |
117 | 117 | 'value' => $this->args['assign_to'], |
118 | - ],[ |
|
118 | + ], [ |
|
119 | 119 | 'name' => 'category', |
120 | 120 | 'value' => $this->args['category'], |
121 | - ],[ |
|
121 | + ], [ |
|
122 | 122 | 'name' => 'excluded', |
123 | 123 | 'value' => $this->args['excluded'], // @todo should default to "[]" |
124 | - ],[ |
|
124 | + ], [ |
|
125 | 125 | 'name' => 'form_id', |
126 | 126 | 'value' => $this->args['id'], |
127 | - ],[ |
|
127 | + ], [ |
|
128 | 128 | 'name' => '_wp_http_referer', |
129 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), // @todo this doesn't work, maybe need to get this on submit |
|
130 | - ],[ |
|
129 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), // @todo this doesn't work, maybe need to get this on submit |
|
130 | + ], [ |
|
131 | 131 | 'name' => '_wpnonce', |
132 | 132 | 'value' => wp_create_nonce( 'submit-review' ), |
133 | 133 | ]]; |
134 | 134 | return array_map( function( $field ) { |
135 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
135 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
136 | 136 | }, $fields ); |
137 | 137 | } |
138 | 138 | |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | */ |
142 | 142 | protected function getHoneypotField() |
143 | 143 | { |
144 | - return new Field([ |
|
144 | + return new Field( [ |
|
145 | 145 | 'name' => 'gotcha', |
146 | 146 | 'type' => 'honeypot', |
147 | - ]); |
|
147 | + ] ); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | /** |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function normalizeFieldErrors( Field &$field ) |
154 | 154 | { |
155 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
155 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
156 | 156 | $field->field['errors'] = $this->errors[$field->field['path']]; |
157 | 157 | } |
158 | 158 | |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | */ |
162 | 162 | protected function normalizeFieldRequired( Field &$field ) |
163 | 163 | { |
164 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
164 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
165 | 165 | $field->field['required'] = true; |
166 | 166 | } |
167 | 167 | |
@@ -183,8 +183,8 @@ discard block |
||
183 | 183 | */ |
184 | 184 | protected function normalizeFieldValue( Field &$field ) |
185 | 185 | { |
186 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
187 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
186 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
187 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
188 | 188 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
189 | 189 | } |
190 | 190 | else { |
@@ -152,7 +152,9 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function normalizeFieldErrors( Field &$field ) |
154 | 154 | { |
155 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
155 | + if( !array_key_exists( $field->field['path'], $this->errors )) { |
|
156 | + return; |
|
157 | + } |
|
156 | 158 | $field->field['errors'] = $this->errors[$field->field['path']]; |
157 | 159 | } |
158 | 160 | |
@@ -161,7 +163,9 @@ discard block |
||
161 | 163 | */ |
162 | 164 | protected function normalizeFieldRequired( Field &$field ) |
163 | 165 | { |
164 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
166 | + if( !in_array( $field->field['path'], $this->required )) { |
|
167 | + return; |
|
168 | + } |
|
165 | 169 | $field->field['required'] = true; |
166 | 170 | } |
167 | 171 | |
@@ -183,7 +187,9 @@ discard block |
||
183 | 187 | */ |
184 | 188 | protected function normalizeFieldValue( Field &$field ) |
185 | 189 | { |
186 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
190 | + if( !array_key_exists( $field->field['path'], $this->values )) { |
|
191 | + return; |
|
192 | + } |
|
187 | 193 | if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
188 | 194 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
189 | 195 | } |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | { |
56 | 56 | $instance = new static; |
57 | 57 | $instance->setTagFromMethod( $method ); |
58 | - call_user_func_array( [$instance, 'normalize'], $args += ['',''] ); |
|
58 | + call_user_func_array( [$instance, 'normalize'], $args += ['', ''] ); |
|
59 | 59 | $tags = array_merge( static::TAGS_FORM, static::TAGS_SINGLE, static::TAGS_STRUCTURE, static::TAGS_TEXT ); |
60 | 60 | $generatedTag = in_array( $instance->tag, $tags ) |
61 | 61 | ? $instance->buildTag() |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | 'render' => 'is_bool', |
79 | 79 | 'tag' => 'is_string', |
80 | 80 | ]; |
81 | - if( !isset( $properties[$property] ) |
|
82 | - || empty( array_filter( [$value], $properties[$property] )) |
|
81 | + if( !isset($properties[$property]) |
|
82 | + || empty(array_filter( [$value], $properties[$property] )) |
|
83 | 83 | )return; |
84 | 84 | $this->$property = $value; |
85 | 85 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function getOpeningTag() |
99 | 99 | { |
100 | - $attributes = glsr( Attributes::class )->{$this->tag}( $this->args )->toString(); |
|
100 | + $attributes = glsr( Attributes::class )->{$this->tag}($this->args)->toString(); |
|
101 | 101 | return '<'.trim( $this->tag.' '.$attributes ).'>'; |
102 | 102 | } |
103 | 103 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | protected function buildCustomField() |
108 | 108 | { |
109 | 109 | $className = $this->getCustomFieldClassName(); |
110 | - if( class_exists( $className )) { |
|
110 | + if( class_exists( $className ) ) { |
|
111 | 111 | return (new $className( $this ))->build(); |
112 | 112 | } |
113 | 113 | glsr_log()->error( 'Field missing: '.$className ); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | */ |
119 | 119 | protected function buildDefaultTag( $text = '' ) |
120 | 120 | { |
121 | - if( empty( $text )) { |
|
121 | + if( empty($text) ) { |
|
122 | 122 | $text = $this->args['text']; |
123 | 123 | } |
124 | 124 | return $this->getOpeningTag().$text.$this->getClosingTag(); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | */ |
130 | 130 | protected function buildFieldDescription() |
131 | 131 | { |
132 | - if( empty( $this->args['description'] ))return; |
|
132 | + if( empty($this->args['description']) )return; |
|
133 | 133 | if( $this->args['is_widget'] ) { |
134 | 134 | return $this->small( $this->args['description'] ); |
135 | 135 | } |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | */ |
142 | 142 | protected function buildFormInput() |
143 | 143 | { |
144 | - if( !in_array( $this->args['type'], ['checkbox', 'radio'] )) { |
|
144 | + if( !in_array( $this->args['type'], ['checkbox', 'radio'] ) ) { |
|
145 | 145 | return $this->buildFormLabel().$this->getOpeningTag(); |
146 | 146 | } |
147 | - return empty( $this->args['options'] ) |
|
147 | + return empty($this->args['options']) |
|
148 | 148 | ? $this->buildFormInputChoice() |
149 | 149 | : $this->buildFormInputMultiChoice(); |
150 | 150 | } |
@@ -154,13 +154,13 @@ discard block |
||
154 | 154 | */ |
155 | 155 | protected function buildFormInputChoice() |
156 | 156 | { |
157 | - $labelText = !empty( $this->args['text'] ) |
|
157 | + $labelText = !empty($this->args['text']) |
|
158 | 158 | ? $this->args['text'] |
159 | 159 | : $this->args['label']; |
160 | 160 | return $this->label( $this->getOpeningTag().' '.$labelText, [ |
161 | 161 | 'class' => 'glsr-'.$this->args['type'].'-label', |
162 | 162 | 'for' => $this->args['id'], |
163 | - ]); |
|
163 | + ] ); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | /** |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | protected function buildFormInputMultiChoice() |
170 | 170 | { |
171 | 171 | if( $this->args['type'] == 'checkbox' ) { |
172 | - $this->args['name'].= '[]'; |
|
172 | + $this->args['name'] .= '[]'; |
|
173 | 173 | } |
174 | 174 | $options = array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) { |
175 | 175 | return $carry.$this->li( $this->{$this->args['type']}([ |
@@ -177,12 +177,12 @@ discard block |
||
177 | 177 | 'name' => $this->args['name'], |
178 | 178 | 'text' => $this->args['options'][$key], |
179 | 179 | 'value' => $key, |
180 | - ])); |
|
180 | + ]) ); |
|
181 | 181 | }); |
182 | 182 | return $this->ul( $options, [ |
183 | 183 | 'class' => $this->args['class'], |
184 | 184 | 'id' => $this->args['id'], |
185 | - ]); |
|
185 | + ] ); |
|
186 | 186 | } |
187 | 187 | |
188 | 188 | /** |
@@ -190,11 +190,11 @@ discard block |
||
190 | 190 | */ |
191 | 191 | protected function buildFormLabel() |
192 | 192 | { |
193 | - if( empty( $this->args['label'] ) || $this->args['type'] == 'hidden' )return; |
|
194 | - return $this->label([ |
|
193 | + if( empty($this->args['label']) || $this->args['type'] == 'hidden' )return; |
|
194 | + return $this->label( [ |
|
195 | 195 | 'for' => $this->args['id'], |
196 | 196 | 'text' => $this->args['label'], |
197 | - ]); |
|
197 | + ] ); |
|
198 | 198 | } |
199 | 199 | |
200 | 200 | /** |
@@ -211,11 +211,11 @@ discard block |
||
211 | 211 | protected function buildFormSelectOptions() |
212 | 212 | { |
213 | 213 | return array_reduce( array_keys( $this->args['options'] ), function( $carry, $key ) { |
214 | - return $carry.$this->option([ |
|
214 | + return $carry.$this->option( [ |
|
215 | 215 | 'selected' => $this->args['value'] == $key, |
216 | 216 | 'text' => $this->args['options'][$key], |
217 | 217 | 'value' => $key, |
218 | - ]); |
|
218 | + ] ); |
|
219 | 219 | }); |
220 | 220 | } |
221 | 221 | |
@@ -233,10 +233,10 @@ discard block |
||
233 | 233 | protected function buildTag() |
234 | 234 | { |
235 | 235 | $this->mergeArgsWithRequiredDefaults(); |
236 | - if( in_array( $this->tag, static::TAGS_SINGLE )) { |
|
236 | + if( in_array( $this->tag, static::TAGS_SINGLE ) ) { |
|
237 | 237 | return $this->getOpeningTag(); |
238 | 238 | } |
239 | - if( !in_array( $this->tag, static::TAGS_FORM )) { |
|
239 | + if( !in_array( $this->tag, static::TAGS_FORM ) ) { |
|
240 | 240 | return $this->buildDefaultTag(); |
241 | 241 | } |
242 | 242 | return call_user_func( [$this, 'buildForm'.ucfirst( $this->tag )] ).$this->buildFieldDescription(); |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | protected function mergeArgsWithRequiredDefaults() |
257 | 257 | { |
258 | 258 | $className = $this->getCustomFieldClassName(); |
259 | - if( class_exists( $className )) { |
|
259 | + if( class_exists( $className ) ) { |
|
260 | 260 | $this->args = array_merge( |
261 | 261 | wp_parse_args( $this->args, $className::defaults() ), |
262 | 262 | $className::required() |
@@ -271,13 +271,13 @@ discard block |
||
271 | 271 | */ |
272 | 272 | protected function normalize( ...$params ) |
273 | 273 | { |
274 | - if( is_string( $params[0] ) || is_numeric( $params[0] )) { |
|
274 | + if( is_string( $params[0] ) || is_numeric( $params[0] ) ) { |
|
275 | 275 | $this->setNameOrTextAttributeForTag( $params[0] ); |
276 | 276 | } |
277 | - if( is_array( $params[0] )) { |
|
277 | + if( is_array( $params[0] ) ) { |
|
278 | 278 | $this->args += $params[0]; |
279 | 279 | } |
280 | - else if( is_array( $params[1] )) { |
|
280 | + else if( is_array( $params[1] ) ) { |
|
281 | 281 | $this->args += $params[1]; |
282 | 282 | } |
283 | 283 | } |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | protected function setTagFromMethod( $method ) |
302 | 302 | { |
303 | 303 | $this->tag = strtolower( $method ); |
304 | - if( in_array( $this->tag, static::INPUT_TYPES )) { |
|
304 | + if( in_array( $this->tag, static::INPUT_TYPES ) ) { |
|
305 | 305 | $this->args['type'] = $this->tag; |
306 | 306 | $this->tag = 'input'; |
307 | 307 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | : $this->$method( $id ); |
24 | 24 | return glsr( Template::class )->build( 'pages/settings/'.$id, [ |
25 | 25 | 'context' => $context, |
26 | - ]); |
|
26 | + ] ); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected function getFieldDefault( array $field ) |
33 | 33 | { |
34 | - return isset( $field['default'] ) |
|
34 | + return isset($field['default']) |
|
35 | 35 | ? $field['default'] |
36 | 36 | : ''; |
37 | 37 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | protected function getSettingFields( $path ) |
43 | 43 | { |
44 | 44 | $settings = glsr( DefaultsManager::class )->settings(); |
45 | - return array_filter( $settings, function( $key ) use( $path ) { |
|
45 | + return array_filter( $settings, function( $key ) use($path) { |
|
46 | 46 | return glsr( Helper::class )->startsWith( $path, $key ); |
47 | 47 | }, ARRAY_FILTER_USE_KEY ); |
48 | 48 | } |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected function getTemplateContext( $id ) |
55 | 55 | { |
56 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
56 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
57 | 57 | $rows = ''; |
58 | 58 | foreach( $fields as $name => $field ) { |
59 | 59 | $field = wp_parse_args( $field, [ |
60 | 60 | 'is_setting' => true, |
61 | 61 | 'name' => $name, |
62 | - ]); |
|
63 | - $rows.= new Field( $this->normalize( $field )); |
|
62 | + ] ); |
|
63 | + $rows .= new Field( $this->normalize( $field ) ); |
|
64 | 64 | } |
65 | 65 | return [ |
66 | 66 | 'rows' => $rows, |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | protected function getTemplateContextForTranslations() |
74 | 74 | { |
75 | 75 | $translations = glsr( Translator::class )->renderAll(); |
76 | - $class = empty( $translations ) |
|
76 | + $class = empty($translations) |
|
77 | 77 | ? 'glsr-hidden' |
78 | 78 | : ''; |
79 | 79 | return [ |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $path, |
95 | 95 | glsr( Helper::class )->getPathValue( $path, glsr()->defaults ) |
96 | 96 | ); |
97 | - if( is_array( $expectedValue )) { |
|
97 | + if( is_array( $expectedValue ) ) { |
|
98 | 98 | return !in_array( $optionValue, $expectedValue ); |
99 | 99 | } |
100 | 100 | return $optionValue != $expectedValue; |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | */ |
117 | 117 | protected function normalizeDependsOn( array $field ) |
118 | 118 | { |
119 | - if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) { |
|
119 | + if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) { |
|
120 | 120 | $path = key( $field['depends_on'] ); |
121 | 121 | $expectedValue = $field['depends_on'][$path]; |
122 | - $field['data-depends'] = json_encode([ |
|
122 | + $field['data-depends'] = json_encode( [ |
|
123 | 123 | 'name' => glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ), |
124 | 124 | 'value' => $expectedValue, |
125 | - ], JSON_HEX_APOS|JSON_HEX_QUOT ); |
|
125 | + ], JSON_HEX_APOS | JSON_HEX_QUOT ); |
|
126 | 126 | $field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue ); |
127 | 127 | } |
128 | 128 | return $field; |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function normalizeLabelAndLegend( array $field ) |
135 | 135 | { |
136 | - if( !empty( $field['label'] )) { |
|
136 | + if( !empty($field['label']) ) { |
|
137 | 137 | $field['legend'] = $field['label']; |
138 | - unset( $field['label'] ); |
|
138 | + unset($field['label']); |
|
139 | 139 | } |
140 | 140 | else { |
141 | 141 | $field['is_valid'] = false; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function normalizeValue( array $field ) |
151 | 151 | { |
152 | - if( !isset( $field['value'] )) { |
|
152 | + if( !isset($field['value']) ) { |
|
153 | 153 | $field['value'] = glsr( OptionManager::class )->get( |
154 | 154 | $field['name'], |
155 | 155 | $this->getFieldDefault( $field ) |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'is_valid' => true, |
27 | 27 | 'is_widget' => false, |
28 | 28 | 'path' => '', |
29 | - ]); |
|
29 | + ] ); |
|
30 | 30 | $this->normalize(); |
31 | 31 | } |
32 | 32 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | { |
46 | 46 | if( !$this->field['is_valid'] )return; |
47 | 47 | if( $this->field['is_raw'] ) { |
48 | - return glsr( Builder::class )->{$this->field['type']}( $this->field ); |
|
48 | + return glsr( Builder::class )->{$this->field['type']}($this->field); |
|
49 | 49 | } |
50 | 50 | if( !$this->field['is_setting'] ) { |
51 | 51 | return $this->buildField(); |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | 'context' => [ |
74 | 74 | 'class' => $this->getFieldClass(), |
75 | 75 | 'errors' => $this->getFieldErrors(), |
76 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
76 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
77 | 77 | ], |
78 | - ]); |
|
78 | + ] ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | return glsr( Template::class )->build( 'partials/form/table-row', [ |
87 | 87 | 'context' => [ |
88 | 88 | 'class' => $this->getFieldClass(), |
89 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
89 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
90 | 90 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
91 | 91 | ], |
92 | - ]); |
|
92 | + ] ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -98,16 +98,16 @@ discard block |
||
98 | 98 | protected function buildSettingMultiField() |
99 | 99 | { |
100 | 100 | $dependsOn = $this->getFieldDependsOn(); |
101 | - unset( $this->field['data-depends'] ); |
|
101 | + unset($this->field['data-depends']); |
|
102 | 102 | return glsr( Template::class )->build( 'partials/form/table-row-multiple', [ |
103 | 103 | 'context' => [ |
104 | 104 | 'class' => $this->getFieldClass(), |
105 | 105 | 'depends_on' => $dependsOn, |
106 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
106 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
107 | 107 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
108 | 108 | 'legend' => $this->field['legend'], |
109 | 109 | ], |
110 | - ]); |
|
110 | + ] ); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | protected function getFieldClass() |
117 | 117 | { |
118 | 118 | $classes = []; |
119 | - if( !empty( $this->field['errors'] )) { |
|
119 | + if( !empty($this->field['errors']) ) { |
|
120 | 120 | $classes[] = 'glsr-has-error'; |
121 | 121 | } |
122 | 122 | if( $this->field['is_hidden'] ) { |
123 | 123 | $classes[] = 'hidden'; |
124 | 124 | } |
125 | - if( !empty( $this->field['required'] )) { |
|
125 | + if( !empty($this->field['required']) ) { |
|
126 | 126 | $classes[] = 'glsr-required'; |
127 | 127 | } |
128 | 128 | return implode( ' ', $classes ); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function getFieldDependsOn() |
135 | 135 | { |
136 | - return !empty( $this->field['data-depends'] ) |
|
136 | + return !empty($this->field['data-depends']) |
|
137 | 137 | ? $this->field['data-depends'] |
138 | 138 | : ''; |
139 | 139 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | protected function getFieldErrors() |
145 | 145 | { |
146 | - if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return; |
|
146 | + if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) )return; |
|
147 | 147 | $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
148 | 148 | return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
149 | 149 | }); |
@@ -170,13 +170,13 @@ discard block |
||
170 | 170 | 'name', 'type', |
171 | 171 | ]; |
172 | 172 | foreach( $requiredValues as $value ) { |
173 | - if( isset( $this->field[$value] ))continue; |
|
173 | + if( isset($this->field[$value]) )continue; |
|
174 | 174 | $missingValues[] = $value; |
175 | 175 | $this->field['is_valid'] = false; |
176 | 176 | } |
177 | - if( !empty( $missingValues )) { |
|
177 | + if( !empty($missingValues) ) { |
|
178 | 178 | glsr_log() |
179 | - ->warning( 'Field is missing: '.implode( ', ', $missingValues )) |
|
179 | + ->warning( 'Field is missing: '.implode( ', ', $missingValues ) ) |
|
180 | 180 | ->info( $this->field ); |
181 | 181 | } |
182 | 182 | return $this->field['is_valid']; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | if( !$this->isFieldValid() )return; |
191 | 191 | $this->field['path'] = $this->field['name']; |
192 | 192 | $className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
193 | - if( class_exists( $className )) { |
|
193 | + if( class_exists( $className ) ) { |
|
194 | 194 | $this->field = array_merge( |
195 | 195 | wp_parse_args( $this->field, $className::defaults() ), |
196 | 196 | $className::required() |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | */ |
206 | 206 | protected function normalizeFieldId() |
207 | 207 | { |
208 | - if( isset( $this->field['id'] ) || $this->field['is_raw'] )return; |
|
208 | + if( isset($this->field['id']) || $this->field['is_raw'] )return; |
|
209 | 209 | $this->field['id'] = glsr( Helper::class )->convertPathToId( |
210 | 210 | $this->field['path'], |
211 | 211 | $this->getFieldPrefix() |
@@ -43,7 +43,9 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function build() |
45 | 45 | { |
46 | - if( !$this->field['is_valid'] )return; |
|
46 | + if( !$this->field['is_valid'] ) { |
|
47 | + return; |
|
48 | + } |
|
47 | 49 | if( $this->field['is_raw'] ) { |
48 | 50 | return glsr( Builder::class )->{$this->field['type']}( $this->field ); |
49 | 51 | } |
@@ -143,7 +145,9 @@ discard block |
||
143 | 145 | */ |
144 | 146 | protected function getFieldErrors() |
145 | 147 | { |
146 | - if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return; |
|
148 | + if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] )) { |
|
149 | + return; |
|
150 | + } |
|
147 | 151 | $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
148 | 152 | return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
149 | 153 | }); |
@@ -170,7 +174,9 @@ discard block |
||
170 | 174 | 'name', 'type', |
171 | 175 | ]; |
172 | 176 | foreach( $requiredValues as $value ) { |
173 | - if( isset( $this->field[$value] ))continue; |
|
177 | + if( isset( $this->field[$value] )) { |
|
178 | + continue; |
|
179 | + } |
|
174 | 180 | $missingValues[] = $value; |
175 | 181 | $this->field['is_valid'] = false; |
176 | 182 | } |
@@ -187,7 +193,9 @@ discard block |
||
187 | 193 | */ |
188 | 194 | protected function normalize() |
189 | 195 | { |
190 | - if( !$this->isFieldValid() )return; |
|
196 | + if( !$this->isFieldValid() ) { |
|
197 | + return; |
|
198 | + } |
|
191 | 199 | $this->field['path'] = $this->field['name']; |
192 | 200 | $className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
193 | 201 | if( class_exists( $className )) { |
@@ -205,7 +213,9 @@ discard block |
||
205 | 213 | */ |
206 | 214 | protected function normalizeFieldId() |
207 | 215 | { |
208 | - if( isset( $this->field['id'] ) || $this->field['is_raw'] )return; |
|
216 | + if( isset( $this->field['id'] ) || $this->field['is_raw'] ) { |
|
217 | + return; |
|
218 | + } |
|
209 | 219 | $this->field['id'] = glsr( Helper::class )->convertPathToId( |
210 | 220 | $this->field['path'], |
211 | 221 | $this->getFieldPrefix() |
@@ -33,10 +33,10 @@ discard block |
||
33 | 33 | foreach( glsr( Database::class )->getReviews( $this->args )->reviews as $review ) { |
34 | 34 | $reviews[] = $this->buildReview( $review ); |
35 | 35 | } |
36 | - if( !empty( $reviews )) { |
|
36 | + if( !empty($reviews) ) { |
|
37 | 37 | array_walk( $reviews, function( &$review ) { |
38 | - unset( $review['@context'] ); |
|
39 | - unset( $review['itemReviewed'] ); |
|
38 | + unset($review['@context']); |
|
39 | + unset($review['itemReviewed']); |
|
40 | 40 | }); |
41 | 41 | $schema['review'] = $reviews; |
42 | 42 | } |
@@ -50,20 +50,20 @@ discard block |
||
50 | 50 | public function buildReview( $review ) |
51 | 51 | { |
52 | 52 | $schema = SchemaOrg::Review() |
53 | - ->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) { |
|
53 | + ->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) { |
|
54 | 54 | $schema->name( $review->title ); |
55 | 55 | }) |
56 | - ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) { |
|
56 | + ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) { |
|
57 | 57 | $schema->reviewBody( $review->content ); |
58 | 58 | }) |
59 | - ->datePublished(( new DateTime( $review->date ))->format( DateTime::ISO8601 )) |
|
59 | + ->datePublished( (new DateTime( $review->date ))->format( DateTime::ISO8601 ) ) |
|
60 | 60 | ->author( SchemaOrg::Person() |
61 | 61 | ->name( $review->author ) |
62 | 62 | ) |
63 | 63 | ->itemReviewed( $this->getSchemaType() |
64 | 64 | ->name( $this->getThingName() ) |
65 | 65 | ); |
66 | - if( !empty( $review->rating )) { |
|
66 | + if( !empty($review->rating) ) { |
|
67 | 67 | $schema->reviewRating( SchemaOrg::Rating() |
68 | 68 | ->ratingValue( $review->rating ) |
69 | 69 | ->bestRating( Rating::MAX_RATING ) |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | */ |
80 | 80 | public function buildSummary( $args = null ) |
81 | 81 | { |
82 | - if( is_array( $args )) { |
|
82 | + if( is_array( $args ) ) { |
|
83 | 83 | $this->args = $args; |
84 | 84 | } |
85 | 85 | $schema = $this->getSchemaType() |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | ->image( $this->getThingImage() ) |
92 | 92 | ->url( $this->getThingUrl() ); |
93 | 93 | $count = $this->getReviewCount(); |
94 | - if( !empty( $count )) { |
|
94 | + if( !empty($count) ) { |
|
95 | 95 | $schema->aggregateRating( SchemaOrg::AggregateRating() |
96 | 96 | ->ratingValue( $this->getRatingValue() ) |
97 | 97 | ->reviewCount( $count ) |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function render() |
111 | 111 | { |
112 | - if( is_null( glsr()->schemas ))return; |
|
112 | + if( is_null( glsr()->schemas ) )return; |
|
113 | 113 | printf( '<script type="application/ld+json">%s</script>', json_encode( |
114 | 114 | apply_filters( 'site-reviews/schema/all', glsr()->schemas ), |
115 | 115 | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES |
116 | - )); |
|
116 | + ) ); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -121,9 +121,9 @@ discard block |
||
121 | 121 | */ |
122 | 122 | public function store( array $schema ) |
123 | 123 | { |
124 | - $schemas = (array) glsr()->schemas; |
|
124 | + $schemas = (array)glsr()->schemas; |
|
125 | 125 | $schemas[] = $schema; |
126 | - glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ))); |
|
126 | + glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ) ) ); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | protected function getReviews( $force = false ) |
150 | 150 | { |
151 | - if( !isset( $this->reviews ) || $force ) { |
|
151 | + if( !isset($this->reviews) || $force ) { |
|
152 | 152 | $args = wp_parse_args( ['count' => -1], $this->args ); |
153 | 153 | $this->reviews = glsr( Database::class )->getReviews( $args )->reviews; |
154 | 154 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | protected function getSchemaOption( $option, $fallback ) |
164 | 164 | { |
165 | - if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ))) { |
|
165 | + if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) { |
|
166 | 166 | return $schemaOption; |
167 | 167 | } |
168 | 168 | $default = glsr( OptionManager::class )->get( 'settings.reviews.schema.'.$option.'.default', $fallback ); |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | switch( $option ) { |
187 | 187 | case 'description': |
188 | 188 | $post = get_post(); |
189 | - if( !( $post instanceof WP_Post )) { |
|
189 | + if( !($post instanceof WP_Post) ) { |
|
190 | 190 | return ''; |
191 | 191 | } |
192 | - $text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt )); |
|
193 | - return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 )); |
|
192 | + $text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt ) ); |
|
193 | + return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) ); |
|
194 | 194 | case 'image': |
195 | 195 | return (string)get_the_post_thumbnail_url( null, 'large' ); |
196 | 196 | case 'name': |
@@ -109,7 +109,9 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function render() |
111 | 111 | { |
112 | - if( is_null( glsr()->schemas ))return; |
|
112 | + if( is_null( glsr()->schemas )) { |
|
113 | + return; |
|
114 | + } |
|
113 | 115 | printf( '<script type="application/ld+json">%s</script>', json_encode( |
114 | 116 | apply_filters( 'site-reviews/schema/all', glsr()->schemas ), |
115 | 117 | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES |
@@ -182,7 +184,9 @@ discard block |
||
182 | 184 | if( $value != $fallback ) { |
183 | 185 | return $value; |
184 | 186 | } |
185 | - if( !is_single() && !is_page() )return; |
|
187 | + if( !is_single() && !is_page() ) { |
|
188 | + return; |
|
189 | + } |
|
186 | 190 | switch( $option ) { |
187 | 191 | case 'description': |
188 | 192 | $post = get_post(); |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | foreach( $this->rules as $attribute => $rules ) { |
74 | 74 | foreach( $rules as $rule ) { |
75 | 75 | $this->validateAttribute( $attribute, $rule ); |
76 | - if( $this->shouldStopValidating( $attribute ))break; |
|
76 | + if( $this->shouldStopValidating( $attribute ) )break; |
|
77 | 77 | } |
78 | 78 | } |
79 | 79 | return $this->errors; |
@@ -88,13 +88,13 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function validateAttribute( $attribute, $rule ) |
90 | 90 | { |
91 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
91 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
92 | 92 | if( $rule == '' )return; |
93 | 93 | $value = $this->getValue( $attribute ); |
94 | - if( !method_exists( $this, $method = 'validate'.$rule )) { |
|
94 | + if( !method_exists( $this, $method = 'validate'.$rule ) ) { |
|
95 | 95 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
96 | 96 | } |
97 | - if( !$this->$method( $attribute, $value, $parameters )) { |
|
97 | + if( !$this->$method( $attribute, $value, $parameters ) ) { |
|
98 | 98 | $this->addFailure( $attribute, $rule, $parameters ); |
99 | 99 | } |
100 | 100 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | protected function getMessage( $attribute, $rule, array $parameters ) |
145 | 145 | { |
146 | - if( in_array( $rule, $this->sizeRules )) { |
|
146 | + if( in_array( $rule, $this->sizeRules ) ) { |
|
147 | 147 | return $this->getSizeMessage( $attribute, $rule, $parameters ); |
148 | 148 | } |
149 | 149 | $lowerRule = glsr( Helper::class )->snakeCase( $rule ); |
@@ -158,11 +158,11 @@ discard block |
||
158 | 158 | */ |
159 | 159 | protected function getRule( $attribute, $rules ) |
160 | 160 | { |
161 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
162 | - $rules = (array) $rules; |
|
161 | + if( !array_key_exists( $attribute, $this->rules ) )return; |
|
162 | + $rules = (array)$rules; |
|
163 | 163 | foreach( $this->rules[$attribute] as $rule ) { |
164 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
165 | - if( in_array( $rule, $rules )) { |
|
164 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
165 | + if( in_array( $rule, $rules ) ) { |
|
166 | 166 | return [$rule, $parameters]; |
167 | 167 | } |
168 | 168 | } |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | if( is_numeric( $value ) && $hasNumeric ) { |
181 | 181 | return $value; |
182 | 182 | } |
183 | - elseif( is_array( $value )) { |
|
183 | + elseif( is_array( $value ) ) { |
|
184 | 184 | return count( $value ); |
185 | 185 | } |
186 | 186 | 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 | /** |
@@ -259,11 +259,11 @@ discard block |
||
259 | 259 | $parameters = []; |
260 | 260 | // example: {rule}:{parameters} |
261 | 261 | if( strpos( $rule, ':' ) !== false ) { |
262 | - list( $rule, $parameter ) = explode( ':', $rule, 2 ); |
|
262 | + list($rule, $parameter) = explode( ':', $rule, 2 ); |
|
263 | 263 | // example: {parameter1,parameter2,...} |
264 | 264 | $parameters = $this->parseParameters( $rule, $parameter ); |
265 | 265 | } |
266 | - $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ))); |
|
266 | + $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) ); |
|
267 | 267 | $rule = str_replace( ' ', '', $rule ); |
268 | 268 | return [$rule, $parameters]; |
269 | 269 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | protected function shouldStopValidating( $attribute ) |
291 | 291 | { |
292 | 292 | return $this->hasRule( $attribute, $this->implicitRules ) |
293 | - && isset( $this->failedRules[$attribute] ) |
|
293 | + && isset($this->failedRules[$attribute]) |
|
294 | 294 | && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules ); |
295 | 295 | } |
296 | 296 | |
@@ -315,11 +315,11 @@ discard block |
||
315 | 315 | 'regex' => __( 'The format is invalid.', 'site-reviews' ), |
316 | 316 | 'required' => __( 'This field is required.', 'site-reviews' ), |
317 | 317 | ]; |
318 | - $message = isset( $strings[$key] ) |
|
318 | + $message = isset($strings[$key]) |
|
319 | 319 | ? $strings[$key] |
320 | 320 | : false; |
321 | 321 | if( !$message )return; |
322 | - if( method_exists( $this, $method = 'replace'.$rule )) { |
|
322 | + if( method_exists( $this, $method = 'replace'.$rule ) ) { |
|
323 | 323 | $message = $this->$method( $message, $parameters ); |
324 | 324 | } |
325 | 325 | return $message; |
@@ -73,7 +73,9 @@ discard block |
||
73 | 73 | foreach( $this->rules as $attribute => $rules ) { |
74 | 74 | foreach( $rules as $rule ) { |
75 | 75 | $this->validateAttribute( $attribute, $rule ); |
76 | - if( $this->shouldStopValidating( $attribute ))break; |
|
76 | + if( $this->shouldStopValidating( $attribute )) { |
|
77 | + break; |
|
78 | + } |
|
77 | 79 | } |
78 | 80 | } |
79 | 81 | return $this->errors; |
@@ -89,7 +91,9 @@ discard block |
||
89 | 91 | public function validateAttribute( $attribute, $rule ) |
90 | 92 | { |
91 | 93 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
92 | - if( $rule == '' )return; |
|
94 | + if( $rule == '' ) { |
|
95 | + return; |
|
96 | + } |
|
93 | 97 | $value = $this->getValue( $attribute ); |
94 | 98 | if( !method_exists( $this, $method = 'validate'.$rule )) { |
95 | 99 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
@@ -158,7 +162,9 @@ discard block |
||
158 | 162 | */ |
159 | 163 | protected function getRule( $attribute, $rules ) |
160 | 164 | { |
161 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
165 | + if( !array_key_exists( $attribute, $this->rules )) { |
|
166 | + return; |
|
167 | + } |
|
162 | 168 | $rules = (array) $rules; |
163 | 169 | foreach( $this->rules[$attribute] as $rule ) { |
164 | 170 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
@@ -318,7 +324,9 @@ discard block |
||
318 | 324 | $message = isset( $strings[$key] ) |
319 | 325 | ? $strings[$key] |
320 | 326 | : false; |
321 | - if( !$message )return; |
|
327 | + if( !$message ) { |
|
328 | + return; |
|
329 | + } |
|
322 | 330 | if( method_exists( $this, $method = 'replace'.$rule )) { |
323 | 331 | $message = $this->$method( $message, $parameters ); |
324 | 332 | } |