Skip to content

Commit

Permalink
Update dependency wp-coding-standards/wpcs to v3 (#32608)
Browse files Browse the repository at this point in the history
* Update dependency wp-coding-standards/wpcs to v3
* Remove hacks to allow package to update correctly
  And bump `automattic/vipwpcs` too.
* Update change entry, should be a major version bump
* Fix codesniffer tests
* Remove MediaWiki.WhiteSpace.SpaceAfterClosure
  Squiz.Functions.MultiLineFunctionDeclaration catches the same thing and more.
* Exclude WordPress.Security.EscapeOutput.ExceptionNotEscaped
* Fix sniffs:
  * PSR2.Classes.ClassDeclaration.CloseBraceAfterBody
  * PSR2.Classes.ClassDeclaration.ExtendsLine
  * PSR2.Classes.ClassDeclaration.ImplementsLine
  * PSR2.Classes.ClassDeclaration.SpaceAfterKeyword
  * PSR2.Classes.ClassDeclaration.SpaceAfterName
  * PSR2.Classes.ClassDeclaration.SpaceBeforeExtends
  * PSR2.Files.EndFileNewline
    (plus a few PSR2.Methods.FunctionClosingBrace)
  * PSR12.Files.FileHeader.IncorrectOrder
    (which seems easily confused)
  * Squiz.Functions.MultiLineFunctionDeclaration
  * Universal.CodeAnalysis.NoEchoSprintf
  * Universal.Namespaces.DisallowCurlyBraceSyntax.Forbidden
  * Universal.UseStatements.NoLeadingBackslash
  * Universal.UseStatements.NoUselessAliases
    (plus some resulting MediaWiki.Classes.UnusedUseStatement.UnnecessaryUse)
  * Universal.WhiteSpace.CommaSpacing
  * WordPress.Security.EscapeOutput.HeredocOutputNotEscaped
  * WordPress.Security.EscapeOutput.OutputNotEscaped
  * WordPress.WP.DeprecatedParameters
  * WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition → Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
  * WordPress.WP.CapitalPDangit.Misspelled → .MisspelledInText or .MisspelledInComment
  * Ignore all existing WordPress.Files.FileName.NotHyphenatedLowercase
* Work around a WPCS bug.

---------

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Brad Jorsch <brad.jorsch@automattic.com>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6188964767
  • Loading branch information
anomiex authored and matticbot committed Sep 14, 2023
1 parent 1873820 commit 961b020
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 19 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-admin-ui": "^0.2.23-alpha",
"automattic/jetpack-assets": "^1.18.10",
"automattic/jetpack-connection": "^1.57.4",
"automattic/jetpack-jitm": "^2.3.18",
"automattic/jetpack-licensing": "^1.8.3",
"automattic/jetpack-assets": "^1.18.11-alpha",
"automattic/jetpack-connection": "^1.57.5-alpha",
"automattic/jetpack-jitm": "^2.3.19-alpha",
"automattic/jetpack-licensing": "^1.8.4-alpha",
"automattic/jetpack-plugins-installer": "^0.2.5",
"automattic/jetpack-redirect": "^1.7.26",
"automattic/jetpack-redirect": "^1.7.27-alpha",
"automattic/jetpack-constants": "^1.6.23"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-changelogger": "^3.3.9-alpha",
"automattic/wordbless": "@dev",
"automattic/jetpack-videopress": "^0.17.0-alpha"
},
Expand Down
7 changes: 3 additions & 4 deletions src/class-initializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

use Automattic\Jetpack\Admin_UI\Admin_Menu;
use Automattic\Jetpack\Assets;
use Automattic\Jetpack\Connection\Client as Client;
use Automattic\Jetpack\Connection\Client;
use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
use Automattic\Jetpack\Connection\Rest_Authentication as Connection_Rest_Authentication;
use Automattic\Jetpack\Constants as Jetpack_Constants;
use Automattic\Jetpack\JITMS\JITM as JITM;
use Automattic\Jetpack\JITMS\JITM;
use Automattic\Jetpack\Licensing;
use Automattic\Jetpack\Plugins_Installer;
use Automattic\Jetpack\Status as Status;
use Automattic\Jetpack\Status;
use Automattic\Jetpack\Terms_Of_Service;
use Automattic\Jetpack\Tracking;

Expand Down Expand Up @@ -345,5 +345,4 @@ public static function has_file_system_write_access() {
public static function get_idc_container_id() {
return static::IDC_CONTAINER_ID;
}

}
1 change: 0 additions & 1 deletion src/class-products.php
Original file line number Diff line number Diff line change
Expand Up @@ -180,5 +180,4 @@ public static function extend_plugins_action_links() {
$class_name::extend_plugin_action_links();
}
}

}
2 changes: 1 addition & 1 deletion src/class-rest-ai.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Automattic\Jetpack\My_Jetpack;

use Automattic\Jetpack\Connection\Client as Client;
use Automattic\Jetpack\Connection\Client;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
use Jetpack_Options;
use WP_Error;
Expand Down
2 changes: 1 addition & 1 deletion src/class-rest-purchases.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Automattic\Jetpack\My_Jetpack;

use Automattic\Jetpack\Connection\Client as Client;
use Automattic\Jetpack\Connection\Client;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/class-rest-zendesk-chat.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Automattic\Jetpack\My_Jetpack;

use Automattic\Jetpack\Connection\Client as Client;
use Automattic\Jetpack\Connection\Client;

/**
* Registers the REST routes for Zendesk Chat.
Expand Down
2 changes: 1 addition & 1 deletion src/class-wpcom-products.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Automattic\Jetpack\My_Jetpack;

use Automattic\Jetpack\Connection\Client as Client;
use Automattic\Jetpack\Connection\Client;
use Automattic\Jetpack\Status\Visitor;
use Jetpack_Options;
use WP_Error;
Expand Down
1 change: 0 additions & 1 deletion src/products/class-module-product.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,4 @@ public static function deactivate() {
}
return Jetpack::deactivate_module( static::$module_name );
}

}
1 change: 0 additions & 1 deletion src/products/class-product.php
Original file line number Diff line number Diff line change
Expand Up @@ -554,5 +554,4 @@ public static function extend_plugin_action_links() {
}
}
}

}
1 change: 0 additions & 1 deletion src/products/class-search.php
Original file line number Diff line number Diff line change
Expand Up @@ -327,5 +327,4 @@ public static function get_post_activation_url() {
public static function get_manage_url() {
return admin_url( 'admin.php?page=jetpack-search' );
}

}
1 change: 0 additions & 1 deletion src/products/class-videopress.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,4 @@ public static function get_manage_url() {
return admin_url( 'admin.php?page=jetpack#/settings?term=videopress' );
}
}

}

0 comments on commit 961b020

Please sign in to comment.