@@ -14,10 +14,10 @@ discard block |
||
14 | 14 | |
15 | 15 | const TAXONOMY_DEFAULTS = [ |
16 | 16 | 'hierarchical' => true, |
17 | - 'labels' => [], |
|
17 | + 'labels' => [ ], |
|
18 | 18 | 'menu_name' => '', |
19 | 19 | 'plural' => '', |
20 | - 'post_types' => [], |
|
20 | + 'post_types' => [ ], |
|
21 | 21 | 'public' => true, |
22 | 22 | 'rewrite' => true, |
23 | 23 | 'show_admin_column' => true, |
@@ -28,20 +28,20 @@ discard block |
||
28 | 28 | /** |
29 | 29 | * @var array |
30 | 30 | */ |
31 | - public $taxonomies = []; |
|
31 | + public $taxonomies = [ ]; |
|
32 | 32 | |
33 | 33 | /** |
34 | 34 | * {@inheritdoc} |
35 | 35 | */ |
36 | 36 | public function init() |
37 | 37 | { |
38 | - if( empty( $this->app->config->taxonomies ))return; |
|
38 | + if( empty( $this->app->config->taxonomies ) )return; |
|
39 | 39 | |
40 | 40 | $this->normalize(); |
41 | 41 | |
42 | - add_action( 'restrict_manage_posts', [ $this, 'printFilters'] ); |
|
43 | - add_action( 'init', [ $this, 'register'] ); |
|
44 | - add_filter( 'parse_query', [ $this, 'filterByTaxonomy'] ); |
|
42 | + add_action( 'restrict_manage_posts', [ $this, 'printFilters' ] ); |
|
43 | + add_action( 'init', [ $this, 'register' ] ); |
|
44 | + add_filter( 'parse_query', [ $this, 'filterByTaxonomy' ] ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' )return; |
54 | 54 | $vars = &$query->query_vars; |
55 | 55 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
56 | - if( !isset( $vars[$taxonomy] ))return; |
|
57 | - if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) { |
|
58 | - $vars[$taxonomy] = $term->slug; |
|
56 | + if( !isset( $vars[ $taxonomy ] ) )return; |
|
57 | + if( $term = get_term_by( 'id', $vars[ $taxonomy ], $taxonomy ) ) { |
|
58 | + $vars[ $taxonomy ] = $term->slug; |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | return $query; |
@@ -69,18 +69,18 @@ discard block |
||
69 | 69 | { |
70 | 70 | global $wp_query; |
71 | 71 | foreach( $this->taxonomies as $taxonomy => $args ) { |
72 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
73 | - $selected = isset( $wp_query->query[$taxonomy] ) |
|
74 | - ? $wp_query->query[$taxonomy] |
|
72 | + if( !in_array( get_current_screen()->post_type, $args[ 'post_types' ] ) )continue; |
|
73 | + $selected = isset( $wp_query->query[ $taxonomy ] ) |
|
74 | + ? $wp_query->query[ $taxonomy ] |
|
75 | 75 | : false; |
76 | - wp_dropdown_categories([ |
|
76 | + wp_dropdown_categories( [ |
|
77 | 77 | 'hide_if_empty' => true, |
78 | 78 | 'name' => $taxonomy, |
79 | 79 | 'orderby' => 'name', |
80 | 80 | 'selected' => $selected, |
81 | - 'show_option_all' => $args['labels']['all_items'], |
|
81 | + 'show_option_all' => $args[ 'labels' ][ 'all_items' ], |
|
82 | 82 | 'taxonomy' => $taxonomy, |
83 | - ]); |
|
83 | + ] ); |
|
84 | 84 | } |
85 | 85 | } |
86 | 86 | |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | public function register() |
92 | 92 | { |
93 | 93 | array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
94 | - register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
|
95 | - foreach( $args['post_types'] as $type ) { |
|
94 | + register_taxonomy( $taxonomy, $args[ 'post_types' ], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ) ) ); |
|
95 | + foreach( $args[ 'post_types' ] as $type ) { |
|
96 | 96 | register_taxonomy_for_object_type( $taxonomy, $type ); |
97 | 97 | } |
98 | 98 | }); |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | protected function normalize() |
105 | 105 | { |
106 | 106 | foreach( $this->app->config->taxonomies as $taxonomy => $args ) { |
107 | - $this->taxonomies[$taxonomy] = apply_filters( 'pollux/taxonomy/args', |
|
107 | + $this->taxonomies[ $taxonomy ] = apply_filters( 'pollux/taxonomy/args', |
|
108 | 108 | $this->normalizeThis( $args, static::TAXONOMY_DEFAULTS, $taxonomy ) |
109 | 109 | ); |
110 | 110 | } |
111 | 111 | $this->taxonomies = array_diff_key( |
112 | 112 | $this->taxonomies, |
113 | - get_taxonomies( ['_builtin' => true] ) |
|
113 | + get_taxonomies( [ '_builtin' => true ] ) |
|
114 | 114 | ); |
115 | 115 | } |
116 | 116 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | protected function normalizeLabels( $labels, array $args ) |
122 | 122 | { |
123 | - return wp_parse_args( $labels, $this->setLabels( $args )); |
|
123 | + return wp_parse_args( $labels, $this->setLabels( $args ) ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | protected function normalizeMenuName( $menuname, array $args ) |
131 | 131 | { |
132 | 132 | return empty( $menuname ) |
133 | - ? $args['plural'] |
|
133 | + ? $args[ 'plural' ] |
|
134 | 134 | : $menuname; |
135 | 135 | } |
136 | 136 | |
@@ -149,17 +149,17 @@ discard block |
||
149 | 149 | protected function setLabels( array $args ) |
150 | 150 | { |
151 | 151 | return apply_filters( 'pollux/taxonomy/labels', [ |
152 | - 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args['single'] ), |
|
153 | - 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args['plural'] ), |
|
154 | - 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args['single'] ), |
|
155 | - 'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ), |
|
156 | - 'name' => $args['plural'], |
|
157 | - 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args['single'] ), |
|
158 | - 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args['plural'] ), |
|
159 | - 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args['plural'] ), |
|
160 | - 'singular_name' => $args['single'], |
|
161 | - 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args['single'] ), |
|
162 | - 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args['single'] ), |
|
152 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
153 | + 'all_items' => sprintf( _x( 'All %s', 'All taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
154 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
155 | + 'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ), |
|
156 | + 'name' => $args[ 'plural' ], |
|
157 | + 'new_item_name' => sprintf( _x( 'New %s Name', 'New taxonomy name', 'pollux' ), $args[ 'single' ] ), |
|
158 | + 'not_found' => sprintf( _x( 'No %s found', 'No taxonomies found', 'pollux' ), $args[ 'plural' ] ), |
|
159 | + 'search_items' => sprintf( _x( 'Search %s', 'Search taxonomies', 'pollux' ), $args[ 'plural' ] ), |
|
160 | + 'singular_name' => $args[ 'single' ], |
|
161 | + 'update_item' => sprintf( _x( 'Update %s', 'Update taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
162 | + 'view_item' => sprintf( _x( 'View %s', 'View taxonomy', 'pollux' ), $args[ 'single' ] ), |
|
163 | 163 | ], $args ); |
164 | 164 | } |
165 | 165 | } |
@@ -35,7 +35,9 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function init() |
37 | 37 | { |
38 | - if( empty( $this->app->config->taxonomies ))return; |
|
38 | + if( empty( $this->app->config->taxonomies )) { |
|
39 | + return; |
|
40 | + } |
|
39 | 41 | |
40 | 42 | $this->normalize(); |
41 | 43 | |
@@ -50,10 +52,14 @@ discard block |
||
50 | 52 | */ |
51 | 53 | public function filterByTaxonomy( WP_Query $query ) |
52 | 54 | { |
53 | - if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' )return; |
|
55 | + if( !is_admin() || ( new Helper )->getCurrentScreen()->base != 'edit' ) { |
|
56 | + return; |
|
57 | + } |
|
54 | 58 | $vars = &$query->query_vars; |
55 | 59 | foreach( array_keys( $this->taxonomies ) as $taxonomy ) { |
56 | - if( !isset( $vars[$taxonomy] ))return; |
|
60 | + if( !isset( $vars[$taxonomy] )) { |
|
61 | + return; |
|
62 | + } |
|
57 | 63 | if( $term = get_term_by( 'id', $vars[$taxonomy], $taxonomy )) { |
58 | 64 | $vars[$taxonomy] = $term->slug; |
59 | 65 | } |
@@ -69,7 +75,9 @@ discard block |
||
69 | 75 | { |
70 | 76 | global $wp_query; |
71 | 77 | foreach( $this->taxonomies as $taxonomy => $args ) { |
72 | - if( !in_array( get_current_screen()->post_type, $args['post_types'] ))continue; |
|
78 | + if( !in_array( get_current_screen()->post_type, $args['post_types'] )) { |
|
79 | + continue; |
|
80 | + } |
|
73 | 81 | $selected = isset( $wp_query->query[$taxonomy] ) |
74 | 82 | ? $wp_query->query[$taxonomy] |
75 | 83 | : false; |
@@ -90,7 +98,8 @@ discard block |
||
90 | 98 | */ |
91 | 99 | public function register() |
92 | 100 | { |
93 | - array_walk( $this->taxonomies, function( $args, $taxonomy ) { |
|
101 | + array_walk( $this->taxonomies, function( $args, $taxonomy ) |
|
102 | + { |
|
94 | 103 | register_taxonomy( $taxonomy, $args['post_types'], array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
95 | 104 | foreach( $args['post_types'] as $type ) { |
96 | 105 | register_taxonomy_for_object_type( $taxonomy, $type ); |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | |
16 | 16 | const POST_TYPE_DEFAULTS = [ |
17 | 17 | 'capability_type' => 'post', |
18 | - 'columns' => [], |
|
18 | + 'columns' => [ ], |
|
19 | 19 | 'has_archive' => false, |
20 | 20 | 'hierarchical' => false, |
21 | - 'labels' => [], |
|
21 | + 'labels' => [ ], |
|
22 | 22 | 'map_meta_cap' => true, |
23 | 23 | 'menu_icon' => null, |
24 | 24 | 'menu_name' => '', |
@@ -31,27 +31,27 @@ discard block |
||
31 | 31 | 'show_ui' => true, |
32 | 32 | 'single' => '', |
33 | 33 | 'slug' => '', |
34 | - 'supports' => ['title', 'editor', 'thumbnail'], |
|
35 | - 'taxonomies' => [], |
|
34 | + 'supports' => [ 'title', 'editor', 'thumbnail' ], |
|
35 | + 'taxonomies' => [ ], |
|
36 | 36 | ]; |
37 | 37 | |
38 | 38 | /** |
39 | 39 | * @var array |
40 | 40 | */ |
41 | - public $types = []; |
|
41 | + public $types = [ ]; |
|
42 | 42 | |
43 | 43 | /** |
44 | 44 | * {@inheritdoc} |
45 | 45 | */ |
46 | 46 | public function init() |
47 | 47 | { |
48 | - if( empty( $this->app->config->post_types ))return; |
|
48 | + if( empty( $this->app->config->post_types ) )return; |
|
49 | 49 | |
50 | 50 | $this->setColumns(); |
51 | 51 | $this->normalize(); |
52 | 52 | $this->initColumns(); |
53 | 53 | |
54 | - add_action( 'init', [$this, 'register'] ); |
|
54 | + add_action( 'init', [ $this, 'register' ] ); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | /** |
@@ -62,10 +62,10 @@ discard block |
||
62 | 62 | { |
63 | 63 | $types = array_diff_key( |
64 | 64 | $this->types, |
65 | - get_post_types( ['_builtin' => true] ) |
|
65 | + get_post_types( [ '_builtin' => true ] ) |
|
66 | 66 | ); |
67 | 67 | array_walk( $types, function( $args, $type ) { |
68 | - register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
|
68 | + register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ) ) ); |
|
69 | 69 | }); |
70 | 70 | } |
71 | 71 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | protected function normalize() |
76 | 76 | { |
77 | 77 | foreach( $this->app->config->post_types as $type => $args ) { |
78 | - $this->types[$type] = apply_filters( 'pollux/post_type/args', |
|
78 | + $this->types[ $type ] = apply_filters( 'pollux/post_type/args', |
|
79 | 79 | $this->normalizeThis( $args, static::POST_TYPE_DEFAULTS, $type ), |
80 | 80 | $type |
81 | 81 | ); |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | */ |
89 | 89 | protected function normalizeLabels( $labels, array $args ) |
90 | 90 | { |
91 | - return wp_parse_args( $labels, $this->setLabels( $args )); |
|
91 | + return wp_parse_args( $labels, $this->setLabels( $args ) ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | protected function normalizeMenuName( $menuname, array $args ) |
99 | 99 | { |
100 | 100 | return empty( $menuname ) |
101 | - ? $args['plural'] |
|
101 | + ? $args[ 'plural' ] |
|
102 | 102 | : $menuname; |
103 | 103 | } |
104 | 104 | |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | protected function normalizeRewrite( $rewrite, array $args ) |
110 | 110 | { |
111 | 111 | if( $rewrite === true ) { |
112 | - $slug = empty( $args['slug'] ) |
|
113 | - ? sanitize_title( $args['plural'] ) |
|
114 | - : $args['slug']; |
|
115 | - $rewrite = ['slug' => $slug, 'with_front' => false]; |
|
112 | + $slug = empty( $args[ 'slug' ] ) |
|
113 | + ? sanitize_title( $args[ 'plural' ] ) |
|
114 | + : $args[ 'slug' ]; |
|
115 | + $rewrite = [ 'slug' => $slug, 'with_front' => false ]; |
|
116 | 116 | } |
117 | 117 | return $rewrite; |
118 | 118 | } |
@@ -124,17 +124,17 @@ discard block |
||
124 | 124 | { |
125 | 125 | return apply_filters( 'pollux/post_type/labels', [ |
126 | 126 | 'add_new' => __( 'Add New', 'pollux' ), |
127 | - 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new post', 'pollux' ), $args['single'] ), |
|
128 | - 'all_items' => sprintf( _x( 'All %s', 'All posts', 'pollux' ), $args['plural'] ), |
|
129 | - 'edit_item' => sprintf( _x( 'Edit %s', 'Edit post', 'pollux' ), $args['single'] ), |
|
130 | - 'menu_name' => $this->normalizeMenuName( $args['menu_name'], $args ), |
|
131 | - 'name' => $args['plural'], |
|
132 | - 'new_item' => sprintf( _x( 'New %s', 'New post', 'pollux' ), $args['single'] ), |
|
133 | - 'not_found' => sprintf( _x( 'No %s found', 'No posts found', 'pollux' ), $args['plural'] ), |
|
134 | - 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No posts found in trash', 'pollux' ), $args['plural'] ), |
|
135 | - 'search_items' => sprintf( _x( 'Search %s', 'Search posts', 'pollux' ), $args['plural'] ), |
|
136 | - 'singular_name' => $args['single'], |
|
137 | - 'view_item' => sprintf( _x( 'View %s', 'View post', 'pollux' ), $args['single'] ), |
|
127 | + 'add_new_item' => sprintf( _x( 'Add New %s', 'Add new post', 'pollux' ), $args[ 'single' ] ), |
|
128 | + 'all_items' => sprintf( _x( 'All %s', 'All posts', 'pollux' ), $args[ 'plural' ] ), |
|
129 | + 'edit_item' => sprintf( _x( 'Edit %s', 'Edit post', 'pollux' ), $args[ 'single' ] ), |
|
130 | + 'menu_name' => $this->normalizeMenuName( $args[ 'menu_name' ], $args ), |
|
131 | + 'name' => $args[ 'plural' ], |
|
132 | + 'new_item' => sprintf( _x( 'New %s', 'New post', 'pollux' ), $args[ 'single' ] ), |
|
133 | + 'not_found' => sprintf( _x( 'No %s found', 'No posts found', 'pollux' ), $args[ 'plural' ] ), |
|
134 | + 'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No posts found in trash', 'pollux' ), $args[ 'plural' ] ), |
|
135 | + 'search_items' => sprintf( _x( 'Search %s', 'Search posts', 'pollux' ), $args[ 'plural' ] ), |
|
136 | + 'singular_name' => $args[ 'single' ], |
|
137 | + 'view_item' => sprintf( _x( 'View %s', 'View post', 'pollux' ), $args[ 'single' ] ), |
|
138 | 138 | ], $args ); |
139 | 139 | } |
140 | 140 | } |
@@ -45,7 +45,9 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function init() |
47 | 47 | { |
48 | - if( empty( $this->app->config->post_types ))return; |
|
48 | + if( empty( $this->app->config->post_types )) { |
|
49 | + return; |
|
50 | + } |
|
49 | 51 | |
50 | 52 | $this->setColumns(); |
51 | 53 | $this->normalize(); |
@@ -64,7 +66,8 @@ discard block |
||
64 | 66 | $this->types, |
65 | 67 | get_post_types( ['_builtin' => true] ) |
66 | 68 | ); |
67 | - array_walk( $types, function( $args, $type ) { |
|
69 | + array_walk( $types, function( $args, $type ) |
|
70 | + { |
|
68 | 71 | register_post_type( $type, array_diff_key( $args, array_flip( static::CUSTOM_KEYS ))); |
69 | 72 | }); |
70 | 73 | } |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | { |
26 | 26 | if( !$this->app->config->disable_posts )return; |
27 | 27 | |
28 | - add_action( 'init', [$this, 'disable'] ); |
|
29 | - add_action( 'wp_dashboard_setup', [$this, 'modifyDashboardWidgets'] ); |
|
30 | - add_action( 'admin_bar_menu', [$this, 'removeFromAdminBar'], 999 ); |
|
31 | - add_action( 'admin_menu', [$this, 'removeFromAdminMenu'] ); |
|
32 | - add_action( 'wp_dashboard_setup', [$this, 'unregisterDashboardWidgets'] ); |
|
33 | - add_action( 'widgets_init', [$this, 'unregisterWidgets'], 1 ); |
|
34 | - add_filter( 'posts_results', [$this, 'filterPostQuery'] ); |
|
35 | - add_filter( 'pre_get_posts', [$this, 'filterSearchQuery'] ); |
|
28 | + add_action( 'init', [ $this, 'disable' ] ); |
|
29 | + add_action( 'wp_dashboard_setup', [ $this, 'modifyDashboardWidgets' ] ); |
|
30 | + add_action( 'admin_bar_menu', [ $this, 'removeFromAdminBar' ], 999 ); |
|
31 | + add_action( 'admin_menu', [ $this, 'removeFromAdminMenu' ] ); |
|
32 | + add_action( 'wp_dashboard_setup', [ $this, 'unregisterDashboardWidgets' ] ); |
|
33 | + add_action( 'widgets_init', [ $this, 'unregisterWidgets' ], 1 ); |
|
34 | + add_filter( 'posts_results', [ $this, 'filterPostQuery' ] ); |
|
35 | + add_filter( 'pre_get_posts', [ $this, 'filterSearchQuery' ] ); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function disable() |
43 | 43 | { |
44 | - if( !in_array(( new Helper )->getCurrentScreen()->pagenow, [ |
|
44 | + if( !in_array( ( new Helper )->getCurrentScreen()->pagenow, [ |
|
45 | 45 | 'edit.php', 'edit-tags.php', 'post-new.php', |
46 | - ]))return; |
|
46 | + ] ) )return; |
|
47 | 47 | |
48 | 48 | if( !filter_input_array( INPUT_GET, [ |
49 | 49 | 'post_type' => FILTER_DEFAULT, |
50 | 50 | 'taxonomy' => FILTER_DEFAULT, |
51 | - ])) { |
|
51 | + ] ) ) { |
|
52 | 52 | wp_safe_redirect( get_admin_url(), 301 ); |
53 | 53 | exit; |
54 | 54 | } |
@@ -66,12 +66,12 @@ discard block |
||
66 | 66 | * @return array |
67 | 67 | * @filter posts_results |
68 | 68 | */ |
69 | - public function filterPostQuery( $posts = [] ) |
|
69 | + public function filterPostQuery( $posts = [ ] ) |
|
70 | 70 | { |
71 | 71 | global $wp_query; |
72 | 72 | return $this->isAdmin() || strpos( $wp_query->request, "wp_posts.post_type = 'post'" ) === false |
73 | 73 | ? $posts |
74 | - : []; |
|
74 | + : [ ]; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | if( $this->isAdmin() || !$query->is_main_query() || !is_search() ) { |
84 | 84 | return $query; |
85 | 85 | } |
86 | - $post_types = get_post_types( ['exclude_from_search' => false ] ); |
|
87 | - unset( $post_types['post'] ); |
|
86 | + $post_types = get_post_types( [ 'exclude_from_search' => false ] ); |
|
87 | + unset( $post_types[ 'post' ] ); |
|
88 | 88 | $query->set( 'post_type', array_values( $post_types ) ); |
89 | 89 | return $query; |
90 | 90 | } |
@@ -95,12 +95,12 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function modifyDashboardWidgets() |
97 | 97 | { |
98 | - if( !is_blog_admin() || !current_user_can( 'edit_posts' ))return; |
|
98 | + if( !is_blog_admin() || !current_user_can( 'edit_posts' ) )return; |
|
99 | 99 | |
100 | 100 | global $wp_meta_boxes; |
101 | - $widgets = &$wp_meta_boxes['dashboard']['normal']['core']; |
|
102 | - if( !isset( $widgets['dashboard_right_now']['callback'] ))return; |
|
103 | - $widgets['dashboard_right_now']['callback'] = function() { |
|
101 | + $widgets = &$wp_meta_boxes[ 'dashboard' ][ 'normal' ][ 'core' ]; |
|
102 | + if( !isset( $widgets[ 'dashboard_right_now' ][ 'callback' ] ) )return; |
|
103 | + $widgets[ 'dashboard_right_now' ][ 'callback' ] = function() { |
|
104 | 104 | ob_start(); |
105 | 105 | wp_dashboard_right_now(); |
106 | 106 | echo preg_replace( '/<li class="post-count">(.*?)<\/li>/', '', ob_get_clean() ); |
@@ -23,7 +23,9 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function init() |
25 | 25 | { |
26 | - if( !$this->app->config->disable_posts )return; |
|
26 | + if( !$this->app->config->disable_posts ) { |
|
27 | + return; |
|
28 | + } |
|
27 | 29 | |
28 | 30 | add_action( 'init', [$this, 'disable'] ); |
29 | 31 | add_action( 'wp_dashboard_setup', [$this, 'modifyDashboardWidgets'] ); |
@@ -43,7 +45,9 @@ discard block |
||
43 | 45 | { |
44 | 46 | if( !in_array(( new Helper )->getCurrentScreen()->pagenow, [ |
45 | 47 | 'edit.php', 'edit-tags.php', 'post-new.php', |
46 | - ]))return; |
|
48 | + ])) { |
|
49 | + return; |
|
50 | + } |
|
47 | 51 | |
48 | 52 | if( !filter_input_array( INPUT_GET, [ |
49 | 53 | 'post_type' => FILTER_DEFAULT, |
@@ -95,12 +99,17 @@ discard block |
||
95 | 99 | */ |
96 | 100 | public function modifyDashboardWidgets() |
97 | 101 | { |
98 | - if( !is_blog_admin() || !current_user_can( 'edit_posts' ))return; |
|
102 | + if( !is_blog_admin() || !current_user_can( 'edit_posts' )) { |
|
103 | + return; |
|
104 | + } |
|
99 | 105 | |
100 | 106 | global $wp_meta_boxes; |
101 | 107 | $widgets = &$wp_meta_boxes['dashboard']['normal']['core']; |
102 | - if( !isset( $widgets['dashboard_right_now']['callback'] ))return; |
|
103 | - $widgets['dashboard_right_now']['callback'] = function() { |
|
108 | + if( !isset( $widgets['dashboard_right_now']['callback'] )) { |
|
109 | + return; |
|
110 | + } |
|
111 | + $widgets['dashboard_right_now']['callback'] = function() |
|
112 | + { |
|
104 | 113 | ob_start(); |
105 | 114 | wp_dashboard_right_now(); |
106 | 115 | echo preg_replace( '/<li class="post-count">(.*?)<\/li>/', '', ob_get_clean() ); |
@@ -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 | } |
@@ -37,7 +37,9 @@ discard block |
||
37 | 37 | */ |
38 | 38 | public function init() |
39 | 39 | { |
40 | - if( $this->app->config->disable_config )return; |
|
40 | + if( $this->app->config->disable_config ) { |
|
41 | + return; |
|
42 | + } |
|
41 | 43 | |
42 | 44 | add_action( 'admin_menu', [$this, 'registerPage'] ); |
43 | 45 | add_action( 'admin_menu', [$this, 'registerSetting'] ); |
@@ -106,7 +108,9 @@ discard block |
||
106 | 108 | { |
107 | 109 | if( filter_input( INPUT_GET, 'page' ) !== $this->app->id |
108 | 110 | || filter_input( INPUT_GET, 'action' ) !== 'reset' |
109 | - )return; |
|
111 | + ) { |
|
112 | + return; |
|
113 | + } |
|
110 | 114 | if( wp_verify_nonce( filter_input( INPUT_GET, '_wpnonce' ), static::id() )) { |
111 | 115 | delete_option( static::id() ); |
112 | 116 | add_settings_error( static::id(), 'reset', __( 'Reset successful.', 'pollux' ), 'updated' ); |
@@ -107,7 +107,9 @@ discard block |
||
107 | 107 | trailingslashit( dirname( dirname( ABSPATH ))), |
108 | 108 | ]); |
109 | 109 | foreach( (array) $configLocations as $location ) { |
110 | - if( !file_exists( $location . $configYaml ))continue; |
|
110 | + if( !file_exists( $location . $configYaml )) { |
|
111 | + continue; |
|
112 | + } |
|
111 | 113 | return $location . $configYaml; |
112 | 114 | } |
113 | 115 | return $this->app->path( 'defaults.yml' ); |
@@ -118,7 +120,8 @@ discard block |
||
118 | 120 | */ |
119 | 121 | public function normalizeArray( array $array ) |
120 | 122 | { |
121 | - return array_map( function( $value ) { |
|
123 | + return array_map( function( $value ) |
|
124 | + { |
|
122 | 125 | return !is_numeric( $value ) && is_string( $value ) |
123 | 126 | ? $this->parseYaml( $value ) |
124 | 127 | : $value; |
@@ -130,7 +133,8 @@ discard block |
||
130 | 133 | */ |
131 | 134 | public function normalizeYamlValues( array $array ) |
132 | 135 | { |
133 | - return array_map( function( $value ) { |
|
136 | + return array_map( function( $value ) |
|
137 | + { |
|
134 | 138 | return is_array( $value ) |
135 | 139 | ? $this->convertArrayToYaml( $value ) |
136 | 140 | : $value; |
@@ -188,7 +192,8 @@ discard block |
||
188 | 192 | $strings = apply_filters( 'pollux/config/raw_strings', static::RAW_STRINGS ); |
189 | 193 | $pattern = '/(\')((' . implode( '|', $strings ) . ')\(?.+\))(\')/'; |
190 | 194 | return stripslashes( |
191 | - preg_replace_callback( $pattern, function( $matches ) { |
|
195 | + preg_replace_callback( $pattern, function( $matches ) |
|
196 | + { |
|
192 | 197 | return str_replace( "''", "'", $matches[2] ); |
193 | 198 | }, $configString ) |
194 | 199 | ); |
@@ -141,6 +141,7 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
144 | + * @param integer $timestamp |
|
144 | 145 | * @return array |
145 | 146 | */ |
146 | 147 | public function setTimestamp( array $config, $timestamp = null ) |
@@ -198,6 +199,7 @@ discard block |
||
198 | 199 | } |
199 | 200 | |
200 | 201 | /** |
202 | + * @param string $value |
|
201 | 203 | * @return mixed |
202 | 204 | */ |
203 | 205 | protected function parseYaml( $value ) |
@@ -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; |
@@ -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 | } |
@@ -1,7 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | if( !function_exists( 'pollux_app' )) { |
4 | - function pollux_app() { |
|
4 | + function pollux_app() |
|
5 | + { |
|
5 | 6 | return GeminiLabs\Pollux\Application::getInstance(); |
6 | 7 | } |
7 | 8 | } |