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 a0356a3 commit 1a022cb
Show file tree
Hide file tree
Showing 113 changed files with 539 additions and 542 deletions.
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"type": "wordpress-plugin",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-autoloader": "^2.11.22",
"automattic/jetpack-composer-plugin": "^1.1.13",
"automattic/jetpack-config": "^1.15.3",
"automattic/jetpack-connection": "^1.57.4",
"automattic/jetpack-autoloader": "^2.11.23-alpha",
"automattic/jetpack-composer-plugin": "^1.1.14-alpha",
"automattic/jetpack-config": "^1.15.4-alpha",
"automattic/jetpack-connection": "^1.57.5-alpha",
"automattic/jetpack-identity-crisis": "^0.10.5-alpha",
"automattic/jetpack-my-jetpack": "^3.5.0-alpha",
"automattic/jetpack-search": "^0.38.8-alpha",
"automattic/jetpack-stats": "^0.6.5",
"automattic/jetpack-status": "^1.18.3",
"automattic/jetpack-status": "^1.18.4-alpha",
"automattic/jetpack-sync": "^1.57.0-alpha",
"automattic/jetpack-plugins-installer": "^0.2.5"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-changelogger": "^3.3.9-alpha",
"yoast/phpunit-polyfills": "1.1.0"
},
"autoload": {
Expand Down
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-a8c-mc-stats/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.4.22-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [1.4.21] - 2023-08-23
### Changed
- Updated package dependencies. [#32605]
Expand Down Expand Up @@ -123,6 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Creates the MC Stats package

[1.4.22-alpha]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.21...v1.4.22-alpha
[1.4.21]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.20...v1.4.21
[1.4.20]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.19...v1.4.20
[1.4.19]: https://github.com/Automattic/jetpack-a8c-mc-stats/compare/v1.4.18...v1.4.19
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8"
"automattic/jetpack-changelogger": "^3.3.9-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,4 @@ public function build_stats_url( $args ) {
$url = add_query_arg( $args, $base_url );
return $url;
}

}
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-admin-ui/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"require": {},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-logo": "^1.6.2",
"automattic/jetpack-changelogger": "^3.3.9-alpha",
"automattic/jetpack-logo": "^1.6.3-alpha",
"automattic/wordbless": "dev-master"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,5 +204,4 @@ public static function get_top_level_menu_item_url( $fallback = false ) {
$url = $fallback ? $fallback : admin_url();
return $url;
}

}
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-assets/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.18.11-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [1.18.10] - 2023-09-04
### Changed
- Updated package dependencies. [#32803]
Expand Down Expand Up @@ -357,6 +361,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Statically access asset tools

[1.18.11-alpha]: https://github.com/Automattic/jetpack-assets/compare/v1.18.10...v1.18.11-alpha
[1.18.10]: https://github.com/Automattic/jetpack-assets/compare/v1.18.9...v1.18.10
[1.18.9]: https://github.com/Automattic/jetpack-assets/compare/v1.18.8...v1.18.9
[1.18.8]: https://github.com/Automattic/jetpack-assets/compare/v1.18.7...v1.18.8
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-assets/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-changelogger": "^3.3.9-alpha",
"wikimedia/testing-access-wrapper": "^1.0 || ^2.0"
},
"suggest": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,6 @@ public static function filter_load_script_translation_file( $file, $handle, $dom
}

// endregion .

}

