@@ -1,4 +1,4 @@ |
||
1 | -<?php defined('WPINC') || die; ?> |
|
1 | +<?php defined( 'WPINC' ) || die; ?> |
|
2 | 2 | |
3 | 3 | <p class="about-description">If you are using any Site Reviews code snippets or have built any custom integrations with Site Reviews, please make sure to read this upgrade guide.</p> |
4 | 4 | <div class="is-fullwidth"> |
@@ -1,21 +1,21 @@ |
||
1 | -<?php defined('WPINC') || die; ?> |
|
1 | +<?php defined( 'WPINC' ) || die; ?> |
|
2 | 2 | |
3 | 3 | <div class="wrap"> |
4 | - <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1> |
|
4 | + <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1> |
|
5 | 5 | <?= $notices; ?> |
6 | 6 | <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper"> |
7 | - <?php foreach ($tabs as $id => $title) : ?> |
|
7 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
8 | 8 | <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a> |
9 | 9 | <?php endforeach; ?> |
10 | 10 | </h2> |
11 | 11 | <form class="glsr-form" action="options.php" enctype="multipart/form-data" method="post"> |
12 | - <?php foreach ($tabs as $id => $title) : ?> |
|
12 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
13 | 13 | <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>"> |
14 | - <?= $settings->buildFields($id); ?> |
|
14 | + <?= $settings->buildFields( $id ); ?> |
|
15 | 15 | </div> |
16 | 16 | <?php endforeach; ?> |
17 | 17 | <input type="hidden" name="_active_tab"> |
18 | - <?php settings_fields(glsr()->id.'-settings'); ?> |
|
18 | + <?php settings_fields( glsr()->id.'-settings' ); ?> |
|
19 | 19 | <?php submit_button(); ?> |
20 | 20 | </form> |
21 | 21 | </div> |
@@ -1,16 +1,16 @@ |
||
1 | -<?php defined('WPINC') || die; ?> |
|
1 | +<?php defined( 'WPINC' ) || die; ?> |
|
2 | 2 | |
3 | 3 | <div class="wrap"> |
4 | - <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1> |
|
4 | + <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1> |
|
5 | 5 | <?= $notices; ?> |
6 | 6 | <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper"> |
7 | - <?php foreach ($tabs as $id => $title) : ?> |
|
7 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
8 | 8 | <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a> |
9 | 9 | <?php endforeach; ?> |
10 | 10 | </h2> |
11 | - <?php foreach ($tabs as $id => $title) : ?> |
|
11 | + <?php foreach( $tabs as $id => $title ) : ?> |
|
12 | 12 | <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>"> |
13 | - <?php $template->render('pages/tools/'.$id, $data); ?> |
|
13 | + <?php $template->render( 'pages/tools/'.$id, $data ); ?> |
|
14 | 14 | </div> |
15 | 15 | <?php endforeach; ?> |
16 | 16 | <input type="hidden" name="_active_tab"> |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | */ |
15 | 15 | public $field; |
16 | 16 | |
17 | - public function __construct(array $field = []) |
|
17 | + public function __construct( array $field = [] ) |
|
18 | 18 | { |
19 | - $this->field = wp_parse_args($field, [ |
|
19 | + $this->field = wp_parse_args( $field, [ |
|
20 | 20 | 'errors' => false, |
21 | 21 | 'is_hidden' => false, |
22 | 22 | 'is_multi' => false, |
@@ -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 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function __toString() |
37 | 37 | { |
38 | - return (string) $this->build(); |
|
38 | + return (string)$this->build(); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
@@ -43,16 +43,16 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function build() |
45 | 45 | { |
46 | - if (!$this->field['is_valid']) { |
|
46 | + if( !$this->field['is_valid'] ) { |
|
47 | 47 | return; |
48 | 48 | } |
49 | - if ($this->field['is_raw']) { |
|
50 | - return glsr(Builder::class)->{$this->field['type']}($this->field); |
|
49 | + if( $this->field['is_raw'] ) { |
|
50 | + return glsr( Builder::class )->{$this->field['type']}($this->field); |
|
51 | 51 | } |
52 | - if (!$this->field['is_setting']) { |
|
52 | + if( !$this->field['is_setting'] ) { |
|
53 | 53 | return $this->buildField(); |
54 | 54 | } |
55 | - if (!$this->field['is_multi']) { |
|
55 | + if( !$this->field['is_multi'] ) { |
|
56 | 56 | return $this->buildSettingField(); |
57 | 57 | } |
58 | 58 | return $this->buildSettingMultiField(); |
@@ -71,22 +71,22 @@ discard block |
||
71 | 71 | */ |
72 | 72 | protected function buildField() |
73 | 73 | { |
74 | - $field = glsr(Template::class)->build('templates/form/field_'.$this->field['type'], [ |
|
74 | + $field = glsr( Template::class )->build( 'templates/form/field_'.$this->field['type'], [ |
|
75 | 75 | 'context' => [ |
76 | 76 | 'class' => $this->getFieldClass(), |
77 | 77 | 'errors' => $this->getFieldErrors(), |
78 | - 'field' => glsr(Builder::class)->raw($this->field), |
|
79 | - 'label' => glsr(Builder::class)->label([ |
|
78 | + 'field' => glsr( Builder::class )->raw( $this->field ), |
|
79 | + 'label' => glsr( Builder::class )->label( [ |
|
80 | 80 | 'class' => 'glsr-'.$this->field['type'].'-label', |
81 | 81 | 'for' => $this->field['id'], |
82 | 82 | 'is_public' => $this->field['is_public'], |
83 | 83 | 'text' => $this->field['label'].'<span></span>', |
84 | 84 | 'type' => $this->field['type'], |
85 | - ]), |
|
85 | + ] ), |
|
86 | 86 | ], |
87 | 87 | 'field' => $this->field, |
88 | - ]); |
|
89 | - return apply_filters('site-reviews/rendered/field', $field, $this->field['type'], $this->field); |
|
88 | + ] ); |
|
89 | + return apply_filters( 'site-reviews/rendered/field', $field, $this->field['type'], $this->field ); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -94,14 +94,14 @@ discard block |
||
94 | 94 | */ |
95 | 95 | protected function buildSettingField() |
96 | 96 | { |
97 | - return glsr(Template::class)->build('partials/form/table-row', [ |
|
97 | + return glsr( Template::class )->build( 'partials/form/table-row', [ |
|
98 | 98 | 'context' => [ |
99 | 99 | 'class' => $this->getFieldClass(), |
100 | - 'field' => glsr(Builder::class)->{$this->field['type']}($this->field), |
|
101 | - 'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]), |
|
100 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
101 | + 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
|
102 | 102 | ], |
103 | 103 | 'field' => $this->field, |
104 | - ]); |
|
104 | + ] ); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | { |
112 | 112 | $dependsOn = $this->getFieldDependsOn(); |
113 | 113 | unset($this->field['data-depends']); |
114 | - return glsr(Template::class)->build('partials/form/table-row-multiple', [ |
|
114 | + return glsr( Template::class )->build( 'partials/form/table-row-multiple', [ |
|
115 | 115 | 'context' => [ |
116 | 116 | 'class' => $this->getFieldClass(), |
117 | 117 | 'depends_on' => $dependsOn, |
118 | - 'field' => glsr(Builder::class)->{$this->field['type']}($this->field), |
|
119 | - 'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]), |
|
118 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
119 | + 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
|
120 | 120 | 'legend' => $this->field['legend'], |
121 | 121 | ], |
122 | 122 | 'field' => $this->field, |
123 | - ]); |
|
123 | + ] ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -129,17 +129,17 @@ discard block |
||
129 | 129 | protected function getFieldClass() |
130 | 130 | { |
131 | 131 | $classes = []; |
132 | - if (!empty($this->field['errors'])) { |
|
132 | + if( !empty($this->field['errors']) ) { |
|
133 | 133 | $classes[] = 'glsr-has-error'; |
134 | 134 | } |
135 | - if ($this->field['is_hidden']) { |
|
135 | + if( $this->field['is_hidden'] ) { |
|
136 | 136 | $classes[] = 'hidden'; |
137 | 137 | } |
138 | - if (!empty($this->field['required'])) { |
|
138 | + if( !empty($this->field['required']) ) { |
|
139 | 139 | $classes[] = 'glsr-required'; |
140 | 140 | } |
141 | - $classes = apply_filters('site-reviews/rendered/field/classes', $classes, $this->field); |
|
142 | - return implode(' ', $classes); |
|
141 | + $classes = apply_filters( 'site-reviews/rendered/field/classes', $classes, $this->field ); |
|
142 | + return implode( ' ', $classes ); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -157,18 +157,18 @@ discard block |
||
157 | 157 | */ |
158 | 158 | protected function getFieldErrors() |
159 | 159 | { |
160 | - if (empty($this->field['errors']) || !is_array($this->field['errors'])) { |
|
160 | + if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) ) { |
|
161 | 161 | return; |
162 | 162 | } |
163 | - $errors = array_reduce($this->field['errors'], function ($carry, $error) { |
|
164 | - return $carry.glsr(Builder::class)->span($error, ['class' => 'glsr-field-error']); |
|
163 | + $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
|
164 | + return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
|
165 | 165 | }); |
166 | - return glsr(Template::class)->build('templates/form/field-errors', [ |
|
166 | + return glsr( Template::class )->build( 'templates/form/field-errors', [ |
|
167 | 167 | 'context' => [ |
168 | 168 | 'errors' => $errors, |
169 | 169 | ], |
170 | 170 | 'field' => $this->field, |
171 | - ]); |
|
171 | + ] ); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -190,17 +190,17 @@ discard block |
||
190 | 190 | $requiredValues = [ |
191 | 191 | 'name', 'type', |
192 | 192 | ]; |
193 | - foreach ($requiredValues as $value) { |
|
194 | - if (isset($this->field[$value])) { |
|
193 | + foreach( $requiredValues as $value ) { |
|
194 | + if( isset($this->field[$value]) ) { |
|
195 | 195 | continue; |
196 | 196 | } |
197 | 197 | $missingValues[] = $value; |
198 | 198 | $this->field['is_valid'] = false; |
199 | 199 | } |
200 | - if (!empty($missingValues)) { |
|
200 | + if( !empty($missingValues) ) { |
|
201 | 201 | glsr_log() |
202 | - ->warning('Field is missing: '.implode(', ', $missingValues)) |
|
203 | - ->debug($this->field); |
|
202 | + ->warning( 'Field is missing: '.implode( ', ', $missingValues ) ) |
|
203 | + ->debug( $this->field ); |
|
204 | 204 | } |
205 | 205 | return $this->field['is_valid']; |
206 | 206 | } |
@@ -210,13 +210,13 @@ discard block |
||
210 | 210 | */ |
211 | 211 | protected function normalize() |
212 | 212 | { |
213 | - if (!$this->isFieldValid()) { |
|
213 | + if( !$this->isFieldValid() ) { |
|
214 | 214 | return; |
215 | 215 | } |
216 | 216 | $this->field['path'] = $this->field['name']; |
217 | - $className = Helper::buildClassName($this->field['type'], __NAMESPACE__.'\Fields'); |
|
218 | - if (class_exists($className)) { |
|
219 | - $this->field = $className::merge($this->field); |
|
217 | + $className = Helper::buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
|
218 | + if( class_exists( $className ) ) { |
|
219 | + $this->field = $className::merge( $this->field ); |
|
220 | 220 | } |
221 | 221 | $this->normalizeFieldId(); |
222 | 222 | $this->normalizeFieldName(); |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | */ |
228 | 228 | protected function normalizeFieldId() |
229 | 229 | { |
230 | - if (isset($this->field['id']) || $this->field['is_raw']) { |
|
230 | + if( isset($this->field['id']) || $this->field['is_raw'] ) { |
|
231 | 231 | return; |
232 | 232 | } |
233 | 233 | $this->field['id'] = Str::convertPathToId( |
@@ -11,29 +11,29 @@ |
||
11 | 11 | * @param int $postId |
12 | 12 | * @return void |
13 | 13 | */ |
14 | - public function saveAssignedToMetabox($postId) |
|
14 | + public function saveAssignedToMetabox( $postId ) |
|
15 | 15 | { |
16 | - if (!wp_verify_nonce(Helper::filterInput('_nonce-assigned-to'), 'assigned_to')) { |
|
16 | + if( !wp_verify_nonce( Helper::filterInput( '_nonce-assigned-to' ), 'assigned_to' ) ) { |
|
17 | 17 | return; |
18 | 18 | } |
19 | - $assignedTo = strval(Helper::filterInput('assigned_to')); |
|
20 | - glsr(Database::class)->update($postId, 'assigned_to', $assignedTo); |
|
19 | + $assignedTo = strval( Helper::filterInput( 'assigned_to' ) ); |
|
20 | + glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo ); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @param int $postId |
25 | 25 | * @return mixed |
26 | 26 | */ |
27 | - public function saveResponseMetabox($postId) |
|
27 | + public function saveResponseMetabox( $postId ) |
|
28 | 28 | { |
29 | - if (!wp_verify_nonce(Helper::filterInput('_nonce-response'), 'response')) { |
|
29 | + if( !wp_verify_nonce( Helper::filterInput( '_nonce-response' ), 'response' ) ) { |
|
30 | 30 | return; |
31 | 31 | } |
32 | - $response = strval(Helper::filterInput('response')); |
|
33 | - glsr(Database::class)->update($postId, 'response', trim(wp_kses($response, [ |
|
32 | + $response = strval( Helper::filterInput( 'response' ) ); |
|
33 | + glsr( Database::class )->update( $postId, 'response', trim( wp_kses( $response, [ |
|
34 | 34 | 'a' => ['href' => [], 'title' => []], |
35 | 35 | 'em' => [], |
36 | 36 | 'strong' => [], |
37 | - ]))); |
|
37 | + ] ) ) ); |
|
38 | 38 | } |
39 | 39 | } |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | public $postType; |
16 | 16 | public $single; |
17 | 17 | |
18 | - public function __construct($input) |
|
18 | + public function __construct( $input ) |
|
19 | 19 | { |
20 | - $args = glsr(PostTypeDefaults::class)->merge($input); |
|
21 | - $this->normalize($args); |
|
20 | + $args = glsr( PostTypeDefaults::class )->merge( $input ); |
|
21 | + $this->normalize( $args ); |
|
22 | 22 | $this->normalizeColumns(); |
23 | 23 | $this->normalizeLabels(); |
24 | 24 | } |
@@ -26,19 +26,19 @@ discard block |
||
26 | 26 | /** |
27 | 27 | * @return void |
28 | 28 | */ |
29 | - protected function normalize(array $args) |
|
29 | + protected function normalize( array $args ) |
|
30 | 30 | { |
31 | - foreach ($args as $key => $value) { |
|
32 | - $property = Helper::buildPropertyName($key); |
|
33 | - if (!property_exists($this, $property)) { |
|
31 | + foreach( $args as $key => $value ) { |
|
32 | + $property = Helper::buildPropertyName( $key ); |
|
33 | + if( !property_exists( $this, $property ) ) { |
|
34 | 34 | continue; |
35 | 35 | } |
36 | 36 | $this->$property = $value; |
37 | 37 | unset($args[$key]); |
38 | 38 | } |
39 | - $this->args = wp_parse_args($args, [ |
|
39 | + $this->args = wp_parse_args( $args, [ |
|
40 | 40 | 'menu_name' => $this->plural, |
41 | - ]); |
|
41 | + ] ); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -46,22 +46,22 @@ discard block |
||
46 | 46 | */ |
47 | 47 | protected function normalizeLabels() |
48 | 48 | { |
49 | - $this->args['labels'] = wp_parse_args($this->args['labels'], [ |
|
50 | - 'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural), |
|
51 | - 'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural), |
|
52 | - 'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single), |
|
53 | - 'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single), |
|
54 | - 'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single), |
|
49 | + $this->args['labels'] = wp_parse_args( $this->args['labels'], [ |
|
50 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add New Post', 'site-reviews' ), $this->plural ), |
|
51 | + 'all_items' => sprintf( _x( 'All %s', 'All Posts', 'site-reviews' ), $this->plural ), |
|
52 | + 'archives' => sprintf( _x( '%s Archives', 'Post Archives', 'site-reviews' ), $this->single ), |
|
53 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit Post', 'site-reviews' ), $this->single ), |
|
54 | + 'insert_into_item' => sprintf( _x( 'Insert into %s', 'Insert into Post', 'site-reviews' ), $this->single ), |
|
55 | 55 | 'menu_name' => $this->args['menu_name'], |
56 | 56 | 'name' => $this->plural, |
57 | - 'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single), |
|
58 | - 'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural), |
|
59 | - 'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural), |
|
60 | - 'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural), |
|
57 | + 'new_item' => sprintf( _x( 'New %s', 'New Post', 'site-reviews' ), $this->single ), |
|
58 | + 'not_found' => sprintf( _x( 'No %s found', 'No Posts found', 'site-reviews' ), $this->plural ), |
|
59 | + 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No Posts found in Trash', 'site-reviews' ), $this->plural ), |
|
60 | + 'search_items' => sprintf( _x( 'Search %s', 'Search Posts', 'site-reviews' ), $this->plural ), |
|
61 | 61 | 'singular_name' => $this->single, |
62 | - 'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single), |
|
63 | - 'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single), |
|
64 | - ]); |
|
62 | + 'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ), |
|
63 | + 'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ), |
|
64 | + ] ); |
|
65 | 65 | unset($this->args['menu_name']); |
66 | 66 | } |
67 | 67 | |
@@ -71,13 +71,13 @@ discard block |
||
71 | 71 | protected function normalizeColumns() |
72 | 72 | { |
73 | 73 | $this->columns = ['cb' => ''] + $this->columns; |
74 | - if (array_key_exists('category', $this->columns)) { |
|
75 | - $keys = array_keys($this->columns); |
|
76 | - $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | - $this->columns = array_combine($keys, $this->columns); |
|
74 | + if( array_key_exists( 'category', $this->columns ) ) { |
|
75 | + $keys = array_keys( $this->columns ); |
|
76 | + $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY; |
|
77 | + $this->columns = array_combine( $keys, $this->columns ); |
|
78 | 78 | } |
79 | - if (array_key_exists('pinned', $this->columns)) { |
|
80 | - $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>', |
|
79 | + if( array_key_exists( 'pinned', $this->columns ) ) { |
|
80 | + $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>', |
|
81 | 81 | ['class' => 'pinned-icon'] |
82 | 82 | ); |
83 | 83 | } |
@@ -14,10 +14,10 @@ discard block |
||
14 | 14 | |
15 | 15 | public function __construct() |
16 | 16 | { |
17 | - $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [ |
|
17 | + $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [ |
|
18 | 18 | 'dismiss-notice', |
19 | 19 | 'fetch-paged-reviews', |
20 | - ]); |
|
20 | + ] ); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | public function routeAdminPostRequest() |
27 | 27 | { |
28 | 28 | $request = $this->getRequest(); |
29 | - if (!$this->isValidPostRequest($request)) { |
|
29 | + if( !$this->isValidPostRequest( $request ) ) { |
|
30 | 30 | return; |
31 | 31 | } |
32 | - check_admin_referer($request['_action']); |
|
33 | - $this->routeRequest('admin', $request['_action'], $request); |
|
32 | + check_admin_referer( $request['_action'] ); |
|
33 | + $this->routeRequest( 'admin', $request['_action'], $request ); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | public function routeAjaxRequest() |
40 | 40 | { |
41 | 41 | $request = $this->getRequest(); |
42 | - $this->checkAjaxRequest($request); |
|
43 | - $this->checkAjaxNonce($request); |
|
44 | - $this->routeRequest('ajax', $request['_action'], $request); |
|
42 | + $this->checkAjaxRequest( $request ); |
|
43 | + $this->checkAjaxNonce( $request ); |
|
44 | + $this->routeRequest( 'ajax', $request['_action'], $request ); |
|
45 | 45 | wp_die(); |
46 | 46 | } |
47 | 47 | |
@@ -50,45 +50,45 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function routePublicPostRequest() |
52 | 52 | { |
53 | - if (is_admin()) { |
|
53 | + if( is_admin() ) { |
|
54 | 54 | return; |
55 | 55 | } |
56 | 56 | $request = $this->getRequest(); |
57 | - if (!$this->isValidPostRequest($request)) { |
|
57 | + if( !$this->isValidPostRequest( $request ) ) { |
|
58 | 58 | return; |
59 | 59 | } |
60 | - if (!$this->isValidPublicNonce($request)) { |
|
60 | + if( !$this->isValidPublicNonce( $request ) ) { |
|
61 | 61 | return; |
62 | 62 | } |
63 | - $this->routeRequest('public', $request['_action'], $request); |
|
63 | + $this->routeRequest( 'public', $request['_action'], $request ); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | /** |
67 | 67 | * @return void |
68 | 68 | */ |
69 | - protected function checkAjaxNonce(array $request) |
|
69 | + protected function checkAjaxNonce( array $request ) |
|
70 | 70 | { |
71 | - if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) { |
|
71 | + if( !is_user_logged_in() || in_array( Arr::get( $request, '_action' ), $this->unguardedActions ) ) { |
|
72 | 72 | return; |
73 | 73 | } |
74 | - if (!isset($request['_nonce'])) { |
|
75 | - $this->sendAjaxError('request is missing a nonce', $request); |
|
74 | + if( !isset($request['_nonce']) ) { |
|
75 | + $this->sendAjaxError( 'request is missing a nonce', $request ); |
|
76 | 76 | } |
77 | - if (!wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
78 | - $this->sendAjaxError('request failed the nonce check', $request, 403); |
|
77 | + if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
78 | + $this->sendAjaxError( 'request failed the nonce check', $request, 403 ); |
|
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | 83 | * @return void |
84 | 84 | */ |
85 | - protected function checkAjaxRequest(array $request) |
|
85 | + protected function checkAjaxRequest( array $request ) |
|
86 | 86 | { |
87 | - if (!isset($request['_action'])) { |
|
88 | - $this->sendAjaxError('request must include an action', $request); |
|
87 | + if( !isset($request['_action']) ) { |
|
88 | + $this->sendAjaxError( 'request must include an action', $request ); |
|
89 | 89 | } |
90 | - if (empty($request['_ajax_request'])) { |
|
91 | - $this->sendAjaxError('request is invalid', $request); |
|
90 | + if( empty($request['_ajax_request']) ) { |
|
91 | + $this->sendAjaxError( 'request is invalid', $request ); |
|
92 | 92 | } |
93 | 93 | } |
94 | 94 | |
@@ -99,12 +99,12 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function getRequest() |
101 | 101 | { |
102 | - $request = Helper::filterInputArray(Application::ID); |
|
103 | - if (Helper::filterInput('action') == Application::PREFIX.'action') { |
|
102 | + $request = Helper::filterInputArray( Application::ID ); |
|
103 | + if( Helper::filterInput( 'action' ) == Application::PREFIX.'action' ) { |
|
104 | 104 | $request['_ajax_request'] = true; |
105 | 105 | } |
106 | - if ('submit-review' == Helper::filterInput('_action', $request)) { |
|
107 | - $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response'); |
|
106 | + if( 'submit-review' == Helper::filterInput( '_action', $request ) ) { |
|
107 | + $request['_recaptcha-token'] = Helper::filterInput( 'g-recaptcha-response' ); |
|
108 | 108 | } |
109 | 109 | return $request; |
110 | 110 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | /** |
113 | 113 | * @return bool |
114 | 114 | */ |
115 | - protected function isValidPostRequest(array $request = []) |
|
115 | + protected function isValidPostRequest( array $request = [] ) |
|
116 | 116 | { |
117 | 117 | return !empty($request['_action']) && empty($request['_ajax_request']); |
118 | 118 | } |
@@ -120,10 +120,10 @@ discard block |
||
120 | 120 | /** |
121 | 121 | * @return bool |
122 | 122 | */ |
123 | - protected function isValidPublicNonce(array $request) |
|
123 | + protected function isValidPublicNonce( array $request ) |
|
124 | 124 | { |
125 | - if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) { |
|
126 | - glsr_log()->error('nonce check failed for public request')->debug($request); |
|
125 | + if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
126 | + glsr_log()->error( 'nonce check failed for public request' )->debug( $request ); |
|
127 | 127 | return false; |
128 | 128 | } |
129 | 129 | return true; |
@@ -134,19 +134,19 @@ discard block |
||
134 | 134 | * @param string $action |
135 | 135 | * @return void |
136 | 136 | */ |
137 | - protected function routeRequest($type, $action, array $request = []) |
|
137 | + protected function routeRequest( $type, $action, array $request = [] ) |
|
138 | 138 | { |
139 | 139 | $actionHook = 'site-reviews/route/'.$type.'/request'; |
140 | - $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers')); |
|
141 | - $method = Helper::buildMethodName($action, 'router'); |
|
142 | - $request = apply_filters('site-reviews/route/request', $request, $action, $type); |
|
143 | - do_action($actionHook, $action, $request); |
|
144 | - if (is_callable([$controller, $method])) { |
|
145 | - call_user_func([$controller, $method], $request); |
|
140 | + $controller = glsr( Helper::buildClassName( $type.'-controller', 'Controllers' ) ); |
|
141 | + $method = Helper::buildMethodName( $action, 'router' ); |
|
142 | + $request = apply_filters( 'site-reviews/route/request', $request, $action, $type ); |
|
143 | + do_action( $actionHook, $action, $request ); |
|
144 | + if( is_callable( [$controller, $method] ) ) { |
|
145 | + call_user_func( [$controller, $method], $request ); |
|
146 | 146 | return; |
147 | 147 | } |
148 | - if (0 === did_action($actionHook)) { |
|
149 | - glsr_log('Unknown '.$type.' router request: '.$action); |
|
148 | + if( 0 === did_action( $actionHook ) ) { |
|
149 | + glsr_log( 'Unknown '.$type.' router request: '.$action ); |
|
150 | 150 | } |
151 | 151 | } |
152 | 152 | |
@@ -155,14 +155,14 @@ discard block |
||
155 | 155 | * @param int $statusCode |
156 | 156 | * @return void |
157 | 157 | */ |
158 | - protected function sendAjaxError($error, array $request, $statusCode = 400) |
|
158 | + protected function sendAjaxError( $error, array $request, $statusCode = 400 ) |
|
159 | 159 | { |
160 | - glsr_log()->error($error)->debug($request); |
|
161 | - glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>'); |
|
162 | - wp_send_json_error([ |
|
163 | - 'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'), |
|
164 | - 'notices' => glsr(Notice::class)->get(), |
|
160 | + glsr_log()->error( $error )->debug( $request ); |
|
161 | + glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' ); |
|
162 | + wp_send_json_error( [ |
|
163 | + 'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ), |
|
164 | + 'notices' => glsr( Notice::class )->get(), |
|
165 | 165 | 'error' => $error, |
166 | - ]); |
|
166 | + ] ); |
|
167 | 167 | } |
168 | 168 | } |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public function renderTaxonomyFilter() |
38 | 38 | { |
39 | - if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) { |
|
39 | + if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ) ) { |
|
40 | 40 | return; |
41 | 41 | } |
42 | - echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [ |
|
42 | + echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [ |
|
43 | 43 | 'class' => 'screen-reader-text', |
44 | 44 | 'for' => Application::TAXONOMY, |
45 | - ]); |
|
46 | - wp_dropdown_categories([ |
|
45 | + ] ); |
|
46 | + wp_dropdown_categories( [ |
|
47 | 47 | 'depth' => 3, |
48 | 48 | 'hide_empty' => true, |
49 | 49 | 'hide_if_empty' => true, |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | 'show_option_all' => $this->getShowOptionAll(), |
56 | 56 | 'taxonomy' => Application::TAXONOMY, |
57 | 57 | 'value_field' => 'slug', |
58 | - ]); |
|
58 | + ] ); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -68,17 +68,17 @@ discard block |
||
68 | 68 | * @return void |
69 | 69 | * @action set_object_terms |
70 | 70 | */ |
71 | - public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds) |
|
71 | + public function restrictTermSelection( $postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds ) |
|
72 | 72 | { |
73 | - if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) { |
|
73 | + if( Application::TAXONOMY != $taxonomy || count( $newTTIds ) <= 1 ) { |
|
74 | 74 | return; |
75 | 75 | } |
76 | - $diff = array_diff($newTTIds, $oldTTIds); |
|
77 | - if (empty($newTerm = array_shift($diff))) { |
|
78 | - $newTerm = array_shift($newTTIds); |
|
76 | + $diff = array_diff( $newTTIds, $oldTTIds ); |
|
77 | + if( empty($newTerm = array_shift( $diff )) ) { |
|
78 | + $newTerm = array_shift( $newTTIds ); |
|
79 | 79 | } |
80 | - if ($newTerm) { |
|
81 | - wp_set_object_terms($postId, intval($newTerm), $taxonomy); |
|
80 | + if( $newTerm ) { |
|
81 | + wp_set_object_terms( $postId, intval( $newTerm ), $taxonomy ); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | protected function getSelected() |
89 | 89 | { |
90 | 90 | global $wp_query; |
91 | - return Arr::get($wp_query->query, Application::TAXONOMY); |
|
91 | + return Arr::get( $wp_query->query, Application::TAXONOMY ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | */ |
97 | 97 | protected function getShowOptionAll() |
98 | 98 | { |
99 | - $taxonomy = get_taxonomy(Application::TAXONOMY); |
|
99 | + $taxonomy = get_taxonomy( Application::TAXONOMY ); |
|
100 | 100 | return $taxonomy |
101 | - ? ucfirst(strtolower($taxonomy->labels->all_items)) |
|
101 | + ? ucfirst( strtolower( $taxonomy->labels->all_items ) ) |
|
102 | 102 | : ''; |
103 | 103 | } |
104 | 104 | } |
@@ -37,18 +37,18 @@ discard block |
||
37 | 37 | * @param string $method |
38 | 38 | * @return static |
39 | 39 | */ |
40 | - public function __call($method, array $arguments) |
|
40 | + public function __call( $method, array $arguments ) |
|
41 | 41 | { |
42 | - return $this->setProperty($method, Arr::get($arguments, 0)); |
|
42 | + return $this->setProperty( $method, Arr::get( $arguments, 0 ) ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
46 | 46 | * @param string $type |
47 | 47 | */ |
48 | - public function __construct($type = null) |
|
48 | + public function __construct( $type = null ) |
|
49 | 49 | { |
50 | - $this->type = !is_string($type) |
|
51 | - ? (new ReflectionClass($this))->getShortName() |
|
50 | + $this->type = !is_string( $type ) |
|
51 | + ? (new ReflectionClass( $this ))->getShortName() |
|
52 | 52 | : $type; |
53 | 53 | $this->setAllowedProperties(); |
54 | 54 | } |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | /** |
65 | 65 | * @return static |
66 | 66 | */ |
67 | - public function addProperties(array $properties) |
|
67 | + public function addProperties( array $properties ) |
|
68 | 68 | { |
69 | - foreach ($properties as $property => $value) { |
|
70 | - $this->setProperty($property, $value); |
|
69 | + foreach( $properties as $property => $value ) { |
|
70 | + $this->setProperty( $property, $value ); |
|
71 | 71 | } |
72 | 72 | return $this; |
73 | 73 | } |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | * @param mixed $default |
94 | 94 | * @return mixed |
95 | 95 | */ |
96 | - public function getProperty($property, $default = null) |
|
96 | + public function getProperty( $property, $default = null ) |
|
97 | 97 | { |
98 | - return Arr::get($this->properties, $property, $default); |
|
98 | + return Arr::get( $this->properties, $property, $default ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -111,10 +111,10 @@ discard block |
||
111 | 111 | * @param mixed $callback |
112 | 112 | * @return static |
113 | 113 | */ |
114 | - public function doIf($condition, $callback) |
|
114 | + public function doIf( $condition, $callback ) |
|
115 | 115 | { |
116 | - if ($condition) { |
|
117 | - $callback($this); |
|
116 | + if( $condition ) { |
|
117 | + $callback( $this ); |
|
118 | 118 | } |
119 | 119 | return $this; |
120 | 120 | } |
@@ -131,18 +131,18 @@ discard block |
||
131 | 131 | * @param mixed $offset |
132 | 132 | * @return bool |
133 | 133 | */ |
134 | - public function offsetExists($offset) |
|
134 | + public function offsetExists( $offset ) |
|
135 | 135 | { |
136 | - return array_key_exists($offset, $this->properties); |
|
136 | + return array_key_exists( $offset, $this->properties ); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | /** |
140 | 140 | * @param string $offset |
141 | 141 | * @return mixed |
142 | 142 | */ |
143 | - public function offsetGet($offset) |
|
143 | + public function offsetGet( $offset ) |
|
144 | 144 | { |
145 | - return $this->getProperty($offset); |
|
145 | + return $this->getProperty( $offset ); |
|
146 | 146 | } |
147 | 147 | |
148 | 148 | /** |
@@ -150,16 +150,16 @@ discard block |
||
150 | 150 | * @param mixed $value |
151 | 151 | * @return void |
152 | 152 | */ |
153 | - public function offsetSet($offset, $value) |
|
153 | + public function offsetSet( $offset, $value ) |
|
154 | 154 | { |
155 | - $this->setProperty($offset, $value); |
|
155 | + $this->setProperty( $offset, $value ); |
|
156 | 156 | } |
157 | 157 | |
158 | 158 | /** |
159 | 159 | * @param string $offset |
160 | 160 | * @return void |
161 | 161 | */ |
162 | - public function offsetUnset($offset) |
|
162 | + public function offsetUnset( $offset ) |
|
163 | 163 | { |
164 | 164 | unset($this->properties[$offset]); |
165 | 165 | } |
@@ -169,11 +169,11 @@ discard block |
||
169 | 169 | * @param mixed $value |
170 | 170 | * @return static |
171 | 171 | */ |
172 | - public function setProperty($property, $value) |
|
172 | + public function setProperty( $property, $value ) |
|
173 | 173 | { |
174 | - if (!in_array($property, $this->allowed) |
|
175 | - && 'UnknownType' != (new ReflectionClass($this))->getShortName()) { |
|
176 | - glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property'); |
|
174 | + if( !in_array( $property, $this->allowed ) |
|
175 | + && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) { |
|
176 | + glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' ); |
|
177 | 177 | return $this; |
178 | 178 | } |
179 | 179 | $this->properties[$property] = $value; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | return [ |
189 | 189 | '@context' => $this->getContext(), |
190 | 190 | '@type' => $this->getType(), |
191 | - ] + $this->serializeProperty($this->getProperties()); |
|
191 | + ] + $this->serializeProperty( $this->getProperties() ); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | /** |
@@ -196,8 +196,8 @@ discard block |
||
196 | 196 | */ |
197 | 197 | public function toScript() |
198 | 198 | { |
199 | - return sprintf('<script type="application/ld+json">%s</script>', |
|
200 | - json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) |
|
199 | + return sprintf( '<script type="application/ld+json">%s</script>', |
|
200 | + json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES ) |
|
201 | 201 | ); |
202 | 202 | } |
203 | 203 | |
@@ -205,20 +205,20 @@ discard block |
||
205 | 205 | * @param array|null $parents |
206 | 206 | * @return array |
207 | 207 | */ |
208 | - protected function getParents($parents = null) |
|
208 | + protected function getParents( $parents = null ) |
|
209 | 209 | { |
210 | - if (!isset($parents)) { |
|
210 | + if( !isset($parents) ) { |
|
211 | 211 | $parents = $this->parents; |
212 | 212 | } |
213 | 213 | $newParents = $parents; |
214 | - foreach ($parents as $parent) { |
|
215 | - $parentClass = Helper::buildClassName($parent, __NAMESPACE__); |
|
216 | - if (!class_exists($parentClass)) { |
|
214 | + foreach( $parents as $parent ) { |
|
215 | + $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ ); |
|
216 | + if( !class_exists( $parentClass ) ) { |
|
217 | 217 | continue; |
218 | 218 | } |
219 | - $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents)); |
|
219 | + $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) ); |
|
220 | 220 | } |
221 | - return array_values(array_unique($newParents)); |
|
221 | + return array_values( array_unique( $newParents ) ); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -227,12 +227,12 @@ discard block |
||
227 | 227 | protected function setAllowedProperties() |
228 | 228 | { |
229 | 229 | $parents = $this->getParents(); |
230 | - foreach ($parents as $parent) { |
|
231 | - $parentClass = Helper::buildClassName($parent, __NAMESPACE__); |
|
232 | - if (!class_exists($parentClass)) { |
|
230 | + foreach( $parents as $parent ) { |
|
231 | + $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ ); |
|
232 | + if( !class_exists( $parentClass ) ) { |
|
233 | 233 | continue; |
234 | 234 | } |
235 | - $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed))); |
|
235 | + $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) ); |
|
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
@@ -240,19 +240,19 @@ discard block |
||
240 | 240 | * @param mixed $property |
241 | 241 | * @return array|string |
242 | 242 | */ |
243 | - protected function serializeProperty($property) |
|
243 | + protected function serializeProperty( $property ) |
|
244 | 244 | { |
245 | - if (is_array($property)) { |
|
246 | - return array_map([$this, 'serializeProperty'], $property); |
|
245 | + if( is_array( $property ) ) { |
|
246 | + return array_map( [$this, 'serializeProperty'], $property ); |
|
247 | 247 | } |
248 | - if ($property instanceof Type) { |
|
248 | + if( $property instanceof Type ) { |
|
249 | 249 | $property = $property->toArray(); |
250 | 250 | unset($property['@context']); |
251 | 251 | } |
252 | - if ($property instanceof DateTimeInterface) { |
|
253 | - $property = $property->format(DateTime::ATOM); |
|
252 | + if( $property instanceof DateTimeInterface ) { |
|
253 | + $property = $property->format( DateTime::ATOM ); |
|
254 | 254 | } |
255 | - if (is_object($property)) { |
|
255 | + if( is_object( $property ) ) { |
|
256 | 256 | throw new InvalidProperty(); |
257 | 257 | } |
258 | 258 | return $property; |