@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function saveAssignedToMetabox( $postId ) |
15 | 15 | { |
16 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ))return; |
|
17 | - $assignedTo = strval( glsr( Helper::class )->filterInput( 'assigned_to' )); |
|
16 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ) )return; |
|
17 | + $assignedTo = strval( glsr( Helper::class )->filterInput( 'assigned_to' ) ); |
|
18 | 18 | if( get_post_meta( $postId, 'assigned_to', true ) != $assignedTo ) { |
19 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
19 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
20 | 20 | glsr( CountsManager::class )->decreasePostCounts( $review ); |
21 | 21 | } |
22 | 22 | update_post_meta( $postId, 'assigned_to', $assignedTo ); |
@@ -28,12 +28,12 @@ discard block |
||
28 | 28 | */ |
29 | 29 | public function saveResponseMetabox( $postId ) |
30 | 30 | { |
31 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ))return; |
|
32 | - $response = strval( glsr( Helper::class )->filterInput( 'response' )); |
|
31 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ) )return; |
|
32 | + $response = strval( glsr( Helper::class )->filterInput( 'response' ) ); |
|
33 | 33 | update_post_meta( $postId, 'response', trim( wp_kses( $response, [ |
34 | 34 | 'a' => ['href' => [], 'title' => []], |
35 | 35 | 'em' => [], |
36 | 36 | 'strong' => [], |
37 | - ]))); |
|
37 | + ] ) ) ); |
|
38 | 38 | } |
39 | 39 | } |
@@ -13,7 +13,9 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function saveAssignedToMetabox( $postId ) |
15 | 15 | { |
16 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' ))return; |
|
16 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-assigned-to' ), 'assigned_to' )) { |
|
17 | + return; |
|
18 | + } |
|
17 | 19 | $assignedTo = strval( glsr( Helper::class )->filterInput( 'assigned_to' )); |
18 | 20 | if( get_post_meta( $postId, 'assigned_to', true ) != $assignedTo ) { |
19 | 21 | $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
@@ -28,7 +30,9 @@ discard block |
||
28 | 30 | */ |
29 | 31 | public function saveResponseMetabox( $postId ) |
30 | 32 | { |
31 | - if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' ))return; |
|
33 | + if( !wp_verify_nonce( glsr( Helper::class )->filterInput( '_nonce-response' ), 'response' )) { |
|
34 | + return; |
|
35 | + } |
|
32 | 36 | $response = strval( glsr( Helper::class )->filterInput( 'response' )); |
33 | 37 | update_post_meta( $postId, 'response', trim( wp_kses( $response, [ |
34 | 38 | 'a' => ['href' => [], 'title' => []], |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $this->getCounts(), |
66 | 66 | $review->review_type, |
67 | 67 | $review->rating |
68 | - )); |
|
68 | + ) ); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function decreasePostCounts( Review $review ) |
75 | 75 | { |
76 | - if( empty( $counts = $this->getPostCounts( $review->assigned_to )))return; |
|
76 | + if( empty($counts = $this->getPostCounts( $review->assigned_to )) )return; |
|
77 | 77 | $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating ); |
78 | 78 | $this->setPostCounts( $review->assigned_to, $counts ); |
79 | 79 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | public function decreaseTermCounts( Review $review ) |
85 | 85 | { |
86 | 86 | foreach( $review->term_ids as $termId ) { |
87 | - if( empty( $counts = $this->getTermCounts( $termId )))continue; |
|
87 | + if( empty($counts = $this->getTermCounts( $termId )) )continue; |
|
88 | 88 | $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating ); |
89 | 89 | $this->setTermCounts( $termId, $counts ); |
90 | 90 | } |
@@ -96,17 +96,17 @@ discard block |
||
96 | 96 | public function flatten( array $reviewCounts, array $args = [] ) |
97 | 97 | { |
98 | 98 | $counts = []; |
99 | - array_walk_recursive( $reviewCounts, function( $num, $index ) use( &$counts ) { |
|
100 | - $counts[$index] = isset( $counts[$index] ) |
|
99 | + array_walk_recursive( $reviewCounts, function( $num, $index ) use(&$counts) { |
|
100 | + $counts[$index] = isset($counts[$index]) |
|
101 | 101 | ? $num + $counts[$index] |
102 | 102 | : $num; |
103 | 103 | }); |
104 | 104 | $args = wp_parse_args( $args, [ |
105 | 105 | 'max' => Rating::MAX_RATING, |
106 | 106 | 'min' => Rating::MIN_RATING, |
107 | - ]); |
|
107 | + ] ); |
|
108 | 108 | foreach( $counts as $index => &$num ) { |
109 | - if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ))continue; |
|
109 | + if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ) )continue; |
|
110 | 110 | $num = 0; |
111 | 111 | } |
112 | 112 | return $counts; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | 'post_ids' => [], |
122 | 122 | 'term_ids' => [], |
123 | 123 | 'type' => 'local', |
124 | - ]); |
|
124 | + ] ); |
|
125 | 125 | $counts = []; |
126 | 126 | foreach( $args['post_ids'] as $postId ) { |
127 | 127 | $counts[] = $this->getPostCounts( $postId ); |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | foreach( $args['term_ids'] as $termId ) { |
130 | 130 | $counts[] = $this->getTermCounts( $termId ); |
131 | 131 | } |
132 | - if( empty( $counts )) { |
|
132 | + if( empty($counts) ) { |
|
133 | 133 | $counts[] = $this->getCounts(); |
134 | 134 | } |
135 | 135 | return array_column( $counts, $args['type'] ); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function getPostCounts( $postId ) |
151 | 151 | { |
152 | - return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true )); |
|
152 | + return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true ) ); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | */ |
159 | 159 | public function getTermCounts( $termId ) |
160 | 160 | { |
161 | - return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true )); |
|
161 | + return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true ) ); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | /** |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public function increaseCounts( Review $review ) |
178 | 178 | { |
179 | - if( empty( $counts = $this->getCounts() )) { |
|
179 | + if( empty($counts = $this->getCounts()) ) { |
|
180 | 180 | $counts = $this->buildCounts(); |
181 | 181 | } |
182 | 182 | $this->setCounts( $this->increaseRating( |
183 | 183 | $counts, |
184 | 184 | $review->review_type, |
185 | 185 | $review->rating |
186 | - )); |
|
186 | + ) ); |
|
187 | 187 | } |
188 | 188 | |
189 | 189 | /** |
@@ -191,9 +191,9 @@ discard block |
||
191 | 191 | */ |
192 | 192 | public function increasePostCounts( Review $review ) |
193 | 193 | { |
194 | - if( !( get_post( $review->assigned_to ) instanceof WP_Post ))return; |
|
194 | + if( !(get_post( $review->assigned_to ) instanceof WP_Post) )return; |
|
195 | 195 | $counts = $this->getPostCounts( $review->assigned_to ); |
196 | - $counts = empty( $counts ) |
|
196 | + $counts = empty($counts) |
|
197 | 197 | ? $this->buildPostCounts( $review->assigned_to ) |
198 | 198 | : $this->increaseRating( $counts, $review->review_type, $review->rating ); |
199 | 199 | $this->setPostCounts( $review->assigned_to, $counts ); |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | */ |
205 | 205 | public function increaseTermCounts( Review $review ) |
206 | 206 | { |
207 | - $termIds = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids )); |
|
207 | + $termIds = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids ) ); |
|
208 | 208 | foreach( $termIds as $termId ) { |
209 | 209 | $counts = $this->getTermCounts( $termId ); |
210 | - $counts = empty( $counts ) |
|
210 | + $counts = empty($counts) |
|
211 | 211 | ? $this->buildTermCounts( $termId ) |
212 | 212 | : $this->increaseRating( $counts, $review->review_type, $review->rating ); |
213 | 213 | $this->setTermCounts( $termId, $counts ); |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | { |
231 | 231 | $ratingCounts = glsr( CountsManager::class )->flatten( $reviewCounts ); |
232 | 232 | update_post_meta( $postId, static::META_COUNT, $reviewCounts ); |
233 | - update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts )); |
|
234 | - update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts )); |
|
233 | + update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) ); |
|
234 | + update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) ); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -240,11 +240,11 @@ discard block |
||
240 | 240 | */ |
241 | 241 | public function setTermCounts( $termId, array $reviewCounts ) |
242 | 242 | { |
243 | - if( !term_exists( $termId ))return; |
|
243 | + if( !term_exists( $termId ) )return; |
|
244 | 244 | $ratingCounts = glsr( CountsManager::class )->flatten( $reviewCounts ); |
245 | 245 | update_term_meta( $termId, static::META_COUNT, $reviewCounts ); |
246 | - update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts )); |
|
247 | - update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts )); |
|
246 | + update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) ); |
|
247 | + update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) ); |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | /** |
@@ -255,10 +255,10 @@ discard block |
||
255 | 255 | { |
256 | 256 | $counts = []; |
257 | 257 | $lastPostId = 0; |
258 | - while( $reviews = $this->queryReviews( $args, $lastPostId, $limit )) { |
|
259 | - $types = array_keys( array_flip( array_column( $reviews, 'type' ))); |
|
258 | + while( $reviews = $this->queryReviews( $args, $lastPostId, $limit ) ) { |
|
259 | + $types = array_keys( array_flip( array_column( $reviews, 'type' ) ) ); |
|
260 | 260 | foreach( $types as $type ) { |
261 | - if( isset( $counts[$type] ))continue; |
|
261 | + if( isset($counts[$type]) )continue; |
|
262 | 262 | $counts[$type] = array_fill_keys( range( 0, Rating::MAX_RATING ), 0 ); |
263 | 263 | } |
264 | 264 | foreach( $reviews as $review ) { |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | */ |
277 | 277 | protected function decreaseRating( array $reviewCounts, $type, $rating ) |
278 | 278 | { |
279 | - if( isset( $reviewCounts[$type][$rating] )) { |
|
279 | + if( isset($reviewCounts[$type][$rating]) ) { |
|
280 | 280 | $reviewCounts[$type][$rating] = max( 0, $reviewCounts[$type][$rating] - 1 ); |
281 | 281 | } |
282 | 282 | return $reviewCounts; |
@@ -289,10 +289,10 @@ discard block |
||
289 | 289 | */ |
290 | 290 | protected function increaseRating( array $reviewCounts, $type, $rating ) |
291 | 291 | { |
292 | - if( !array_key_exists( $type, glsr()->reviewTypes )) { |
|
292 | + if( !array_key_exists( $type, glsr()->reviewTypes ) ) { |
|
293 | 293 | return $reviewCounts; |
294 | 294 | } |
295 | - if( !array_key_exists( $type, $reviewCounts )) { |
|
295 | + if( !array_key_exists( $type, $reviewCounts ) ) { |
|
296 | 296 | $reviewCounts[$type] = []; |
297 | 297 | } |
298 | 298 | $reviewCounts = $this->normalize( $reviewCounts ); |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | { |
308 | 308 | foreach( $reviewCounts as &$counts ) { |
309 | 309 | foreach( range( 0, Rating::MAX_RATING ) as $index ) { |
310 | - if( isset( $counts[$index] ))continue; |
|
310 | + if( isset($counts[$index]) )continue; |
|
311 | 311 | $counts[$index] = 0; |
312 | 312 | } |
313 | 313 | ksort( $counts ); |
@@ -322,14 +322,14 @@ discard block |
||
322 | 322 | */ |
323 | 323 | protected function queryReviews( array $args = [], $lastPostId, $limit ) |
324 | 324 | { |
325 | - $args = wp_parse_args( $args, array_fill_keys( ['post_id', 'term_id'], '' )); |
|
326 | - if( empty( array_filter( $args ))) { |
|
325 | + $args = wp_parse_args( $args, array_fill_keys( ['post_id', 'term_id'], '' ) ); |
|
326 | + if( empty(array_filter( $args )) ) { |
|
327 | 327 | return glsr( SqlQueries::class )->getReviewCounts( $lastPostId, $limit ); |
328 | 328 | } |
329 | - if( !empty( $args['post_id'] )) { |
|
329 | + if( !empty($args['post_id']) ) { |
|
330 | 330 | return glsr( SqlQueries::class )->getReviewPostCounts( $args['post_id'], $lastPostId, $limit ); |
331 | 331 | } |
332 | - if( !empty( $args['term_id'] )) { |
|
332 | + if( !empty($args['term_id']) ) { |
|
333 | 333 | return glsr( SqlQueries::class )->getReviewTermCounts( $args['term_id'], $lastPostId, $limit ); |
334 | 334 | } |
335 | 335 | } |
@@ -73,7 +73,9 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function decreasePostCounts( Review $review ) |
75 | 75 | { |
76 | - if( empty( $counts = $this->getPostCounts( $review->assigned_to )))return; |
|
76 | + if( empty( $counts = $this->getPostCounts( $review->assigned_to ))) { |
|
77 | + return; |
|
78 | + } |
|
77 | 79 | $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating ); |
78 | 80 | $this->setPostCounts( $review->assigned_to, $counts ); |
79 | 81 | } |
@@ -84,7 +86,9 @@ discard block |
||
84 | 86 | public function decreaseTermCounts( Review $review ) |
85 | 87 | { |
86 | 88 | foreach( $review->term_ids as $termId ) { |
87 | - if( empty( $counts = $this->getTermCounts( $termId )))continue; |
|
89 | + if( empty( $counts = $this->getTermCounts( $termId ))) { |
|
90 | + continue; |
|
91 | + } |
|
88 | 92 | $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating ); |
89 | 93 | $this->setTermCounts( $termId, $counts ); |
90 | 94 | } |
@@ -106,7 +110,9 @@ discard block |
||
106 | 110 | 'min' => Rating::MIN_RATING, |
107 | 111 | ]); |
108 | 112 | foreach( $counts as $index => &$num ) { |
109 | - if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ))continue; |
|
113 | + if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] )) { |
|
114 | + continue; |
|
115 | + } |
|
110 | 116 | $num = 0; |
111 | 117 | } |
112 | 118 | return $counts; |
@@ -191,7 +197,9 @@ discard block |
||
191 | 197 | */ |
192 | 198 | public function increasePostCounts( Review $review ) |
193 | 199 | { |
194 | - if( !( get_post( $review->assigned_to ) instanceof WP_Post ))return; |
|
200 | + if( !( get_post( $review->assigned_to ) instanceof WP_Post )) { |
|
201 | + return; |
|
202 | + } |
|
195 | 203 | $counts = $this->getPostCounts( $review->assigned_to ); |
196 | 204 | $counts = empty( $counts ) |
197 | 205 | ? $this->buildPostCounts( $review->assigned_to ) |
@@ -240,7 +248,9 @@ discard block |
||
240 | 248 | */ |
241 | 249 | public function setTermCounts( $termId, array $reviewCounts ) |
242 | 250 | { |
243 | - if( !term_exists( $termId ))return; |
|
251 | + if( !term_exists( $termId )) { |
|
252 | + return; |
|
253 | + } |
|
244 | 254 | $ratingCounts = glsr( CountsManager::class )->flatten( $reviewCounts ); |
245 | 255 | update_term_meta( $termId, static::META_COUNT, $reviewCounts ); |
246 | 256 | update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts )); |
@@ -258,7 +268,9 @@ discard block |
||
258 | 268 | while( $reviews = $this->queryReviews( $args, $lastPostId, $limit )) { |
259 | 269 | $types = array_keys( array_flip( array_column( $reviews, 'type' ))); |
260 | 270 | foreach( $types as $type ) { |
261 | - if( isset( $counts[$type] ))continue; |
|
271 | + if( isset( $counts[$type] )) { |
|
272 | + continue; |
|
273 | + } |
|
262 | 274 | $counts[$type] = array_fill_keys( range( 0, Rating::MAX_RATING ), 0 ); |
263 | 275 | } |
264 | 276 | foreach( $reviews as $review ) { |
@@ -307,7 +319,9 @@ discard block |
||
307 | 319 | { |
308 | 320 | foreach( $reviewCounts as &$counts ) { |
309 | 321 | foreach( range( 0, Rating::MAX_RATING ) as $index ) { |
310 | - if( isset( $counts[$index] ))continue; |
|
322 | + if( isset( $counts[$index] )) { |
|
323 | + continue; |
|
324 | + } |
|
311 | 325 | $counts[$index] = 0; |
312 | 326 | } |
313 | 327 | ksort( $counts ); |
@@ -111,7 +111,9 @@ discard block |
||
111 | 111 | $termIds = array_filter( array_map( 'trim', explode( ',', $commaSeparatedTermIds ))); |
112 | 112 | foreach( $termIds as $termId ) { |
113 | 113 | $term = get_term( $termId, Application::TAXONOMY ); |
114 | - if( !isset( $term->term_id ))continue; |
|
114 | + if( !isset( $term->term_id )) { |
|
115 | + continue; |
|
116 | + } |
|
115 | 117 | $terms[] = $term->term_id; |
116 | 118 | } |
117 | 119 | return $terms; |
@@ -123,7 +125,9 @@ discard block |
||
123 | 125 | */ |
124 | 126 | public function revert( $postId ) |
125 | 127 | { |
126 | - if( get_post_field( 'post_type', $postId ) != Application::POST_TYPE )return; |
|
128 | + if( get_post_field( 'post_type', $postId ) != Application::POST_TYPE ) { |
|
129 | + return; |
|
130 | + } |
|
127 | 131 | delete_post_meta( $postId, '_edit_last' ); |
128 | 132 | $result = wp_update_post([ |
129 | 133 | 'ID' => $postId, |
@@ -141,7 +145,9 @@ discard block |
||
141 | 145 | */ |
142 | 146 | public function single( WP_Post $post ) |
143 | 147 | { |
144 | - if( $post->post_type != Application::POST_TYPE )return; |
|
148 | + if( $post->post_type != Application::POST_TYPE ) { |
|
149 | + return; |
|
150 | + } |
|
145 | 151 | $review = new Review( $post ); |
146 | 152 | return apply_filters( 'site-reviews/get/review', $review, $post ); |
147 | 153 | } |
@@ -166,7 +172,9 @@ discard block |
||
166 | 172 | protected function setTerms( $postId, $termIds ) |
167 | 173 | { |
168 | 174 | $terms = $this->normalizeTerms( $termIds ); |
169 | - if( empty( $terms ))return; |
|
175 | + if( empty( $terms )) { |
|
176 | + return; |
|
177 | + } |
|
170 | 178 | $result = wp_set_object_terms( $postId, $terms, Application::TAXONOMY ); |
171 | 179 | if( is_wp_error( $result )) { |
172 | 180 | glsr_log()->error( $result->get_error_message() ); |
@@ -35,13 +35,13 @@ discard block |
||
35 | 35 | 'post_type' => Application::POST_TYPE, |
36 | 36 | ]; |
37 | 37 | $postId = wp_insert_post( $post, true ); |
38 | - if( is_wp_error( $postId )) { |
|
38 | + if( is_wp_error( $postId ) ) { |
|
39 | 39 | glsr_log()->error( $postId->get_error_message() )->debug( $post ); |
40 | 40 | return false; |
41 | 41 | } |
42 | 42 | $this->setTerms( $postId, $command->category ); |
43 | 43 | do_action( 'site-reviews/create/review', $post, $review, $postId ); |
44 | - return $this->single( get_post( $postId )); |
|
44 | + return $this->single( get_post( $postId ) ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function delete( $metaReviewId ) |
52 | 52 | { |
53 | - if( $postId = $this->getPostId( $metaReviewId )) { |
|
53 | + if( $postId = $this->getPostId( $metaReviewId ) ) { |
|
54 | 54 | wp_delete_post( $postId, true ); |
55 | 55 | } |
56 | 56 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | $paged = glsr( QueryBuilder::class )->getPaged( |
73 | 73 | wp_validate_boolean( $args['pagination'] ) |
74 | 74 | ); |
75 | - $reviews = new WP_Query([ |
|
75 | + $reviews = new WP_Query( [ |
|
76 | 76 | 'meta_key' => 'pinned', |
77 | 77 | 'meta_query' => $metaQuery, |
78 | 78 | 'offset' => $args['offset'], |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | 'post_type' => Application::POST_TYPE, |
86 | 86 | 'posts_per_page' => $args['count'], |
87 | 87 | 'tax_query' => $taxQuery, |
88 | - ]); |
|
88 | + ] ); |
|
89 | 89 | return (object)[ |
90 | 90 | 'results' => array_map( [$this, 'single'], $reviews->posts ), |
91 | 91 | 'max_num_pages' => $reviews->max_num_pages, |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | public function normalizeTerms( $commaSeparatedTermIds ) |
109 | 109 | { |
110 | 110 | $terms = []; |
111 | - $termIds = array_filter( array_map( 'trim', explode( ',', $commaSeparatedTermIds ))); |
|
111 | + $termIds = array_filter( array_map( 'trim', explode( ',', $commaSeparatedTermIds ) ) ); |
|
112 | 112 | foreach( $termIds as $termId ) { |
113 | 113 | $term = get_term( $termId, Application::TAXONOMY ); |
114 | - if( !isset( $term->term_id ))continue; |
|
114 | + if( !isset($term->term_id) )continue; |
|
115 | 115 | $terms[] = $term->term_id; |
116 | 116 | } |
117 | 117 | return $terms; |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | { |
126 | 126 | if( get_post_field( 'post_type', $postId ) != Application::POST_TYPE )return; |
127 | 127 | delete_post_meta( $postId, '_edit_last' ); |
128 | - $result = wp_update_post([ |
|
128 | + $result = wp_update_post( [ |
|
129 | 129 | 'ID' => $postId, |
130 | 130 | 'post_content' => get_post_meta( $postId, 'content', true ), |
131 | 131 | 'post_date' => get_post_meta( $postId, 'date', true ), |
132 | 132 | 'post_title' => get_post_meta( $postId, 'title', true ), |
133 | - ]); |
|
134 | - if( is_wp_error( $result )) { |
|
133 | + ] ); |
|
134 | + if( is_wp_error( $result ) ) { |
|
135 | 135 | glsr_log()->error( $result->get_error_message() ); |
136 | 136 | } |
137 | 137 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | protected function getNewPostStatus( array $review, $isBlacklisted ) |
154 | 154 | { |
155 | 155 | $requireApprovalOption = glsr( OptionManager::class )->get( 'settings.general.require.approval' ); |
156 | - return $review['review_type'] == 'local' && ( $requireApprovalOption == 'yes' || $isBlacklisted ) |
|
156 | + return $review['review_type'] == 'local' && ($requireApprovalOption == 'yes' || $isBlacklisted) |
|
157 | 157 | ? 'pending' |
158 | 158 | : 'publish'; |
159 | 159 | } |
@@ -166,9 +166,9 @@ discard block |
||
166 | 166 | protected function setTerms( $postId, $termIds ) |
167 | 167 | { |
168 | 168 | $terms = $this->normalizeTerms( $termIds ); |
169 | - if( empty( $terms ))return; |
|
169 | + if( empty($terms) )return; |
|
170 | 170 | $result = wp_set_object_terms( $postId, $terms, Application::TAXONOMY ); |
171 | - if( is_wp_error( $result )) { |
|
171 | + if( is_wp_error( $result ) ) { |
|
172 | 172 | glsr_log()->error( $result->get_error_message() ); |
173 | 173 | } |
174 | 174 | } |
@@ -25,13 +25,13 @@ discard block |
||
25 | 25 | { |
26 | 26 | sort( $termIds ); |
27 | 27 | sort( $oldTermIds ); |
28 | - if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId ))return; |
|
29 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
28 | + if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId ) )return; |
|
29 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
30 | 30 | $ignoredTerms = array_intersect( $oldTermIds, $termIds ); |
31 | - if( $review->term_ids = array_diff( $oldTermIds, $ignoredTerms )) { |
|
31 | + if( $review->term_ids = array_diff( $oldTermIds, $ignoredTerms ) ) { |
|
32 | 32 | glsr( CountsManager::class )->decreaseTermCounts( $review ); |
33 | 33 | } |
34 | - if( $review->term_ids = array_diff( $termIds, $ignoredTerms )) { |
|
34 | + if( $review->term_ids = array_diff( $termIds, $ignoredTerms ) ) { |
|
35 | 35 | glsr( CountsManager::class )->increaseTermCounts( $review ); |
36 | 36 | } |
37 | 37 | } |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function onAfterCreate( $postData, $meta, $postId ) |
47 | 47 | { |
48 | - if( !$this->isReviewPostId( $postId ))return; |
|
49 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
48 | + if( !$this->isReviewPostId( $postId ) )return; |
|
49 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
50 | 50 | glsr( CountsManager::class )->increase( $review ); |
51 | 51 | } |
52 | 52 | |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | */ |
58 | 58 | public function onBeforeDelete( $postId ) |
59 | 59 | { |
60 | - if( !$this->isReviewPostId( $postId ))return; |
|
61 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
60 | + if( !$this->isReviewPostId( $postId ) )return; |
|
61 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
62 | 62 | glsr( CountsManager::class )->decrease( $review ); |
63 | 63 | } |
64 | 64 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | if( !$this->isReviewPostId( $postId ) |
76 | 76 | || !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] ) |
77 | 77 | )return; |
78 | - $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
|
78 | + $review = glsr( ReviewManager::class )->single( get_post( $postId ) ); |
|
79 | 79 | if( $review->$metaKey == $metaValue )return; |
80 | 80 | $method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' ); |
81 | 81 | call_user_func( [$this, $method], $review, $metaValue ); |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | */ |
123 | 123 | public function onChangeStatus( $newStatus, $oldStatus, WP_Post $post ) |
124 | 124 | { |
125 | - if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return; |
|
126 | - $review = glsr( ReviewManager::class )->single( get_post( $post->ID )); |
|
125 | + if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ) )return; |
|
126 | + $review = glsr( ReviewManager::class )->single( get_post( $post->ID ) ); |
|
127 | 127 | if( $post->post_status == 'publish' ) { |
128 | 128 | glsr( CountsManager::class )->increase( $review ); |
129 | 129 | } |
@@ -25,7 +25,9 @@ discard block |
||
25 | 25 | { |
26 | 26 | sort( $termIds ); |
27 | 27 | sort( $oldTermIds ); |
28 | - if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId ))return; |
|
28 | + if( $termIds === $oldTermIds || !$this->isReviewPostId( $postId )) { |
|
29 | + return; |
|
30 | + } |
|
29 | 31 | $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
30 | 32 | $ignoredTerms = array_intersect( $oldTermIds, $termIds ); |
31 | 33 | if( $review->term_ids = array_diff( $oldTermIds, $ignoredTerms )) { |
@@ -45,7 +47,9 @@ discard block |
||
45 | 47 | */ |
46 | 48 | public function onAfterCreate( $postData, $meta, $postId ) |
47 | 49 | { |
48 | - if( !$this->isReviewPostId( $postId ))return; |
|
50 | + if( !$this->isReviewPostId( $postId )) { |
|
51 | + return; |
|
52 | + } |
|
49 | 53 | $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
50 | 54 | glsr( CountsManager::class )->increase( $review ); |
51 | 55 | } |
@@ -57,7 +61,9 @@ discard block |
||
57 | 61 | */ |
58 | 62 | public function onBeforeDelete( $postId ) |
59 | 63 | { |
60 | - if( !$this->isReviewPostId( $postId ))return; |
|
64 | + if( !$this->isReviewPostId( $postId )) { |
|
65 | + return; |
|
66 | + } |
|
61 | 67 | $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
62 | 68 | glsr( CountsManager::class )->decrease( $review ); |
63 | 69 | } |
@@ -74,9 +80,13 @@ discard block |
||
74 | 80 | { |
75 | 81 | if( !$this->isReviewPostId( $postId ) |
76 | 82 | || !in_array( $metaKey, ['assigned_to', 'rating', 'review_type'] ) |
77 | - )return; |
|
83 | + ) { |
|
84 | + return; |
|
85 | + } |
|
78 | 86 | $review = glsr( ReviewManager::class )->single( get_post( $postId )); |
79 | - if( $review->$metaKey == $metaValue )return; |
|
87 | + if( $review->$metaKey == $metaValue ) { |
|
88 | + return; |
|
89 | + } |
|
80 | 90 | $method = glsr( Helper::class )->buildMethodName( $metaKey, 'onBeforeChange' ); |
81 | 91 | call_user_func( [$this, $method], $review, $metaValue ); |
82 | 92 | } |
@@ -122,7 +132,9 @@ discard block |
||
122 | 132 | */ |
123 | 133 | public function onChangeStatus( $newStatus, $oldStatus, WP_Post $post ) |
124 | 134 | { |
125 | - if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] ))return; |
|
135 | + if( $post->post_type != Application::POST_TYPE || in_array( $oldStatus, ['new', $newStatus] )) { |
|
136 | + return; |
|
137 | + } |
|
126 | 138 | $review = glsr( ReviewManager::class )->single( get_post( $post->ID )); |
127 | 139 | if( $post->post_status == 'publish' ) { |
128 | 140 | glsr( CountsManager::class )->increase( $review ); |
@@ -12,12 +12,12 @@ |
||
12 | 12 | */ |
13 | 13 | public function build( array $args = [] ) |
14 | 14 | { |
15 | - require_once( ABSPATH.'wp-admin/includes/template.php' ); |
|
15 | + require_once(ABSPATH.'wp-admin/includes/template.php'); |
|
16 | 16 | ob_start(); |
17 | 17 | wp_star_rating( $args ); |
18 | 18 | $stars = ob_get_clean(); |
19 | 19 | return glsr( Builder::class )->div( $stars, [ |
20 | 20 | 'class' => 'glsr-stars', |
21 | - ]); |
|
21 | + ] ); |
|
22 | 22 | } |
23 | 23 | } |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | public function build( array $args = [] ) |
34 | 34 | { |
35 | 35 | $this->args = $args; |
36 | - $counts = glsr( CountsManager::class )->get([ |
|
37 | - 'post_ids' => array_filter( array_map( 'trim', explode( ',', $args['assigned_to'] ))), |
|
38 | - 'term_ids' => array_filter( array_map( 'trim', explode( ',', $args['category'] ))), |
|
39 | - ]); |
|
36 | + $counts = glsr( CountsManager::class )->get( [ |
|
37 | + 'post_ids' => array_filter( array_map( 'trim', explode( ',', $args['assigned_to'] ) ) ), |
|
38 | + 'term_ids' => array_filter( array_map( 'trim', explode( ',', $args['category'] ) ) ), |
|
39 | + ] ); |
|
40 | 40 | $this->ratingCounts = glsr( CountsManager::class )->flatten( $counts, [ |
41 | 41 | 'min' => $args['rating'], |
42 | - ]); |
|
43 | - if( !array_sum( $this->ratingCounts ) && $this->isHidden( 'if_empty' ))return; |
|
42 | + ] ); |
|
43 | + if( !array_sum( $this->ratingCounts ) && $this->isHidden( 'if_empty' ) )return; |
|
44 | 44 | $this->averageRating = glsr( Rating::class )->getAverage( $this->ratingCounts ); |
45 | 45 | $this->generateSchema(); |
46 | 46 | return glsr( Template::class )->build( 'templates/reviews-summary', [ |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | 'stars' => $this->buildStars(), |
53 | 53 | 'text' => $this->buildText(), |
54 | 54 | ], |
55 | - ]); |
|
55 | + ] ); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -60,16 +60,16 @@ discard block |
||
60 | 60 | */ |
61 | 61 | protected function buildPercentage() |
62 | 62 | { |
63 | - if( $this->isHidden( 'bars' ))return; |
|
63 | + if( $this->isHidden( 'bars' ) )return; |
|
64 | 64 | $range = range( Rating::MAX_RATING, 1 ); |
65 | - $percentages = preg_filter( '/$/', '%', glsr( Rating::class )->getPercentages( $this->ratingCounts )); |
|
66 | - $bars = array_reduce( $range, function( $carry, $level ) use( $percentages ) { |
|
65 | + $percentages = preg_filter( '/$/', '%', glsr( Rating::class )->getPercentages( $this->ratingCounts ) ); |
|
66 | + $bars = array_reduce( $range, function( $carry, $level ) use($percentages) { |
|
67 | 67 | $label = $this->buildPercentageLabel( $this->args['labels'][$level] ); |
68 | 68 | $background = $this->buildPercentageBackground( $percentages[$level] ); |
69 | 69 | $percent = $this->buildPercentagePercent( $percentages[$level] ); |
70 | 70 | return $carry.glsr( Builder::class )->div( $label.$background.$percent, [ |
71 | 71 | 'class' => 'glsr-bar', |
72 | - ]); |
|
72 | + ] ); |
|
73 | 73 | }); |
74 | 74 | return $this->wrap( 'percentage', $bars ); |
75 | 75 | } |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | */ |
81 | 81 | protected function buildPercentageBackground( $percent ) |
82 | 82 | { |
83 | - $backgroundPercent = glsr( Builder::class )->span([ |
|
83 | + $backgroundPercent = glsr( Builder::class )->span( [ |
|
84 | 84 | 'class' => 'glsr-bar-background-percent', |
85 | 85 | 'style' => 'width:'.$percent, |
86 | - ]); |
|
86 | + ] ); |
|
87 | 87 | return '<span class="glsr-bar-background">'.$backgroundPercent.'</span>'; |
88 | 88 | } |
89 | 89 | |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | */ |
111 | 111 | protected function buildRating() |
112 | 112 | { |
113 | - if( $this->isHidden( 'rating' ))return; |
|
113 | + if( $this->isHidden( 'rating' ) )return; |
|
114 | 114 | return $this->wrap( 'rating', '<span>'.$this->averageRating.'</span>' ); |
115 | 115 | } |
116 | 116 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | protected function buildStars() |
121 | 121 | { |
122 | - if( $this->isHidden( 'stars' ))return; |
|
122 | + if( $this->isHidden( 'stars' ) )return; |
|
123 | 123 | $stars = glsr( Partial::class )->build( 'star-rating', ['rating' => $this->averageRating] ); |
124 | 124 | return $this->wrap( 'stars', $stars ); |
125 | 125 | } |
@@ -129,9 +129,9 @@ discard block |
||
129 | 129 | */ |
130 | 130 | protected function buildText() |
131 | 131 | { |
132 | - if( $this->isHidden( 'summary' ))return; |
|
133 | - $count = intval( array_sum( $this->ratingCounts )); |
|
134 | - if( empty( $this->args['text'] )) { |
|
132 | + if( $this->isHidden( 'summary' ) )return; |
|
133 | + $count = intval( array_sum( $this->ratingCounts ) ); |
|
134 | + if( empty($this->args['text']) ) { |
|
135 | 135 | // @todo document this change |
136 | 136 | $this->args['text'] = _nx( |
137 | 137 | '{rating} out of {max} stars (based on {num} review)', |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | ); |
143 | 143 | } |
144 | 144 | $summary = str_replace( |
145 | - ['{rating}','{max}', '{num}'], |
|
145 | + ['{rating}', '{max}', '{num}'], |
|
146 | 146 | [$this->averageRating, Rating::MAX_RATING, $count], |
147 | 147 | $this->args['text'] |
148 | 148 | ); |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | */ |
155 | 155 | protected function generateSchema() |
156 | 156 | { |
157 | - if( !wp_validate_boolean( $this->args['schema'] ))return; |
|
157 | + if( !wp_validate_boolean( $this->args['schema'] ) )return; |
|
158 | 158 | glsr( Schema::class )->store( |
159 | 159 | glsr( Schema::class )->buildSummary( $this->args ) |
160 | 160 | ); |
@@ -186,6 +186,6 @@ discard block |
||
186 | 186 | { |
187 | 187 | return glsr( Builder::class )->div( $value, [ |
188 | 188 | 'class' => 'glsr-summary-'.$key, |
189 | - ]); |
|
189 | + ] ); |
|
190 | 190 | } |
191 | 191 | } |
@@ -40,7 +40,9 @@ discard block |
||
40 | 40 | $this->ratingCounts = glsr( CountsManager::class )->flatten( $counts, [ |
41 | 41 | 'min' => $args['rating'], |
42 | 42 | ]); |
43 | - if( !array_sum( $this->ratingCounts ) && $this->isHidden( 'if_empty' ))return; |
|
43 | + if( !array_sum( $this->ratingCounts ) && $this->isHidden( 'if_empty' )) { |
|
44 | + return; |
|
45 | + } |
|
44 | 46 | $this->averageRating = glsr( Rating::class )->getAverage( $this->ratingCounts ); |
45 | 47 | $this->generateSchema(); |
46 | 48 | return glsr( Template::class )->build( 'templates/reviews-summary', [ |
@@ -60,7 +62,9 @@ discard block |
||
60 | 62 | */ |
61 | 63 | protected function buildPercentage() |
62 | 64 | { |
63 | - if( $this->isHidden( 'bars' ))return; |
|
65 | + if( $this->isHidden( 'bars' )) { |
|
66 | + return; |
|
67 | + } |
|
64 | 68 | $range = range( Rating::MAX_RATING, 1 ); |
65 | 69 | $percentages = preg_filter( '/$/', '%', glsr( Rating::class )->getPercentages( $this->ratingCounts )); |
66 | 70 | $bars = array_reduce( $range, function( $carry, $level ) use( $percentages ) { |
@@ -110,7 +114,9 @@ discard block |
||
110 | 114 | */ |
111 | 115 | protected function buildRating() |
112 | 116 | { |
113 | - if( $this->isHidden( 'rating' ))return; |
|
117 | + if( $this->isHidden( 'rating' )) { |
|
118 | + return; |
|
119 | + } |
|
114 | 120 | return $this->wrap( 'rating', '<span>'.$this->averageRating.'</span>' ); |
115 | 121 | } |
116 | 122 | |
@@ -119,7 +125,9 @@ discard block |
||
119 | 125 | */ |
120 | 126 | protected function buildStars() |
121 | 127 | { |
122 | - if( $this->isHidden( 'stars' ))return; |
|
128 | + if( $this->isHidden( 'stars' )) { |
|
129 | + return; |
|
130 | + } |
|
123 | 131 | $stars = glsr( Partial::class )->build( 'star-rating', ['rating' => $this->averageRating] ); |
124 | 132 | return $this->wrap( 'stars', $stars ); |
125 | 133 | } |
@@ -129,7 +137,9 @@ discard block |
||
129 | 137 | */ |
130 | 138 | protected function buildText() |
131 | 139 | { |
132 | - if( $this->isHidden( 'summary' ))return; |
|
140 | + if( $this->isHidden( 'summary' )) { |
|
141 | + return; |
|
142 | + } |
|
133 | 143 | $count = intval( array_sum( $this->ratingCounts )); |
134 | 144 | if( empty( $this->args['text'] )) { |
135 | 145 | // @todo document this change |
@@ -154,7 +164,9 @@ discard block |
||
154 | 164 | */ |
155 | 165 | protected function generateSchema() |
156 | 166 | { |
157 | - if( !wp_validate_boolean( $this->args['schema'] ))return; |
|
167 | + if( !wp_validate_boolean( $this->args['schema'] )) { |
|
168 | + return; |
|
169 | + } |
|
158 | 170 | glsr( Schema::class )->store( |
159 | 171 | glsr( Schema::class )->buildSummary( $this->args ) |
160 | 172 | ); |
@@ -47,7 +47,9 @@ discard block |
||
47 | 47 | } |
48 | 48 | $views = $this->generatePossibleViews( $view ); |
49 | 49 | foreach( $views as $possibleView ) { |
50 | - if( !file_exists( glsr()->path( 'views/'.$possibleView.'.php' )))continue; |
|
50 | + if( !file_exists( glsr()->path( 'views/'.$possibleView.'.php' ))) { |
|
51 | + continue; |
|
52 | + } |
|
51 | 53 | return $possibleView; |
52 | 54 | } |
53 | 55 | return $view; |
@@ -84,7 +86,9 @@ discard block |
||
84 | 86 | */ |
85 | 87 | public function modifyField( Builder $instance ) |
86 | 88 | { |
87 | - if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields )))return; |
|
89 | + if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields ))) { |
|
90 | + return; |
|
91 | + } |
|
88 | 92 | call_user_func_array( [$this, 'customize'], [&$instance] ); |
89 | 93 | } |
90 | 94 |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | 'templates/form/submit-button', |
45 | 45 | 'templates/reviews-form', |
46 | 46 | ]; |
47 | - if( !preg_match( '('.implode( '|', $styledViews ).')', $view )) { |
|
47 | + if( !preg_match( '('.implode( '|', $styledViews ).')', $view ) ) { |
|
48 | 48 | return $view; |
49 | 49 | } |
50 | 50 | $views = $this->generatePossibleViews( $view ); |
51 | 51 | foreach( $views as $possibleView ) { |
52 | - if( !file_exists( glsr()->path( 'views/'.$possibleView.'.php' )))continue; |
|
52 | + if( !file_exists( glsr()->path( 'views/'.$possibleView.'.php' ) ) )continue; |
|
53 | 53 | return $possibleView; |
54 | 54 | } |
55 | 55 | return $view; |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function modifyField( Builder $instance ) |
83 | 83 | { |
84 | - if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields )))return; |
|
84 | + if( !$this->isPublicInstance( $instance ) || empty(array_filter( $this->fields )) )return; |
|
85 | 85 | call_user_func_array( [$this, 'customize'], [&$instance] ); |
86 | 86 | } |
87 | 87 | |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | */ |
91 | 91 | protected function customize( Builder $instance ) |
92 | 92 | { |
93 | - $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' )); |
|
93 | + $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ) ); |
|
94 | 94 | $key = $instance->tag.'_'.$args['type']; |
95 | - $classes = !isset( $this->fields[$key] ) |
|
95 | + $classes = !isset($this->fields[$key]) |
|
96 | 96 | ? $this->fields[$instance->tag] |
97 | 97 | : $this->fields[$key]; |
98 | 98 | $instance->args['class'] = trim( $args['class'].' '.$classes ); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | $args = wp_parse_args( $instance->args, [ |
127 | 127 | 'is_public' => false, |
128 | 128 | 'is_raw' => false, |
129 | - ]); |
|
129 | + ] ); |
|
130 | 130 | if( is_admin() || !$args['is_public'] || $args['is_raw'] ) { |
131 | 131 | return false; |
132 | 132 | } |
@@ -93,7 +93,9 @@ discard block |
||
93 | 93 | foreach( $this->rules as $attribute => $rules ) { |
94 | 94 | foreach( $rules as $rule ) { |
95 | 95 | $this->validateAttribute( $attribute, $rule ); |
96 | - if( $this->shouldStopValidating( $attribute ))break; |
|
96 | + if( $this->shouldStopValidating( $attribute )) { |
|
97 | + break; |
|
98 | + } |
|
97 | 99 | } |
98 | 100 | } |
99 | 101 | return $this->errors; |
@@ -109,7 +111,9 @@ discard block |
||
109 | 111 | public function validateAttribute( $attribute, $rule ) |
110 | 112 | { |
111 | 113 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
112 | - if( $rule == '' )return; |
|
114 | + if( $rule == '' ) { |
|
115 | + return; |
|
116 | + } |
|
113 | 117 | $value = $this->getValue( $attribute ); |
114 | 118 | if( !method_exists( $this, $method = 'validate'.$rule )) { |
115 | 119 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
@@ -178,7 +182,9 @@ discard block |
||
178 | 182 | */ |
179 | 183 | protected function getRule( $attribute, $rules ) |
180 | 184 | { |
181 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
185 | + if( !array_key_exists( $attribute, $this->rules )) { |
|
186 | + return; |
|
187 | + } |
|
182 | 188 | $rules = (array)$rules; |
183 | 189 | foreach( $this->rules[$attribute] as $rule ) { |
184 | 190 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
@@ -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 | if( strpos( $message, '%s' ) === false ) { |
29 | 29 | return $message; |
30 | 30 | } |
31 | - return preg_replace_callback( '/(%s)/', function() use( &$parameters ) { |
|
31 | + return preg_replace_callback( '/(%s)/', function() use(&$parameters) { |
|
32 | 32 | foreach( $parameters as $key => $value ) { |
33 | 33 | return array_shift( $parameters ); |
34 | 34 | } |
@@ -113,8 +113,8 @@ discard block |
||
113 | 113 | public function validateRequired( $value ) |
114 | 114 | { |
115 | 115 | return is_null( $value ) |
116 | - || ( is_string( $value ) && trim( $value ) === '' ) |
|
117 | - || ( is_array( $value ) && count( $value ) < 1 ) |
|
116 | + || (is_string( $value ) && trim( $value ) === '') |
|
117 | + || (is_array( $value ) && count( $value ) < 1) |
|
118 | 118 | ? false |
119 | 119 | : true; |
120 | 120 | } |