// Enable section folding in vim:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,4 @@ public static function compare( $a, $b ) {
}
return $al - $bl;
}

}
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-config/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.15.4-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [1.15.3] - 2023-06-26
### Changed
- Blaze can now be loaded as a module, instead of relying on the Config package. [#31479]
Expand Down Expand Up @@ -184,6 +188,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Trying to add deterministic initialization.

[1.15.4-alpha]: https://github.com/Automattic/jetpack-config/compare/v1.15.3...v1.15.4-alpha
[1.15.3]: https://github.com/Automattic/jetpack-config/compare/v1.15.2...v1.15.3
[1.15.2]: https://github.com/Automattic/jetpack-config/compare/v1.15.1...v1.15.2
[1.15.1]: https://github.com/Automattic/jetpack-config/compare/v1.15.0...v1.15.1
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-config/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.8"
"automattic/jetpack-changelogger": "^3.3.9-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
7 changes: 2 additions & 5 deletions jetpack_vendor/automattic/jetpack-config/src/class-config.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
use Automattic\Jetpack\Connection\Manager;
use Automattic\Jetpack\Connection\Plugin;
use Automattic\Jetpack\Import\Main as Import_Main;
use Automattic\Jetpack\JITM as JITM;
use Automattic\Jetpack\JITMS\JITM as JITMS_JITM;
use Automattic\Jetpack\Post_List\Post_List as Post_List;
use Automattic\Jetpack\Publicize\Publicize_Setup as Publicize_Setup;
use Automattic\Jetpack\Post_List\Post_List;
use Automattic\Jetpack\Publicize\Publicize_Setup;
use Automattic\Jetpack\Search\Initializer as Jetpack_Search_Main;
use Automattic\Jetpack\Stats\Main as Stats_Main;
use Automattic\Jetpack\Stats_Admin\Main as Stats_Admin_Main;
use Automattic\Jetpack\Sync\Main as Sync_Main;
use Automattic\Jetpack\VideoPress\Initializer as VideoPress_Pkg_Initializer;
use Automattic\Jetpack\Waf\Waf_Initializer as Jetpack_Waf_Main;
use Automattic\Jetpack\WordAds\Initializer as Jetpack_WordAds_Main;
use Automattic\Jetpack\Yoast_Promo as Yoast_Promo;

/**
* The configuration class.
Expand Down Expand Up @@ -453,5 +451,4 @@ protected function set_feature_options( $feature, array $options ) {
protected function get_feature_options( $feature ) {
return empty( $this->feature_options[ $feature ] ) ? array() : $this->feature_options[ $feature ];
}

}
5 changes: 5 additions & 0 deletions jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.57.5-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [1.57.4] - 2023-09-13
### Fixed
- Use JS to check if initial state is already rendered. [#32932]
Expand Down Expand Up @@ -880,6 +884,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separate the connection library into its own package.

[1.57.5-alpha]: https://github.com/Automattic/jetpack-connection/compare/v1.57.4...v1.57.5-alpha
[1.57.4]: https://github.com/Automattic/jetpack-connection/compare/v1.57.3...v1.57.4
[1.57.3]: https://github.com/Automattic/jetpack-connection/compare/v1.57.2...v1.57.3
[1.57.2]: https://github.com/Automattic/jetpack-connection/compare/v1.57.1...v1.57.2
Expand Down
10 changes: 5 additions & 5 deletions jetpack_vendor/automattic/jetpack-connection/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-a8c-mc-stats": "^1.4.21",
"automattic/jetpack-a8c-mc-stats": "^1.4.22-alpha",
"automattic/jetpack-admin-ui": "^0.2.23-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-roles": "^1.4.24",
"automattic/jetpack-status": "^1.18.3",
"automattic/jetpack-redirect": "^1.7.26"
"automattic/jetpack-roles": "^1.4.25-alpha",
"automattic/jetpack-status": "^1.18.4-alpha",
"automattic/jetpack-redirect": "^1.7.27-alpha"
},
"require-dev": {
"automattic/wordbless": "@dev",
"yoast/phpunit-polyfills": "1.1.0",
"brain/monkey": "2.6.1",
"automattic/jetpack-changelogger": "^3.3.8"
"automattic/jetpack-changelogger": "^3.3.9-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -874,5 +874,4 @@ public function json_api( $args = array() ) {
}
return array();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -240,5 +240,4 @@ function ( $connected_admin ) {
echo '</p>';
echo '</div>';
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -772,5 +772,4 @@ public function check_api_response_for_errors( $http_response, $auth_data, $url,

$this->report_error( $error, false, true );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -249,5 +249,4 @@ public function cli_callback( $args ) {
WP_CLI::line( sprintf( __( 'Last heartbeat sent at: %s', 'jetpack-connection' ), $last_date ) );
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,4 @@ public static function render() {
public static function render_script( $handle ) {
wp_add_inline_script( $handle, static::render(), 'before' );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Automattic\Jetpack\Connection;

use Automattic\Jetpack\A8c_Mc_Stats as A8c_Mc_Stats;
use Automattic\Jetpack\A8c_Mc_Stats;
use Automattic\Jetpack\Constants;
use Automattic\Jetpack\Heartbeat;
use Automattic\Jetpack\Roles;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,4 @@ public static function invalidate_request_nonces() {

return true;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,4 @@ protected function update_package_versions_option( $package_versions ) {
set_transient( self::CACHED_FAILED_REQUEST_KEY, time(), self::CACHED_FAILED_REQUEST_EXPIRATION );
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '1.57.4';
const PACKAGE_VERSION = '1.57.5-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,4 @@ protected function set_agree() {
protected function set_reject() {
\Jetpack_Options::update_option( self::OPTION_NAME, false );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,4 @@ private function init_aiowpm() {
add_filter( 'ai1wm_export', array( $this, 'aiowpm_set_lock' ), 180 );
add_filter( 'ai1wm_export', array( $this, 'aiowpm_remove_lock' ), 250 );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -183,5 +183,4 @@ public static function site_url() {
public static function main_network_site_url() {
return self::get_protocol_normalized_url( 'main_network_site_url', network_site_url() );
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static function add_call( $method, $user_id = 0, ...$args ) {
public static function do_calls() {
foreach ( self::$clients as $client_blog_id => $blog_clients ) {
if ( $client_blog_id > 0 ) {
$switch_success = switch_to_blog( $client_blog_id, true );
$switch_success = switch_to_blog( $client_blog_id );

if ( ! $switch_success ) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-constants/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8"
"automattic/jetpack-changelogger": "^3.3.9-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
"automattic/jetpack-changelogger": "^3.3.8"
"automattic/jetpack-changelogger": "^3.3.9-alpha"
},
"suggest": {
"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
Expand Down
10 changes: 5 additions & 5 deletions jetpack_vendor/automattic/jetpack-identity-crisis/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"type": "jetpack-library",
"license": "GPL-2.0-or-later",
"require": {
"automattic/jetpack-connection": "^1.57.4",
"automattic/jetpack-connection": "^1.57.5-alpha",
"automattic/jetpack-constants": "^1.6.23",
"automattic/jetpack-status": "^1.18.3",
"automattic/jetpack-logo": "^1.6.2",
"automattic/jetpack-assets": "^1.18.10"
"automattic/jetpack-status": "^1.18.4-alpha",
"automattic/jetpack-logo": "^1.6.3-alpha",
"automattic/jetpack-assets": "^1.18.11-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^3.3.8",
"automattic/jetpack-changelogger": "^3.3.9-alpha",
"yoast/phpunit-polyfills": "1.1.0",
"automattic/wordbless": "@dev"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
use Automattic\Jetpack\Assets\Logo as Jetpack_Logo;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
use Automattic\Jetpack\Connection\Urls;
use Automattic\Jetpack\Constants as Constants;
use Automattic\Jetpack\IdentityCrisis\Exception;
use Automattic\Jetpack\IdentityCrisis\UI;
use Automattic\Jetpack\IdentityCrisis\URL_Secret;
use Automattic\Jetpack\Status as Status;
use Automattic\Jetpack\Tracking as Tracking;
use Jetpack_Options;
use WP_Error;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,5 +233,4 @@ public static function url_secret_permission_check() {
array( 'status' => rest_authorization_required_code() )
);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Automattic\Jetpack\Assets;
use Automattic\Jetpack\Identity_Crisis;
use Automattic\Jetpack\Status\Host;
use Automattic\Jetpack\Tracking as Tracking;
use Automattic\Jetpack\Tracking;
use Jetpack_Options;
use Jetpack_Tracks_Client;

Expand Down Expand Up @@ -198,5 +198,4 @@ private static function get_platform() {

return 'self-hosted';
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -131,5 +131,4 @@ public function exists() {
private function generate_secret() {
return wp_generate_password( 12, false );
}

}
Loading

0 comments on commit 1a022cb

Please sign in to comment.