diff --git a/composer.json b/composer.json index fcaab59..478d7c9 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,11 @@ "composer/installers": "^1.0 || ^2.0" }, "require-dev": { - "phpunit/phpunit": ">4.8.20 <6.0", - "squizlabs/php_codesniffer": "3.*", - "wp-coding-standards/wpcs": "^2.2", - "phpcompatibility/phpcompatibility-wp": "^2.1", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1" + "phpunit/phpunit": "^9.6.0", + "squizlabs/php_codesniffer": "^3.11.0", + "wp-coding-standards/wpcs": "^3.1.0", + "phpcompatibility/phpcompatibility-wp": "^2.1.0", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0" }, "config": { "allow-plugins": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 8fff43b..af023e8 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -18,18 +18,28 @@ - + + + + + + + + + + + + . - */node_modules/* - */tests/* + */node_modules/* + */tests/* */vendor/* - diff --git a/wp-multi-network/includes/classes/class-wp-ms-network-command.php b/wp-multi-network/includes/classes/class-wp-ms-network-command.php index 307e107..9b3b35d 100644 --- a/wp-multi-network/includes/classes/class-wp-ms-network-command.php +++ b/wp-multi-network/includes/classes/class-wp-ms-network-command.php @@ -287,7 +287,7 @@ function ( $file ) { foreach ( $this->fetcher->get_many( $args ) as $plugin ) { $status = $this->get_status( $plugin->file ); if ( $all && in_array( $status, array( 'active', 'active-network' ), true ) ) { - $needing_activation --; + --$needing_activation; continue; } diff --git a/wp-multi-network/includes/classes/class-wp-ms-networks-admin.php b/wp-multi-network/includes/classes/class-wp-ms-networks-admin.php index b605677..7d711c9 100644 --- a/wp-multi-network/includes/classes/class-wp-ms-networks-admin.php +++ b/wp-multi-network/includes/classes/class-wp-ms-networks-admin.php @@ -826,14 +826,14 @@ public function page_my_networks() { * @param string $network_actions Network action links, separated by pipe ( | ) characters. * @param WP_Network $network Current network object. */ - echo apply_filters( 'mynetworks_network_actions', $network_actions, $network ); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped + echo apply_filters( 'mynetworks_network_actions', $network_actions, $network ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>

'; } diff --git a/wp-multi-network/includes/classes/class-wp-ms-networks-capabilities.php b/wp-multi-network/includes/classes/class-wp-ms-networks-capabilities.php index 1a17df4..e52f6c9 100644 --- a/wp-multi-network/includes/classes/class-wp-ms-networks-capabilities.php +++ b/wp-multi-network/includes/classes/class-wp-ms-networks-capabilities.php @@ -36,7 +36,7 @@ public function add_hooks() { * @param array $args Additional context for the capability check. * @return array Filtered required capabilities. */ - public function map_meta_cap( $caps, $cap, $user_id, $args ) { + public function map_meta_cap( $caps, $cap, $user_id, $args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed // Map our meta capabilities to primitive capabilities first. switch ( $cap ) { diff --git a/wp-multi-network/includes/classes/class-wp-ms-networks-list-table.php b/wp-multi-network/includes/classes/class-wp-ms-networks-list-table.php index 2e29bd2..87091d1 100644 --- a/wp-multi-network/includes/classes/class-wp-ms-networks-list-table.php +++ b/wp-multi-network/includes/classes/class-wp-ms-networks-list-table.php @@ -326,8 +326,8 @@ public function column_title( $network ) { diff --git a/wp-multi-network/includes/functions.php b/wp-multi-network/includes/functions.php index 7ffe86f..f666e8b 100644 --- a/wp-multi-network/includes/functions.php +++ b/wp-multi-network/includes/functions.php @@ -586,8 +586,8 @@ function add_network( $args = array() ) { * @since 2.5.3 */ do_action( 'added_network_blog', $new_blog_id, $new_network_id, $r ); - - // add new blog id as network meta data against the new network + + // add new blog id as network meta data against the new network. $r['network_meta']['main_site'] = $new_blog_id; if ( empty( $r['network_meta']['site_name'] ) ) { diff --git a/wp-multi-network/includes/metaboxes/edit-network.php b/wp-multi-network/includes/metaboxes/edit-network.php index 63f7f9d..af37975 100644 --- a/wp-multi-network/includes/metaboxes/edit-network.php +++ b/wp-multi-network/includes/metaboxes/edit-network.php @@ -23,7 +23,7 @@ function wpmn_edit_network_details_metabox( $network = null ) { ?> - + - +
@@ -46,7 +46,7 @@ function wpmn_edit_network_details_metabox( $network = null ) {
- + - +
@@ -73,7 +73,7 @@ function wpmn_edit_network_new_site_metabox() {