@@ -79,8 +79,8 @@ |
||
79 | 79 | foreach( $blocks as $block ) { |
80 | 80 | $id = str_replace( '_reviews', '', Application::ID.'_'.$block ); |
81 | 81 | $blockClass = glsr( Helper::class )->buildClassName( $id.'-block', 'Blocks' ); |
82 | - if( !class_exists( $blockClass )) { |
|
83 | - glsr_log()->error( sprintf( 'Class missing (%s)', $blockClass )); |
|
82 | + if( !class_exists( $blockClass ) ) { |
|
83 | + glsr_log()->error( sprintf( 'Class missing (%s)', $blockClass ) ); |
|
84 | 84 | continue; |
85 | 85 | } |
86 | 86 | glsr( $blockClass )->register( $block ); |
@@ -28,7 +28,7 @@ |
||
28 | 28 | register_rest_route( $this->namespace, '/types', [ |
29 | 29 | 'callback' => [$this, 'get_types'], |
30 | 30 | 'methods' => Server::READABLE, |
31 | - ]); |
|
31 | + ] ); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -33,6 +33,6 @@ |
||
33 | 33 | 'permission_callback' => [$this, 'get_items_permissions_check'], |
34 | 34 | ], |
35 | 35 | 'schema' => [$this, 'get_public_item_schema'], |
36 | - ]); |
|
36 | + ] ); |
|
37 | 37 | } |
38 | 38 | } |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | 'title' => 'Images', |
18 | 18 | ], |
19 | 19 | 'plugin' => 'site-reviews-images/site-reviews-images.php', |
20 | - ]); |
|
20 | + ] ); |
|
21 | 21 | $template->render( 'partials/addons/addon', [ |
22 | 22 | 'context' => [ |
23 | 23 | 'description' => __( 'Sync your Tripadvisor reviews to your website and manage them with Site Reviews.', 'site-reviews' ), |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'title' => 'Tripadvisor Reviews', |
27 | 27 | ], |
28 | 28 | 'plugin' => 'site-reviews-tripadvisor/site-reviews-tripadvisor.php', |
29 | - ]); |
|
29 | + ] ); |
|
30 | 30 | ?> |
31 | 31 | </div> |
32 | 32 | </div> |
@@ -35,7 +35,9 @@ |
||
35 | 35 | */ |
36 | 36 | public function renderTaxonomyFilter() |
37 | 37 | { |
38 | - if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ))return; |
|
38 | + if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY )) { |
|
39 | + return; |
|
40 | + } |
|
39 | 41 | echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [ |
40 | 42 | 'class' => 'screen-reader-text', |
41 | 43 | 'for' => Application::TAXONOMY, |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function renderTaxonomyFilter() |
37 | 37 | { |
38 | - if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ))return; |
|
38 | + if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ) )return; |
|
39 | 39 | echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [ |
40 | 40 | 'class' => 'screen-reader-text', |
41 | 41 | 'for' => Application::TAXONOMY, |
42 | - ]); |
|
43 | - wp_dropdown_categories([ |
|
42 | + ] ); |
|
43 | + wp_dropdown_categories( [ |
|
44 | 44 | 'depth' => 3, |
45 | 45 | 'hide_empty' => true, |
46 | 46 | 'hide_if_empty' => true, |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | 'show_option_all' => $this->getShowOptionAll(), |
53 | 53 | 'taxonomy' => Application::TAXONOMY, |
54 | 54 | 'value_field' => 'slug', |
55 | - ]); |
|
55 | + ] ); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | $taxonomy = get_taxonomy( Application::TAXONOMY ); |
73 | 73 | return $taxonomy |
74 | - ? ucfirst( strtolower( $taxonomy->labels->all_items )) |
|
74 | + ? ucfirst( strtolower( $taxonomy->labels->all_items ) ) |
|
75 | 75 | : ''; |
76 | 76 | } |
77 | 77 | } |
@@ -108,12 +108,16 @@ |
||
108 | 108 | public function renderTinymceButton( $editorId ) |
109 | 109 | { |
110 | 110 | $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId ); |
111 | - if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors ))return; |
|
111 | + if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors )) { |
|
112 | + return; |
|
113 | + } |
|
112 | 114 | $shortcodes = []; |
113 | 115 | foreach( glsr()->mceShortcodes as $shortcode => $values ) { |
114 | 116 | $shortcodes[$shortcode] = $values; |
115 | 117 | } |
116 | - if( empty( $shortcodes ))return; |
|
118 | + if( empty( $shortcodes )) { |
|
119 | + return; |
|
120 | + } |
|
117 | 121 | glsr()->render( 'partials/editor/tinymce', [ |
118 | 122 | 'shortcodes' => $shortcodes, |
119 | 123 | ]); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | */ |
25 | 25 | public function enqueueAssets() |
26 | 26 | { |
27 | - $command = new EnqueueAdminAssets([ |
|
27 | + $command = new EnqueueAdminAssets( [ |
|
28 | 28 | 'pointers' => [[ |
29 | 29 | 'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ), |
30 | 30 | 'id' => 'glsr-pointer-pinned', |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | 'target' => '#misc-pub-pinned', |
37 | 37 | 'title' => __( 'Pin Your Reviews', 'site-reviews' ), |
38 | 38 | ]], |
39 | - ]); |
|
39 | + ] ); |
|
40 | 40 | $this->execute( $command ); |
41 | 41 | } |
42 | 42 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | { |
49 | 49 | $links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [ |
50 | 50 | 'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ), |
51 | - ]); |
|
51 | + ] ); |
|
52 | 52 | return $links; |
53 | 53 | } |
54 | 54 | |
@@ -60,20 +60,20 @@ discard block |
||
60 | 60 | public function filterDashboardGlanceItems( $items ) |
61 | 61 | { |
62 | 62 | $postCount = wp_count_posts( Application::POST_TYPE ); |
63 | - if( empty( $postCount->publish )) { |
|
63 | + if( empty($postCount->publish) ) { |
|
64 | 64 | return $items; |
65 | 65 | } |
66 | 66 | $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' ); |
67 | - $text = sprintf( $text, number_format_i18n( $postCount->publish )); |
|
67 | + $text = sprintf( $text, number_format_i18n( $postCount->publish ) ); |
|
68 | 68 | $items = glsr( Helper::class )->consolidateArray( $items ); |
69 | 69 | $items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts ) |
70 | 70 | ? glsr( Builder::class )->a( $text, [ |
71 | 71 | 'class' => 'glsr-review-count', |
72 | 72 | 'href' => 'edit.php?post_type='.Application::POST_TYPE, |
73 | - ]) |
|
73 | + ] ) |
|
74 | 74 | : glsr( Builder::class )->span( $text, [ |
75 | 75 | 'class' => 'glsr-review-count', |
76 | - ]); |
|
76 | + ] ); |
|
77 | 77 | return $items; |
78 | 78 | } |
79 | 79 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | */ |
85 | 85 | public function filterTinymcePlugins( $plugins ) |
86 | 86 | { |
87 | - if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) { |
|
87 | + if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) { |
|
88 | 88 | $plugins = glsr( Helper::class )->consolidateArray( $plugins ); |
89 | 89 | $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' ); |
90 | 90 | } |
@@ -97,11 +97,11 @@ discard block |
||
97 | 97 | */ |
98 | 98 | public function registerTinymcePopups() |
99 | 99 | { |
100 | - $command = new RegisterTinymcePopups([ |
|
100 | + $command = new RegisterTinymcePopups( [ |
|
101 | 101 | 'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ), |
102 | 102 | 'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ), |
103 | 103 | 'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ), |
104 | - ]); |
|
104 | + ] ); |
|
105 | 105 | $this->execute( $command ); |
106 | 106 | } |
107 | 107 | |
@@ -113,15 +113,15 @@ discard block |
||
113 | 113 | public function renderTinymceButton( $editorId ) |
114 | 114 | { |
115 | 115 | $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId ); |
116 | - if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors ))return; |
|
116 | + if( glsr_current_screen()->base != 'post' || !in_array( $editorId, $allowedEditors ) )return; |
|
117 | 117 | $shortcodes = []; |
118 | 118 | foreach( glsr()->mceShortcodes as $shortcode => $values ) { |
119 | 119 | $shortcodes[$shortcode] = $values; |
120 | 120 | } |
121 | - if( empty( $shortcodes ))return; |
|
121 | + if( empty($shortcodes) )return; |
|
122 | 122 | glsr()->render( 'partials/editor/tinymce', [ |
123 | 123 | 'shortcodes' => $shortcodes, |
124 | - ]); |
|
124 | + ] ); |
|
125 | 125 | } |
126 | 126 | |
127 | 127 | /** |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | public function routerClearConsole() |
131 | 131 | { |
132 | 132 | glsr( Console::class )->clear(); |
133 | - glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' )); |
|
133 | + glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) ); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | */ |
139 | 139 | public function routerFetchConsole() |
140 | 140 | { |
141 | - glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' )); |
|
141 | + glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) ); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
@@ -157,13 +157,13 @@ discard block |
||
157 | 157 | } |
158 | 158 | $postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' ); |
159 | 159 | foreach( $postIds as $postId ) { |
160 | - $countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId )); |
|
160 | + $countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ) ); |
|
161 | 161 | } |
162 | 162 | $countManager->setCounts( $countManager->buildCounts() ); |
163 | 163 | if( $showNotice ) { |
164 | - glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' )); |
|
164 | + glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) ); |
|
165 | 165 | } |
166 | - glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' )); |
|
166 | + glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) ); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | /** |
@@ -197,17 +197,17 @@ discard block |
||
197 | 197 | { |
198 | 198 | $file = $_FILES['import-file']; |
199 | 199 | if( $file['error'] !== UPLOAD_ERR_OK ) { |
200 | - return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] )); |
|
200 | + return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) ); |
|
201 | 201 | } |
202 | - if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] )) { |
|
203 | - return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' )); |
|
202 | + if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] ) ) { |
|
203 | + return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) ); |
|
204 | 204 | } |
205 | 205 | $settings = json_decode( file_get_contents( $file['tmp_name'] ), true ); |
206 | - if( empty( $settings )) { |
|
207 | - return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' )); |
|
206 | + if( empty($settings) ) { |
|
207 | + return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) ); |
|
208 | 208 | } |
209 | - glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings )); |
|
210 | - glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' )); |
|
209 | + glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) ); |
|
210 | + glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) ); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | /** |
@@ -225,6 +225,6 @@ discard block |
||
225 | 225 | UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ), |
226 | 226 | UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ), |
227 | 227 | ]; |
228 | - return glsr_get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' )); |
|
228 | + return glsr_get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) ); |
|
229 | 229 | } |
230 | 230 | } |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | */ |
14 | 14 | public function handle( Command $command ) |
15 | 15 | { |
16 | - $postId = wp_update_post([ |
|
16 | + $postId = wp_update_post( [ |
|
17 | 17 | 'ID' => $command->id, |
18 | 18 | 'post_status' => $command->status, |
19 | - ]); |
|
20 | - if( is_wp_error( $postId )) { |
|
19 | + ] ); |
|
20 | + if( is_wp_error( $postId ) ) { |
|
21 | 21 | glsr_log()->error( $postId->get_error_message() ); |
22 | 22 | return []; |
23 | 23 | } |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | 'aria-label' => '“'.esc_attr( $title ).'” ('.__( 'Edit', 'site-reviews' ).')', |
40 | 40 | 'class' => 'row-title', |
41 | 41 | 'href' => get_edit_post_link( $postId ), |
42 | - ]); |
|
42 | + ] ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | protected function getPostState( $postId ) |
50 | 50 | { |
51 | 51 | ob_start(); |
52 | - _post_states( get_post( $postId )); |
|
52 | + _post_states( get_post( $postId ) ); |
|
53 | 53 | return ob_get_clean(); |
54 | 54 | } |
55 | 55 | |
@@ -59,13 +59,13 @@ discard block |
||
59 | 59 | protected function getStatusLinks() |
60 | 60 | { |
61 | 61 | global $avail_post_stati; |
62 | - require_once( ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php' ); |
|
62 | + require_once(ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php'); |
|
63 | 63 | $hookName = 'edit-'.Application::POST_TYPE; |
64 | 64 | set_current_screen( $hookName ); |
65 | 65 | $avail_post_stati = get_available_post_statuses( Application::POST_TYPE ); |
66 | 66 | $table = new \WP_Posts_List_Table( ['screen' => $hookName] ); |
67 | 67 | $views = apply_filters( 'views_'.$hookName, $table->get_views() ); // uses compat get_views() |
68 | - if( empty( $views ))return; |
|
68 | + if( empty($views) )return; |
|
69 | 69 | foreach( $views as $class => $view ) { |
70 | 70 | $views[$class] = "\t<li class='$class'>$view"; |
71 | 71 | } |
@@ -65,7 +65,9 @@ |
||
65 | 65 | $avail_post_stati = get_available_post_statuses( Application::POST_TYPE ); |
66 | 66 | $table = new \WP_Posts_List_Table( ['screen' => $hookName] ); |
67 | 67 | $views = apply_filters( 'views_'.$hookName, $table->get_views() ); // uses compat get_views() |
68 | - if( empty( $views ))return; |
|
68 | + if( empty( $views )) { |
|
69 | + return; |
|
70 | + } |
|
69 | 71 | foreach( $views as $class => $view ) { |
70 | 72 | $views[$class] = "\t<li class='$class'>$view"; |
71 | 73 | } |
@@ -8,7 +8,9 @@ discard block |
||
8 | 8 | * @see https://www.elegantthemes.com/gallery/divi/ |
9 | 9 | */ |
10 | 10 | add_action( 'site-reviews/customize/divi', function( $instance ) { |
11 | - if( $instance->tag != 'label' || $instance->args['type'] != 'checkbox' )return; |
|
11 | + if( $instance->tag != 'label' || $instance->args['type'] != 'checkbox' ) { |
|
12 | + return; |
|
13 | + } |
|
12 | 14 | $instance->args['text'] = '<i></i>'.$instance->args['text']; |
13 | 15 | }); |
14 | 16 | |
@@ -20,9 +22,13 @@ discard block |
||
20 | 22 | * @see https://wordpress.org/plugins/wp-super-cache/ |
21 | 23 | */ |
22 | 24 | add_action( 'site-reviews/review/created', function( $review, $request ) { |
23 | - if( !function_exists( 'wp_cache_post_change' ))return; |
|
25 | + if( !function_exists( 'wp_cache_post_change' )) { |
|
26 | + return; |
|
27 | + } |
|
24 | 28 | wp_cache_post_change( $request->post_id ); |
25 | - if( empty( $review->assigned_to ) || $review->assigned_to == $request->post_id )return; |
|
29 | + if( empty( $review->assigned_to ) || $review->assigned_to == $request->post_id ) { |
|
30 | + return; |
|
31 | + } |
|
26 | 32 | wp_cache_post_change( $review->assigned_to ); |
27 | 33 | }, 10, 2 ); |
28 | 34 |
@@ -20,9 +20,9 @@ discard block |
||
20 | 20 | * @see https://wordpress.org/plugins/wp-super-cache/ |
21 | 21 | */ |
22 | 22 | add_action( 'site-reviews/review/created', function( $review, $request ) { |
23 | - if( !function_exists( 'wp_cache_post_change' ))return; |
|
23 | + if( !function_exists( 'wp_cache_post_change' ) )return; |
|
24 | 24 | wp_cache_post_change( $request->post_id ); |
25 | - if( empty( $review->assigned_to ) || $review->assigned_to == $request->post_id )return; |
|
25 | + if( empty($review->assigned_to) || $review->assigned_to == $request->post_id )return; |
|
26 | 26 | wp_cache_post_change( $review->assigned_to ); |
27 | 27 | }, 10, 2 ); |
28 | 28 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | add_filter( 'sbp_exclude_defer_scripts', function( $scriptHandles ) { |
35 | 35 | $scriptHandles[] = 'site-reviews/google-recaptcha'; |
36 | - return array_keys( array_flip( $scriptHandles )); |
|
36 | + return array_keys( array_flip( $scriptHandles ) ); |
|
37 | 37 | }); |
38 | 38 | |
39 | 39 | /** |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | * @see https://searchandfilter.com/ |
44 | 44 | */ |
45 | 45 | add_filter( 'sf_edit_query_args', function( $query ) { |
46 | - if( !empty( $query['meta_key'] ) && $query['meta_key'] == '_glsr_ranking' ) { |
|
47 | - unset( $query['meta_key'] ); |
|
46 | + if( !empty($query['meta_key']) && $query['meta_key'] == '_glsr_ranking' ) { |
|
47 | + unset($query['meta_key']); |
|
48 | 48 | $query['meta_query'] = [ |
49 | 49 | 'relation' => 'OR', |
50 | 50 | ['key' => '_glsr_ranking', 'compare' => 'NOT EXISTS'], // this comes first! |
@@ -56,9 +56,13 @@ discard block |
||
56 | 56 | protected function generateFields( array $fields ) |
57 | 57 | { |
58 | 58 | $generatedFields = array_map( function( $field ) { |
59 | - if( empty( $field ))return; |
|
59 | + if( empty( $field )) { |
|
60 | + return; |
|
61 | + } |
|
60 | 62 | $field = $this->normalize( $field ); |
61 | - if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return; |
|
63 | + if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) { |
|
64 | + return; |
|
65 | + } |
|
62 | 66 | return $this->$method( $field ); |
63 | 67 | }, $fields ); |
64 | 68 | return array_values( array_filter( $generatedFields )); |
@@ -73,7 +77,9 @@ discard block |
||
73 | 77 | if( !empty( $this->errors )) { |
74 | 78 | $errors = []; |
75 | 79 | foreach( $this->required as $name => $alert ) { |
76 | - if( false !== array_search( $name, glsr_array_column( $fields, 'name' )))continue; |
|
80 | + if( false !== array_search( $name, glsr_array_column( $fields, 'name' ))) { |
|
81 | + continue; |
|
82 | + } |
|
77 | 83 | $errors[] = $this->errors[$name]; |
78 | 84 | } |
79 | 85 | $this->errors = $errors; |
@@ -117,7 +123,9 @@ discard block |
||
117 | 123 | */ |
118 | 124 | protected function normalizeContainer( array $field ) |
119 | 125 | { |
120 | - if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return; |
|
126 | + if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) { |
|
127 | + return; |
|
128 | + } |
|
121 | 129 | $field['items'] = $this->generateFields( $field['items'] ); |
122 | 130 | return $field; |
123 | 131 | } |
@@ -127,7 +135,9 @@ discard block |
||
127 | 135 | */ |
128 | 136 | protected function normalizeField( array $field, array $defaults ) |
129 | 137 | { |
130 | - if( !$this->validate( $field ))return; |
|
138 | + if( !$this->validate( $field )) { |
|
139 | + return; |
|
140 | + } |
|
131 | 141 | return array_filter( shortcode_atts( $defaults, $field ), function( $value ) { |
132 | 142 | return $value !== ''; |
133 | 143 | }); |
@@ -148,7 +158,9 @@ discard block |
||
148 | 158 | 'type' => '', |
149 | 159 | 'value' => '', |
150 | 160 | ]); |
151 | - if( !is_array( $listbox ))return; |
|
161 | + if( !is_array( $listbox )) { |
|
162 | + return; |
|
163 | + } |
|
152 | 164 | if( !array_key_exists( '', $listbox['options'] )) { |
153 | 165 | $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options']; |
154 | 166 | } |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | 'label' => '['.$tag.']', |
49 | 49 | 'required' => $this->required, |
50 | 50 | 'title' => esc_html__( 'Shortcode', 'site-reviews' ), |
51 | - ]); |
|
51 | + ] ); |
|
52 | 52 | return $this; |
53 | 53 | } |
54 | 54 | |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | protected function generateFields( array $fields ) |
59 | 59 | { |
60 | 60 | $generatedFields = array_map( function( $field ) { |
61 | - if( empty( $field ))return; |
|
61 | + if( empty($field) )return; |
|
62 | 62 | $field = $this->normalize( $field ); |
63 | - if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return; |
|
63 | + if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return; |
|
64 | 64 | return $this->$method( $field ); |
65 | 65 | }, $fields ); |
66 | - return array_values( array_filter( $generatedFields )); |
|
66 | + return array_values( array_filter( $generatedFields ) ); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | protected function getCategories( $tooltip = '' ) |
74 | 74 | { |
75 | 75 | $terms = glsr( Database::class )->getTerms(); |
76 | - if( empty( $terms )) { |
|
76 | + if( empty($terms) ) { |
|
77 | 77 | return []; |
78 | 78 | } |
79 | 79 | return [ |
@@ -91,15 +91,15 @@ discard block |
||
91 | 91 | protected function getFields() |
92 | 92 | { |
93 | 93 | $fields = $this->generateFields( $this->fields() ); |
94 | - if( !empty( $this->errors )) { |
|
94 | + if( !empty($this->errors) ) { |
|
95 | 95 | $errors = []; |
96 | 96 | foreach( $this->required as $name => $alert ) { |
97 | - if( false !== array_search( $name, glsr_array_column( $fields, 'name' )))continue; |
|
97 | + if( false !== array_search( $name, glsr_array_column( $fields, 'name' ) ) )continue; |
|
98 | 98 | $errors[] = $this->errors[$name]; |
99 | 99 | } |
100 | 100 | $this->errors = $errors; |
101 | 101 | } |
102 | - return empty( $this->errors ) |
|
102 | + return empty($this->errors) |
|
103 | 103 | ? $fields |
104 | 104 | : $this->errors; |
105 | 105 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | protected function getHideOptions() |
111 | 111 | { |
112 | - $classname = str_replace( 'Popup', 'Shortcode', get_class( $this )); |
|
112 | + $classname = str_replace( 'Popup', 'Shortcode', get_class( $this ) ); |
|
113 | 113 | $hideOptions = glsr( $classname )->getHideOptions(); |
114 | 114 | $options = []; |
115 | 115 | foreach( $hideOptions as $name => $tooltip ) { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | return wp_parse_args( $field, [ |
150 | 150 | 'items' => [], |
151 | 151 | 'type' => '', |
152 | - ]); |
|
152 | + ] ); |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | 'tooltip' => '', |
168 | 168 | 'type' => '', |
169 | 169 | 'value' => '', |
170 | - ]); |
|
170 | + ] ); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 | /** |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | */ |
176 | 176 | protected function normalizeContainer( array $field ) |
177 | 177 | { |
178 | - if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return; |
|
178 | + if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return; |
|
179 | 179 | $field['items'] = $this->generateFields( $field['items'] ); |
180 | 180 | return $field; |
181 | 181 | } |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | */ |
186 | 186 | protected function normalizeField( array $field, array $defaults ) |
187 | 187 | { |
188 | - if( !$this->validate( $field ))return; |
|
188 | + if( !$this->validate( $field ) )return; |
|
189 | 189 | return array_filter( shortcode_atts( $defaults, $field ), function( $value ) { |
190 | 190 | return $value !== ''; |
191 | 191 | }); |
@@ -205,9 +205,9 @@ discard block |
||
205 | 205 | 'tooltip' => '', |
206 | 206 | 'type' => '', |
207 | 207 | 'value' => '', |
208 | - ]); |
|
209 | - if( !is_array( $listbox ))return; |
|
210 | - if( !array_key_exists( '', $listbox['options'] )) { |
|
208 | + ] ); |
|
209 | + if( !is_array( $listbox ) )return; |
|
210 | + if( !array_key_exists( '', $listbox['options'] ) ) { |
|
211 | 211 | $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options']; |
212 | 212 | } |
213 | 213 | foreach( $listbox['options'] as $value => $text ) { |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | */ |
225 | 225 | protected function normalizePost( array $field ) |
226 | 226 | { |
227 | - if( !is_array( $field['query_args'] )) { |
|
227 | + if( !is_array( $field['query_args'] ) ) { |
|
228 | 228 | $field['query_args'] = []; |
229 | 229 | } |
230 | 230 | $posts = get_posts( wp_parse_args( $field['query_args'], [ |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | 'orderby' => 'title', |
233 | 233 | 'post_type' => 'post', |
234 | 234 | 'posts_per_page' => 30, |
235 | - ])); |
|
236 | - if( !empty( $posts )) { |
|
235 | + ] ) ); |
|
236 | + if( !empty($posts) ) { |
|
237 | 237 | $options = []; |
238 | 238 | foreach( $posts as $post ) { |
239 | 239 | $options[$post->ID] = esc_html( $post->post_title ); |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | 'tooltip' => '', |
264 | 264 | 'type' => '', |
265 | 265 | 'value' => '', |
266 | - ]); |
|
266 | + ] ); |
|
267 | 267 | } |
268 | 268 | |
269 | 269 | /** |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | */ |
272 | 272 | protected function validate( array $field ) |
273 | 273 | { |
274 | - $args = shortcode_atts([ |
|
274 | + $args = shortcode_atts( [ |
|
275 | 275 | 'label' => '', |
276 | 276 | 'name' => false, |
277 | 277 | 'required' => false, |
@@ -287,13 +287,13 @@ discard block |
||
287 | 287 | */ |
288 | 288 | protected function validateErrors( array $args ) |
289 | 289 | { |
290 | - if( !isset( $args['required']['error'] )) { |
|
290 | + if( !isset($args['required']['error']) ) { |
|
291 | 291 | return true; |
292 | 292 | } |
293 | - $this->errors[$args['name']] = $this->normalizeContainer([ |
|
293 | + $this->errors[$args['name']] = $this->normalizeContainer( [ |
|
294 | 294 | 'html' => $args['required']['error'], |
295 | 295 | 'type' => 'container', |
296 | - ]); |
|
296 | + ] ); |
|
297 | 297 | return false; |
298 | 298 | } |
299 | 299 | |
@@ -306,10 +306,10 @@ discard block |
||
306 | 306 | return true; |
307 | 307 | } |
308 | 308 | $alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' ); |
309 | - if( isset( $args['required']['alert'] )) { |
|
309 | + if( isset($args['required']['alert']) ) { |
|
310 | 310 | $alert = $args['required']['alert']; |
311 | 311 | } |
312 | - else if( !empty( $args['label'] )) { |
|
312 | + else if( !empty($args['label']) ) { |
|
313 | 313 | $alert = sprintf( |
314 | 314 | esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ), |
315 | 315 | str_replace( ':', '', $args['label'] ) |