@@ -39,9 +39,9 @@ discard block |
||
39 | 39 | { |
40 | 40 | if( $this->app->config->disable_config )return; |
41 | 41 | |
42 | - add_action( 'admin_menu', [$this, 'registerPage'] ); |
|
43 | - add_action( 'admin_menu', [$this, 'registerSetting'] ); |
|
44 | - add_action( 'current_screen', [$this, 'resetPage'] ); |
|
42 | + add_action( 'admin_menu', [ $this, 'registerPage' ] ); |
|
43 | + add_action( 'admin_menu', [ $this, 'registerSetting' ] ); |
|
44 | + add_action( 'current_screen', [ $this, 'resetPage' ] ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | __( 'Pollux', 'pollux' ), |
66 | 66 | 'manage_options', |
67 | 67 | $this->app->id, |
68 | - [$this, 'renderPage'] |
|
68 | + [ $this, 'renderPage' ] |
|
69 | 69 | ); |
70 | 70 | } |
71 | 71 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | */ |
76 | 76 | public function registerSetting() |
77 | 77 | { |
78 | - register_setting( static::id(), static::id(), [$this, 'filterSavedSettings'] ); |
|
78 | + register_setting( static::id(), static::id(), [ $this, 'filterSavedSettings' ] ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | 'config' => $this->app->make( ConfigManager::class ), |
95 | 95 | 'heading' => __( 'Pollux Settings', 'pollux' ), |
96 | 96 | 'id' => static::id(), |
97 | - 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'options-general.php' ))), |
|
98 | - ]); |
|
97 | + 'reset_url' => esc_url( add_query_arg( $query, admin_url( 'options-general.php' ) ) ), |
|
98 | + ] ); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -107,15 +107,15 @@ discard block |
||
107 | 107 | if( filter_input( INPUT_GET, 'page' ) !== $this->app->id |
108 | 108 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
109 | 109 | )return; |
110 | - if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() )) { |
|
110 | + if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() ) ) { |
|
111 | 111 | delete_option( static::id() ); |
112 | 112 | add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' ); |
113 | 113 | } |
114 | 114 | else { |
115 | - add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' )); |
|
115 | + add_settings_error( static::id(), 'failed', __( 'Failed to reset. Please try again.', 'pollux' ) ); |
|
116 | 116 | } |
117 | 117 | set_transient( 'settings_errors', get_settings_errors(), 30 ); |
118 | - wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() )); |
|
118 | + wp_safe_redirect( add_query_arg( 'settings-updated', 'true', wp_get_referer() ) ); |
|
119 | 119 | exit; |
120 | 120 | } |
121 | 121 | } |
@@ -24,22 +24,22 @@ discard block |
||
24 | 24 | /** |
25 | 25 | * @var array |
26 | 26 | */ |
27 | - public $metaboxes = []; |
|
27 | + public $metaboxes = [ ]; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * {@inheritdoc} |
31 | 31 | */ |
32 | 32 | public function init() |
33 | 33 | { |
34 | - if( empty( $this->app->config->{static::ID} ))return; |
|
34 | + if( empty( $this->app->config->{static::ID} ) )return; |
|
35 | 35 | |
36 | 36 | $this->normalize( $this->app->config->{static::ID}, [ |
37 | - 'post_types' => [], |
|
38 | - ]); |
|
37 | + 'post_types' => [ ], |
|
38 | + ] ); |
|
39 | 39 | |
40 | - add_filter( 'rwmb_show', [$this, 'show'], 10, 2 ); |
|
41 | - add_filter( 'rwmb_meta_boxes', [$this, 'register'] ); |
|
42 | - add_filter( 'rwmb_outer_html', [$this, 'renderField'], 10, 2 ); |
|
40 | + add_filter( 'rwmb_show', [ $this, 'show' ], 10, 2 ); |
|
41 | + add_filter( 'rwmb_meta_boxes', [ $this, 'register' ] ); |
|
42 | + add_filter( 'rwmb_outer_html', [ $this, 'renderField' ], 10, 2 ); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | { |
73 | 73 | return PostMeta::get( $key, [ |
74 | 74 | 'id' => $this->getPostId(), |
75 | - ]); |
|
75 | + ] ); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -81,15 +81,15 @@ discard block |
||
81 | 81 | */ |
82 | 82 | public function register() |
83 | 83 | { |
84 | - if( current_user_can( 'switch_themes' )) { |
|
84 | + if( current_user_can( 'switch_themes' ) ) { |
|
85 | 85 | $instructions = $this->initInstructions(); |
86 | - if( is_array( $instructions )) { |
|
86 | + if( is_array( $instructions ) ) { |
|
87 | 87 | $this->normalize( $instructions ); |
88 | 88 | } |
89 | 89 | } |
90 | 90 | $metaboxes = func_num_args() |
91 | - ? ( new Helper )->toArray( func_get_arg(0) ) |
|
92 | - : []; |
|
91 | + ? ( new Helper )->toArray( func_get_arg( 0 ) ) |
|
92 | + : [ ]; |
|
93 | 93 | return array_merge( $metaboxes, $this->metaboxes ); |
94 | 94 | } |
95 | 95 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function renderField( $html, $field ) |
101 | 101 | { |
102 | - return $this->validate( $field['condition'] ) |
|
102 | + return $this->validate( $field[ 'condition' ] ) |
|
103 | 103 | ? $html |
104 | 104 | : ''; |
105 | 105 | } |
@@ -111,11 +111,11 @@ discard block |
||
111 | 111 | public function show( $bool, array $metabox ) |
112 | 112 | { |
113 | 113 | if( defined( 'DOING_AJAX' ) |
114 | - || !isset( $metabox['condition'] ) |
|
115 | - || !$this->hasPostType( $metabox )) { |
|
114 | + || !isset( $metabox[ 'condition' ] ) |
|
115 | + || !$this->hasPostType( $metabox ) ) { |
|
116 | 116 | return $bool; |
117 | 117 | } |
118 | - return $this->validate( $metabox['condition'] ); |
|
118 | + return $this->validate( $metabox[ 'condition' ] ); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | */ |
124 | 124 | protected function getPostId() |
125 | 125 | { |
126 | - if( !( $postId = filter_input( INPUT_GET, 'post' ))) { |
|
126 | + if( !( $postId = filter_input( INPUT_GET, 'post' ) ) ) { |
|
127 | 127 | $postId = filter_input( INPUT_POST, 'post_ID' ); |
128 | 128 | } |
129 | 129 | return intval( $postId ); |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | { |
137 | 137 | return array_unique( iterator_to_array( |
138 | 138 | new RecursiveIteratorIterator( |
139 | - new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' )) |
|
139 | + new RecursiveArrayIterator( array_column( $this->metaboxes, 'post_types' ) ) |
|
140 | 140 | ), |
141 | 141 | false |
142 | - )); |
|
142 | + ) ); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | /** |
@@ -147,26 +147,26 @@ discard block |
||
147 | 147 | */ |
148 | 148 | protected function hasPostType( array $metabox ) |
149 | 149 | { |
150 | - if( !isset( $metabox['post_types'] )) { |
|
150 | + if( !isset( $metabox[ 'post_types' ] ) ) { |
|
151 | 151 | return true; |
152 | 152 | } |
153 | - return in_array( get_post_type( $this->getPostId() ), $metabox['post_types'] ); |
|
153 | + return in_array( get_post_type( $this->getPostId() ), $metabox[ 'post_types' ] ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | /** |
157 | 157 | * @return void |
158 | 158 | */ |
159 | - protected function normalize( array $metaboxes, array $defaults = [] ) |
|
159 | + protected function normalize( array $metaboxes, array $defaults = [ ] ) |
|
160 | 160 | { |
161 | 161 | foreach( $metaboxes as $id => $metabox ) { |
162 | 162 | $data = wp_parse_args( $defaults, [ |
163 | - 'condition' => [], |
|
164 | - 'fields' => [], |
|
163 | + 'condition' => [ ], |
|
164 | + 'fields' => [ ], |
|
165 | 165 | 'id' => $id, |
166 | 166 | 'slug' => $id, |
167 | - 'validation' => [], |
|
168 | - ]); |
|
169 | - $this->metaboxes[] = $this->setDependencies( |
|
167 | + 'validation' => [ ], |
|
168 | + ] ); |
|
169 | + $this->metaboxes[ ] = $this->setDependencies( |
|
170 | 170 | $this->normalizeThis( $metabox, $data, $id ) |
171 | 171 | ); |
172 | 172 | } |
@@ -200,10 +200,10 @@ discard block |
||
200 | 200 | protected function normalizeFields( array $fields, array $data, $parentId ) |
201 | 201 | { |
202 | 202 | return array_map( function( $id, $field ) use( $parentId ) { |
203 | - $defaults = [ |
|
204 | - 'attributes' => [], |
|
203 | + $defaults = [ |
|
204 | + 'attributes' => [ ], |
|
205 | 205 | 'class' => '', |
206 | - 'condition' => [], |
|
206 | + 'condition' => [ ], |
|
207 | 207 | 'depends' => '', |
208 | 208 | 'field_name' => $id, |
209 | 209 | 'id' => $id, |
@@ -237,11 +237,11 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function normalizeValidation( array $validation, array $data, $parentId ) |
239 | 239 | { |
240 | - foreach( ['messages', 'rules'] as $key ) { |
|
241 | - if( empty( $validation[$key] ))continue; |
|
242 | - foreach( $validation[$key] as $id => $value ) { |
|
243 | - $validation[$key][$this->normalizeFieldName( $id, ['slug' => $id], $parentId )] = $value; |
|
244 | - unset( $validation[$key][$id] ); |
|
240 | + foreach( [ 'messages', 'rules' ] as $key ) { |
|
241 | + if( empty( $validation[ $key ] ) )continue; |
|
242 | + foreach( $validation[ $key ] as $id => $value ) { |
|
243 | + $validation[ $key ][ $this->normalizeFieldName( $id, [ 'slug' => $id ], $parentId ) ] = $value; |
|
244 | + unset( $validation[ $key ][ $id ] ); |
|
245 | 245 | } |
246 | 246 | } |
247 | 247 | return $validation; |
@@ -252,14 +252,14 @@ discard block |
||
252 | 252 | */ |
253 | 253 | protected function setDependencies( array $metabox ) |
254 | 254 | { |
255 | - $fields = &$metabox['fields']; |
|
255 | + $fields = &$metabox[ 'fields' ]; |
|
256 | 256 | $depends = array_column( $fields, 'depends' ); |
257 | 257 | array_walk( $depends, function( $value, $index ) use( &$fields, $metabox ) { |
258 | - if( empty( $value ))return; |
|
259 | - $dependency = array_search( $value, array_column( $fields, 'id' )); |
|
260 | - $fields[$index]['attributes']['data-depends'] = $value; |
|
261 | - if( !$this->getMetaValue( $fields[$dependency]['slug'], '', $metabox['slug'] )) { |
|
262 | - $fields[$index]['class'] = trim( 'hidden ' . $fields[$index]['class'] ); |
|
258 | + if( empty( $value ) )return; |
|
259 | + $dependency = array_search( $value, array_column( $fields, 'id' ) ); |
|
260 | + $fields[ $index ][ 'attributes' ][ 'data-depends' ] = $value; |
|
261 | + if( !$this->getMetaValue( $fields[ $dependency ][ 'slug' ], '', $metabox[ 'slug' ] ) ) { |
|
262 | + $fields[ $index ][ 'class' ] = trim( 'hidden ' . $fields[ $index ][ 'class' ] ); |
|
263 | 263 | } |
264 | 264 | }); |
265 | 265 | return $metabox; |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -if( !function_exists( 'pollux_app' )) { |
|
3 | +if( !function_exists( 'pollux_app' ) ) { |
|
4 | 4 | function pollux_app() { |
5 | 5 | return GeminiLabs\Pollux\Application::getInstance(); |
6 | 6 | } |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | /** |
11 | 11 | * @var array |
12 | 12 | */ |
13 | - public $columns = []; |
|
13 | + public $columns = [ ]; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * @var array |
17 | 17 | */ |
18 | - public $types = []; |
|
18 | + public $types = [ ]; |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @var Application |
@@ -28,10 +28,10 @@ discard block |
||
28 | 28 | public function initColumns() |
29 | 29 | { |
30 | 30 | foreach( $this->types as $type => $args ) { |
31 | - add_action( "manage_{$type}_posts_custom_column", [$this, 'printColumnValue'], 10, 2 ); |
|
31 | + add_action( "manage_{$type}_posts_custom_column", [ $this, 'printColumnValue' ], 10, 2 ); |
|
32 | 32 | add_filter( "manage_{$type}_posts_columns", function( $columns ) use( $args ) { |
33 | - return count( $args['columns'] ) > 1 |
|
34 | - ? $args['columns'] |
|
33 | + return count( $args[ 'columns' ] ) > 1 |
|
34 | + ? $args[ 'columns' ] |
|
35 | 35 | : $columns; |
36 | 36 | }); |
37 | 37 | } |
@@ -58,10 +58,10 @@ discard block |
||
58 | 58 | protected function getColumnImage( $postId ) |
59 | 59 | { |
60 | 60 | if( has_post_thumbnail( $postId ) ) { |
61 | - list( $src, $width, $height ) = wp_get_attachment_image_src( get_post_thumbnail_id( $postId ), [96, 48] ); |
|
61 | + list( $src, $width, $height ) = wp_get_attachment_image_src( get_post_thumbnail_id( $postId ), [ 96, 48 ] ); |
|
62 | 62 | $image = sprintf( '<img src="%s" alt="%s" width="%s" height="%s">', |
63 | - esc_url( set_url_scheme( $src )), |
|
64 | - esc_attr( get_the_title( $postId )), |
|
63 | + esc_url( set_url_scheme( $src ) ), |
|
64 | + esc_attr( get_the_title( $postId ) ), |
|
65 | 65 | $width, |
66 | 66 | $height |
67 | 67 | ); |
@@ -77,9 +77,9 @@ discard block |
||
77 | 77 | protected function getColumnMedia() |
78 | 78 | { |
79 | 79 | return count( PostMeta::get( 'media', [ |
80 | - 'fallback' => [], |
|
80 | + 'fallback' => [ ], |
|
81 | 81 | 'single' => false, |
82 | - ])); |
|
82 | + ] ) ); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | protected function normalizeColumns( array $columns ) |
98 | 98 | { |
99 | 99 | $columns = array_flip( $columns ); |
100 | - $columns = array_merge( $columns, array_intersect_key( $this->columns, $columns )); |
|
101 | - return ['cb' => '<input type="checkbox">'] + $columns; |
|
100 | + $columns = array_merge( $columns, array_intersect_key( $this->columns, $columns ) ); |
|
101 | + return [ 'cb' => '<input type="checkbox">' ] + $columns; |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $defaults = [ |
110 | 110 | 'author' => __( 'Author', 'pollux' ), |
111 | 111 | 'categories' => __( 'Categories', 'pollux' ), |
112 | - 'comments' => sprintf( '<span class="vers comment-grey-bubble" title="%1$s"><span class="screen-reader-text">%1$s</span></span>', __( 'Comments', 'pollux' )), |
|
112 | + 'comments' => sprintf( '<span class="vers comment-grey-bubble" title="%1$s"><span class="screen-reader-text">%1$s</span></span>', __( 'Comments', 'pollux' ) ), |
|
113 | 113 | 'date' => __( 'Date', 'pollux' ), |
114 | 114 | 'image' => __( 'Image', 'pollux' ), |
115 | 115 | 'media' => __( 'Media', 'pollux' ), |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | { |
47 | 47 | $yamlFile = $this->getYamlFile(); |
48 | 48 | $yaml = $this->normalize( |
49 | - $this->parseYaml( file_get_contents( $yamlFile )) |
|
49 | + $this->parseYaml( file_get_contents( $yamlFile ) ) |
|
50 | 50 | ); |
51 | - if( !$yaml['disable_config'] ) { |
|
51 | + if( !$yaml[ 'disable_config' ] ) { |
|
52 | 52 | $config = $this->normalizeArray( |
53 | - array_filter( (array) get_option( Config::id(), [] )) |
|
53 | + array_filter( (array) get_option( Config::id(), [ ] ) ) |
|
54 | 54 | ); |
55 | 55 | } |
56 | 56 | return empty( $config ) |
57 | - ? $this->setTimestamp( $yaml, filemtime( $yamlFile )) |
|
57 | + ? $this->setTimestamp( $yaml, filemtime( $yamlFile ) ) |
|
58 | 58 | : $this->normalize( $config ); |
59 | 59 | } |
60 | 60 | |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | public function compile() |
65 | 65 | { |
66 | 66 | $configFile = $this->getCompileDestination(); |
67 | - if( $this->shouldCompile( $configFile )) { |
|
67 | + if( $this->shouldCompile( $configFile ) ) { |
|
68 | 68 | file_put_contents( $configFile, sprintf( '<?php // DO NOT MODIFY THIS FILE DIRECTLY!%sreturn (object) %s;', |
69 | 69 | PHP_EOL, |
70 | - $this->parseRawStrings( var_export( $this->setTimestamp( $this->options ), true )) |
|
71 | - )); |
|
70 | + $this->parseRawStrings( var_export( $this->setTimestamp( $this->options ), true ) ) |
|
71 | + ) ); |
|
72 | 72 | } |
73 | 73 | return include $configFile; |
74 | 74 | } |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | public function convertArrayToYaml( array $array ) |
80 | 80 | { |
81 | 81 | return !empty( $array ) |
82 | - ? trim( $this->parseRawStrings( $this->dumpYaml( $array ))) |
|
82 | + ? trim( $this->parseRawStrings( $this->dumpYaml( $array ) ) ) |
|
83 | 83 | : ''; |
84 | 84 | } |
85 | 85 | |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | trailingslashit( trailingslashit( $theme->theme_root ) . $theme->template ), |
107 | 107 | trailingslashit( WP_CONTENT_DIR ), |
108 | 108 | trailingslashit( ABSPATH ), |
109 | - trailingslashit( dirname( ABSPATH )), |
|
110 | - trailingslashit( dirname( dirname( ABSPATH ))), |
|
111 | - ]); |
|
109 | + trailingslashit( dirname( ABSPATH ) ), |
|
110 | + trailingslashit( dirname( dirname( ABSPATH ) ) ), |
|
111 | + ] ); |
|
112 | 112 | foreach( (array) $configLocations as $location ) { |
113 | - if( !file_exists( $location . $configYaml ))continue; |
|
113 | + if( !file_exists( $location . $configYaml ) )continue; |
|
114 | 114 | return $location . $configYaml; |
115 | 115 | } |
116 | 116 | return $this->app->path( 'defaults.yml' ); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | public function setTimestamp( array $config, $timestamp = null ) |
147 | 147 | { |
148 | 148 | $timestamp || $timestamp = time(); |
149 | - $config['updated'] = $timestamp; |
|
149 | + $config[ 'updated' ] = $timestamp; |
|
150 | 150 | return $config; |
151 | 151 | } |
152 | 152 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | return Yaml::dump( $array, 13, 2 ); |
168 | 168 | } |
169 | 169 | catch( DumpException $e ) { |
170 | - error_log( print_r( $e->getMessage(), 1 )); |
|
170 | + error_log( print_r( $e->getMessage(), 1 ) ); |
|
171 | 171 | } |
172 | 172 | } |
173 | 173 | |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | { |
179 | 179 | return wp_parse_args( |
180 | 180 | $config, |
181 | - $this->parseYaml( file_get_contents( $this->app->path( 'defaults.yml' ))) |
|
181 | + $this->parseYaml( file_get_contents( $this->app->path( 'defaults.yml' ) ) ) |
|
182 | 182 | ); |
183 | 183 | } |
184 | 184 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $pattern = '/(\')((' . implode( '|', $strings ) . ')\(?.+\))(\')/'; |
193 | 193 | return stripslashes( |
194 | 194 | preg_replace_callback( $pattern, function( $matches ) { |
195 | - return str_replace( "''", "'", $matches[2] ); |
|
195 | + return str_replace( "''", "'", $matches[ 2 ] ); |
|
196 | 196 | }, $configString ) |
197 | 197 | ); |
198 | 198 | } |
@@ -207,10 +207,10 @@ discard block |
||
207 | 207 | } |
208 | 208 | catch( ParseException $e ) { |
209 | 209 | // http://api.symfony.com/3.2/Symfony/Component/Yaml/Exception/ParseException.html |
210 | - error_log( print_r( sprintf( 'Unable to parse the YAML string: %s', $e->getMessage() ), 1 )); |
|
211 | - error_log( print_r( $e->getParsedFile(), 1 )); |
|
212 | - error_log( print_r( $e->getParsedLine(), 1 )); |
|
213 | - error_log( print_r( $e->getSnippet(), 1 )); |
|
210 | + error_log( print_r( sprintf( 'Unable to parse the YAML string: %s', $e->getMessage() ), 1 ) ); |
|
211 | + error_log( print_r( $e->getParsedFile(), 1 ) ); |
|
212 | + error_log( print_r( $e->getParsedLine(), 1 ) ); |
|
213 | + error_log( print_r( $e->getSnippet(), 1 ) ); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 | |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function shouldCompile( $configFile ) |
222 | 222 | { |
223 | - if( !file_exists( $configFile )) { |
|
223 | + if( !file_exists( $configFile ) ) { |
|
224 | 224 | return true; |
225 | 225 | } |
226 | 226 | $config = include $configFile; |