Skip to content

Commit 5a74685

Browse files
thefrostythefrosty
committed
Merge branch 'master' into issue/199
* master: PHPStan Level 6 (stuttter#221) PHPStan Level 5 (stuttter#220) Update README.md PHPStan Level 4 Compliance (stuttter#219) PHPStan Level 3 (stuttter#218) PHPStan Level 2 (stuttter#217) PHPStan Level 1 (stuttter#215) # Conflicts: # wp-multi-network/includes/classes/class-wp-ms-networks-admin.php
2 parents ab9f64d + 542d9c1 commit 5a74685

14 files changed

+231
-250
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
[![WordPress plugin](https://img.shields.io/wordpress/plugin/v/wp-multi-network.svg)](https://wordpress.org/plugins/wp-multi-network/)
44
[![WordPress](https://img.shields.io/wordpress/v/wp-multi-network.svg)](https://wordpress.org/plugins/wp-multi-network/)
5-
[![Build Status](https://api.travis-ci.org/stuttter/wp-multi-network.png?branch=master)](https://travis-ci.org/stuttter/wp-multi-network)
65
[![Latest Stable Version](https://poser.pugx.org/stuttter/wp-multi-network/version)](https://packagist.org/packages/stuttter/wp-multi-network)
76
[![License](https://poser.pugx.org/stuttter/wp-multi-network/license)](https://packagist.org/packages/stuttter/wp-multi-network)
87

‎phpstan.neon.dist‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
level: 0
2+
level: 6
33
paths:
44
- wp-multi-network/includes
55
- wpmn-loader.php
@@ -9,5 +9,9 @@ parameters:
99
#- %rootDir%/../../php-stubs/wp-cli-stubs/wp-cli-i18n-stubs.php
1010
#- %rootDir%/../../php-stubs/wp-cli-stubs/wp-cli-tools-stubs.php
1111
ignoreErrors:
12-
- '/^Call to static method encode\(\) on an unknown class Requests_IDNAEncoder.$/'
13-
12+
- '/^Call to static method encode\(\) on an unknown class Requests_IDNAEncoder\.$/'
13+
- '/^Constant WP_CONTENT_URL not found\.$/'
14+
# WP_Network::$blog_id is a private property that can be accessed via magic methods.
15+
- '/^Access to an undefined property WP_Network::\$blog_id\.$/'
16+
# WP_CLI\Fetchers\User::get() returns WP_User without root namespace.
17+
- '/^Access to property \$ID on an unknown class WP_CLI\\Fetchers\\WP_User\.$/'

‎wp-multi-network/includes/classes/class-wp-ms-network-command.php‎

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class WP_MS_Network_Command {
1717
* Default fields to display for each object.
1818
*
1919
* @since 1.3.0
20-
* @var array
20+
* @var string[]
2121
*/
2222
protected $obj_fields = array(
2323
'id',
@@ -54,11 +54,12 @@ class WP_MS_Network_Command {
5454
*
5555
* @since 1.3.0
5656
*
57-
* @param array $args Positional CLI arguments.
58-
* @param array $assoc_args Associative CLI arguments.
57+
* @param string[] $args Positional CLI arguments.
58+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
59+
* @return void
5960
*/
6061
public function create( $args, $assoc_args ) {
61-
list( $domain, $path ) = $args;
62+
[ $domain, $path ] = $args;
6263

6364
$assoc_args = wp_parse_args(
6465
$assoc_args, array(
@@ -74,7 +75,7 @@ public function create( $args, $assoc_args ) {
7475
$users = new \WP_CLI\Fetchers\User();
7576
$user = $users->get( $assoc_args['network_admin'] );
7677
if ( ! $user ) {
77-
return new WP_Error( 'network_super_admin', 'Super user does not exist.' );
78+
WP_CLI::error( 'Super user does not exist.' );
7879
}
7980
$network_admin_id = $user->ID;
8081
} else {
@@ -86,10 +87,6 @@ public function create( $args, $assoc_args ) {
8687

8788
if ( ! empty( $clone_network ) && ! get_network( $clone_network ) ) {
8889
WP_CLI::error( sprintf( "Clone network %s doesn't exist.", $clone_network ) );
89-
90-
if ( ! empty( $assoc_args['options_to_clone'] ) ) {
91-
$options_to_clone = explode( ',', $assoc_args['options_to_clone'] );
92-
}
9390
}
9491

9592
$network_id = add_network(
@@ -126,18 +123,19 @@ public function create( $args, $assoc_args ) {
126123
*
127124
* @since 1.3.0
128125
*
129-
* @param array $args Positional CLI arguments.
130-
* @param array $assoc_args Associative CLI arguments.
126+
* @param string[] $args Positional CLI arguments.
127+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
128+
* @return void
131129
*/
132130
public function update( $args, $assoc_args ) {
133-
list( $id, $domain ) = $args;
131+
[ $id, $domain ] = $args;
134132

135133
$defaults = array(
136134
'path' => '',
137135
);
138136
$assoc_args = wp_parse_args( $assoc_args, $defaults );
139137

140-
$network_id = update_network( $id, $domain, $assoc_args['path'] );
138+
$network_id = update_network( (int) $id, $domain, $assoc_args['path'] );
141139

142140
if ( is_wp_error( $network_id ) ) {
143141
WP_CLI::error( $network_id );
@@ -157,19 +155,20 @@ public function update( $args, $assoc_args ) {
157155
*
158156
* @since 1.3.0
159157
*
160-
* @param array $args Positional CLI arguments.
161-
* @param array $assoc_args Associative CLI arguments.
158+
* @param string[] $args Positional CLI arguments.
159+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
160+
* @return void
162161
*/
163162
public function delete( $args, $assoc_args ) {
164-
list( $id ) = $args;
163+
[ $id ] = $args;
165164

166165
$assoc_args = wp_parse_args(
167166
$assoc_args, array(
168167
'delete_blogs' => false,
169168
)
170169
);
171170

172-
$network_id = delete_network( $id, $assoc_args['delete_blogs'] );
171+
$network_id = delete_network( (int) $id, $assoc_args['delete_blogs'] );
173172

174173
if ( is_wp_error( $network_id ) ) {
175174
WP_CLI::error( $network_id );
@@ -191,13 +190,14 @@ public function delete( $args, $assoc_args ) {
191190
*
192191
* @since 1.3.0
193192
*
194-
* @param array $args Positional CLI arguments.
195-
* @param array $assoc_args Associative CLI arguments.
193+
* @param string[] $args Positional CLI arguments.
194+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
195+
* @return void
196196
*/
197-
public function move_site( $args, $assoc_args ) {
198-
list( $site_id, $new_network_id ) = $args;
197+
public function move_site( $args, $assoc_args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
198+
[ $site_id, $new_network_id ] = $args;
199199

200-
$network_id = move_site( $site_id, $new_network_id );
200+
$network_id = move_site( (int) $site_id, (int) $new_network_id );
201201

202202
if ( is_wp_error( $network_id ) ) {
203203
WP_CLI::error( $network_id );
@@ -227,8 +227,9 @@ public function move_site( $args, $assoc_args ) {
227227
*
228228
* @since 1.3.0
229229
*
230-
* @param array $args Positional CLI arguments.
231-
* @param array $assoc_args Associative CLI arguments.
230+
* @param string[] $args Positional CLI arguments.
231+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
232+
* @return void
232233
*/
233234
public function list_( $args, $assoc_args ) {
234235
$items = get_networks();
@@ -256,12 +257,13 @@ public function list_( $args, $assoc_args ) {
256257
*
257258
* @since 1.3.0
258259
*
259-
* @param array $args Positional CLI arguments.
260-
* @param array $assoc_args Associative CLI arguments.
260+
* @param string[] $args Positional CLI arguments.
261+
* @param array<string, mixed> $assoc_args Associative CLI arguments.
262+
* @return void
261263
*/
262264
public function plugin( $args, $assoc_args ) {
263265
$fetchers_plugin = new \WP_CLI\Fetchers\Plugin();
264-
$action = array_shift( $args );
266+
$action = array_shift( $args );
265267
if ( ! in_array( $action, array( 'activate', 'deactivate' ), true ) ) {
266268
WP_CLI::error( sprintf( '%s is not a supported action.', $action ) );
267269
}
@@ -280,7 +282,7 @@ public function plugin( $args, $assoc_args ) {
280282
if ( $all ) {
281283
$args = array_map(
282284
function ( $file ) {
283-
return \WP_CLI\Utils\get_plugin_name( $file );
285+
return \WP_CLI\Utils\get_plugin_name( $file );
284286
}, array_keys( get_plugins() )
285287
);
286288
}
@@ -310,7 +312,7 @@ function ( $file ) {
310312
if ( 'activate' === $action ) {
311313
activate_plugins( $plugin->file, '', $network_wide );
312314
} else {
313-
deactivate_plugins( $plugin->file, '', $network_wide );
315+
deactivate_plugins( $plugin->file, false, $network_wide );
314316
}
315317

316318
$this->active_output( $plugin->name, $plugin->file, $network_wide, 'activate' );
@@ -326,7 +328,7 @@ function ( $file ) {
326328
*
327329
* @since 1.3.0
328330
*
329-
* @param array $assoc_args Associative CLI arguments. Passed by reference.
331+
* @param array<string, mixed> $assoc_args Associative CLI arguments. Passed by reference.
330332
* @return WP_CLI\Formatter WP-CLI formatter instance.
331333
*/
332334
protected function get_formatter( &$assoc_args ) {
@@ -377,6 +379,7 @@ protected function get_status( $file ) {
377379
* @param string $file Plugin main file path relative to the plugins directory.
378380
* @param bool $network_wide Whether to check network-wide or not.
379381
* @param string $action Action performed.
382+
* @return void
380383
*/
381384
private function active_output( $name, $file, $network_wide, $action ) {
382385
$network_wide = $network_wide || ( is_multisite() && is_network_only_plugin( $file ) );

‎wp-multi-network/includes/classes/class-wp-ms-networks-admin-bar.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@
1717
class WP_MS_Networks_Admin_Bar {
1818

1919
/**
20-
* Constructor.
20+
* Registers WordPress hooks for the plugin.
2121
*
22-
* Hooks in the necessary methods.
22+
* Adds actions to:
23+
* - Modify the admin bar menu
24+
* - Add custom styles to the admin area
25+
* - Add custom styles to the front-end
2326
*
24-
* @since 2.2.0
27+
* @return void
2528
*/
26-
public function __construct() {
29+
public function add_hooks(): void {
2730
add_action( 'admin_bar_menu', array( $this, 'admin_bar' ), 20 );
28-
2931
add_action( 'admin_print_styles', array( $this, 'admin_print_styles' ) );
3032
add_action( 'wp_print_styles', array( $this, 'admin_print_styles' ) );
3133
}
@@ -38,6 +40,7 @@ public function __construct() {
3840
*
3941
* @since 2.2.0
4042
* @since 3.0.0 Prevent rendering of CSS if admin bar is not shown.
43+
* @return void
4144
*/
4245
public function admin_print_styles() {
4346
if ( ! is_admin_bar_showing() ) {
@@ -59,6 +62,7 @@ public function admin_print_styles() {
5962
* @since 2.2.0
6063
*
6164
* @param WP_Admin_Bar $wp_admin_bar Admin bar instance.
65+
* @return void
6266
*/
6367
public function admin_bar( $wp_admin_bar ) {
6468

0 commit comments

Comments
 (0)