Skip to content

Commit

Permalink
Add phpcs:ignores for wpcom (#41308)
Browse files Browse the repository at this point in the history
Wpcom has a linting check that flags every use of the `switch_blog`
hook, apparently with the intention that any "valid" uses ignore the
sniff. So let's do that so as to not block any deploys that happen to
touch near these lines (as is currently happening).

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/12953109988

Upstream-Ref: Automattic/jetpack@4daa973
  • Loading branch information
anomiex authored and matticbot committed Jan 24, 2025
1 parent 8aa29b8 commit 561670c
Show file tree
Hide file tree
Showing 16 changed files with 123 additions and 117 deletions.
78 changes: 39 additions & 39 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"php": ">=7.2",
"automattic/jetpack-assets": "^4.0.3",
"automattic/jetpack-connection": "^6.3.0",
"automattic/jetpack-connection": "^6.3.1-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-redirect": "^3.0.1",
Expand Down
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).

## [6.3.1-alpha] - unreleased

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

## [6.3.0] - 2025-01-20
### Changed
- Code: Use function-style exit() and die() with a default status code of 0. [#41167]
Expand Down Expand Up @@ -1287,6 +1291,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separate the connection library into its own package.

[6.3.1-alpha]: https://github.com/Automattic/jetpack-connection/compare/v6.3.0...v6.3.1-alpha
[6.3.0]: https://github.com/Automattic/jetpack-connection/compare/v6.2.2...v6.3.0
[6.2.2]: https://github.com/Automattic/jetpack-connection/compare/v6.2.1...v6.2.2
[6.2.1]: https://github.com/Automattic/jetpack-connection/compare/v6.2.0...v6.2.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ private function add_connection_status_invalidation_hooks() {
add_action( 'pre_update_jetpack_option_blog_token', array( $this, 'reset_connection_status' ) );
add_action( 'pre_update_jetpack_option_user_token', array( $this, 'reset_connection_status' ) );
add_action( 'pre_update_jetpack_option_user_tokens', array( $this, 'reset_connection_status' ) );
// phpcs:ignore WPCUT.SwitchBlog.SwitchBlog -- wpcom flags **every** use of switch_blog, apparently expecting valid instances to ignore or suppress the sniff.
add_action( 'switch_blog', array( $this, 'reset_connection_status' ) );

self::$connection_invalidators_added = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '6.3.0';
const PACKAGE_VERSION = '6.3.1-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.2",
"automattic/jetpack-a8c-mc-stats": "^3.0.0",
"automattic/jetpack-assets": "^4.0.3",
"automattic/jetpack-connection": "^6.3.0",
"automattic/jetpack-connection": "^6.3.1-alpha",
"automattic/jetpack-device-detection": "^3.0.0",
"automattic/jetpack-logo": "^3.0.0",
"automattic/jetpack-redirect": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-masterbar/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-blaze": "^0.25.6",
"automattic/jetpack-compat": "^4.0.0",
"automattic/jetpack-device-detection": "^3.0.0",
"automattic/jetpack-connection": "^6.3.0",
"automattic/jetpack-connection": "^6.3.1-alpha",
"automattic/jetpack-jitm": "^4.0.4",
"automattic/jetpack-logo": "^3.0.0",
"automattic/jetpack-plans": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-mu-wpcom/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-blocks": "^3.0.1",
"automattic/jetpack-calypsoify": "^0.2.2-alpha",
"automattic/jetpack-classic-theme-helper": "^0.9.2-alpha",
"automattic/jetpack-connection": "^6.3.0",
"automattic/jetpack-connection": "^6.3.1-alpha",
"automattic/jetpack-masterbar": "^0.12.0-alpha",
"automattic/jetpack-redirect": "^3.0.1",
"automattic/jetpack-stats-admin": "^0.24.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.2",
"automattic/jetpack-connection": "^6.3.0",
"automattic/jetpack-connection": "^6.3.1-alpha",
"automattic/jetpack-constants": "^3.0.1",
"automattic/jetpack-plans": "^0.5.1",
"automattic/jetpack-stats": "^0.15.0",
Expand Down
Loading

0 comments on commit 561670c

Please sign in to comment.