Skip to content

Upgrade dependencies #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JJJ merged 1 commit into from
Jan 29, 2025
Merged

Upgrade dependencies #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
18 changes: 14 additions & 4 deletions phpcs.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,28 @@
<property name="text_domain" type="array">
<element value="wp-multi-network" />
</property>
<property name="check_translator_comments" value="true" />
</properties>
</rule>
<rule ref="PHPCompatibilityWP" />
<rule ref="WordPress.WP.Capabilities">
<properties>
<property name="custom_capabilities" type="array">
<element value="create_networks" />
<element value="manage_networks" />
<element value="list_networks" />
<element value="delete_network" />
<element value="delete_networks" />
<element value="edit_network" />
</property>
</properties>
</rule>

<config name="testVersion" value="5.6-" />

<file>.</file>

<!-- Exclude directories we don't need to check. -->
<exclude-pattern>*/node_modules/*</exclude-pattern>
<exclude-pattern>*/tests/*</exclude-pattern>
<exclude-pattern>*/node_modules/*</exclude-pattern>
<exclude-pattern>*/tests/*</exclude-pattern>
<exclude-pattern>*/vendor/*</exclude-pattern>

</ruleset>
2 changes: 1 addition & 1 deletion wp-multi-network/includes/classes/class-wp-ms-network-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions wp-multi-network/includes/classes/class-wp-ms-networks-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
?>
</p>
</td>

<?php
restore_current_network();
$i++;
++$i;
}
echo '</tr>';
}
Expand Down
2 changes: 1 addition & 1 deletion wp-multi-network/includes/classes/class-wp-ms-networks-capabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down
4 changes: 2 additions & 2 deletions wp-multi-network/includes/classes/class-wp-ms-networks-list-table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ public function column_title( $network ) {

<strong>
<?php
echo $link; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo $network_states; // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
echo $link; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
echo $network_states; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
?>
</strong>

Expand Down
4 changes: 2 additions & 2 deletions wp-multi-network/includes/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] ) ) {
Expand Down
8 changes: 4 additions & 4 deletions wp-multi-network/includes/metaboxes/edit-network.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function wpmn_edit_network_details_metabox( $network = null ) {
?>

<table class="edit-network form-table">
<?php do_action('wpmn_edit_network_details_metabox_before_group', $network); ?>
<?php do_action( 'wpmn_edit_network_details_metabox_before_group', $network ); ?>

<tr class="form-field form-required">
<th scope="row">
Expand All @@ -46,7 +46,7 @@ function wpmn_edit_network_details_metabox( $network = null ) {
</td>
</tr>

<?php do_action('wpmn_edit_network_details_metabox_after_group', $network); ?>
<?php do_action( 'wpmn_edit_network_details_metabox_after_group', $network ); ?>
</table>

<?php
Expand All @@ -61,7 +61,7 @@ function wpmn_edit_network_new_site_metabox() {
?>

<table class="edit-network form-table">
<?php do_action('wpmn_edit_network_new_site_metabox_before_group'); ?>
<?php do_action( 'wpmn_edit_network_new_site_metabox_before_group' ); ?>

<tr class="form-field form-required">
<th scope="row">
Expand All @@ -73,7 +73,7 @@ function wpmn_edit_network_new_site_metabox() {
</td>
</tr>

<?php do_action('wpmn_edit_network_new_site_metabox_after_group'); ?>
<?php do_action( 'wpmn_edit_network_new_site_metabox_after_group' ); ?>
</table>

<?php
Expand Down