Clean up todos after WordPress 6.8 by anomiex · Pull Request #46843 · Automattic/jetpack

anomiex · 2026-01-29T22:18:51Z

Closes MONOREP-332

Proposed changes:

external-media: Remove conditional next40pxDefaultSize
Move PHP 8.5 to main matrix
various SCSS: Use @error rather than @warn
codesniffer: Drop exclusion for test-*.php type filenames, all should be *Test.php now.
phpcs-filter: Remove obsolete workaround in coverage tests
publicize: Remove Gutenberg ESM workaround (missed in Update dependency @wordpress/dataviews to v11.2.0 #46430)
jetpack: Remove iponweb code tagged "TODO: Remove this function after June 30th, 2025"
wpcomsh: Remove conditional testing for WordPress <6.8
jetpack: Clean up test for wp_register_block_metadata_collection and the workaround for brokenness in WP 6.7
jetpack-mu-wpcom: Remove obsolete hotfixes
Remove obsolete function_exists and version_compare checks

Other information:

Have you written new tests for your changes, if applicable?
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

#45518
p1769543281415539-slack-CDLH4C1UZ

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Everything still work right? Particularly with WordPress 6.8.0?

Was commented with "Remove when Jetpack requires WordPress 6.7".

…ld be `*Test.php` now.

… June 30th, 2025"

…xed by now.

…d the workaround for brokenness in WP 6.7

github-actions · 2026-01-29T22:19:53Z

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

To test on WoA, go to the Plugins menu on a WoA dev site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin (Jetpack or WordPress.com Site Helper), and enable the fix/clean-up-todos-after-wp-6.8 branch.
To test on Simple, run the following command on your sandbox:

bin/jetpack-downloader test jetpack fix/clean-up-todos-after-wp-6.8

bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/clean-up-todos-after-wp-6.8

Interested in more tips and information?

In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
Read more about our development workflow here: PCYsg-eg0-p2
Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

github-actions · 2026-01-29T22:19:56Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
WoA releases happen weekly.
Releases to self-hosted sites happen monthly:
- Scheduled release: February 3, 2026
- Code freeze: February 3, 2026

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Boost plugin:

No scheduled milestone found for this plugin.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Wpcomsh plugin:

Next scheduled release: Atomic deploys happen twice daily on weekdays (p9o2xV-2EN-p2)

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

jp-launch-control · 2026-01-29T22:37:00Z

Code Coverage Summary

Coverage changed in 7 files. Only the first 5 are listed here.

File	Coverage	Δ%	Δ Uncovered
projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/code/class-code-block.php	0/366 (0.00%)	0.00%	-1 💚
projects/plugins/jetpack/_inc/site-switcher.php	0/38 (0.00%)	0.00%	-2 💚
projects/plugins/wpcomsh/feature-plugins/masterbar.php	4/90 (4.44%)	0.10%	-2 💚
projects/plugins/jetpack/class.jetpack-gutenberg.php	168/457 (36.76%)	0.40%	-5 💚
projects/plugins/jetpack/modules/wordads/class-wordads.php	0/352 (0.00%)	0.00%	-5 💚

Full summary · PHP report · JS report

…ld be fixed by now." Not fixed after all.

manzoorwanijk · 2026-01-30T04:32:16Z

projects/packages/publicize/webpack.config.js

-			// Old Gutenberg packages' ESM builds don't fully specify their imports. Sigh.
-			// @todo Remove this when we upgrade @wordpress/dataviews to 11.2.0+.
-			// https://github.com/WordPress/gutenberg/issues/73362
-			{
-				test: /\/node_modules\/@wordpress\/.*\/build-module\/.*\.js$/,
-				resolve: { fullySpecified: false },
-			},
-


Glad that we got rid of this.

manzoorwanijk

Looks fine to me. The test for 8.5 is stuck though.

anomiex · 2026-01-30T17:59:28Z

That's because it's changed from "PHP tests: PHP 8.5 WP trunk" to "PHP tests: PHP 8.5 WP latest"; we'll need to unrequire the former and then require the latter instead.

anomiex added 13 commits January 29, 2026 16:04

external-media: Remove conditional next40pxDefaultSize

ae64881

Was commented with "Remove when Jetpack requires WordPress 6.7".

Move PHP 8.5 to main matrix

0c24fc3

various SCSS: Use @error rather than @warn

f852cfd

codesniffer: Drop exclusion for test-*.php type filenames, all shou…

c466dfe

…ld be `*Test.php` now.

phpcs-filter: Remove obsolete workaround in coverage tests

bc6fbf7

publicize: Remove Gutenberg ESM workaround (missed in #46430)

c3170e8

crm: Update test PHP syntax, CRM dropped PHP 7.3 support a while ago.

b9526c1

jetpack: Remove iponweb code tagged "TODO: Remove this function after…

e3e28a0

… June 30th, 2025"

jetpack: Remove workaround for WP Core PHP 8.5 fail that should be fi…

485df2e

…xed by now.

wpcomsh: Remove conditional testing for WordPress <6.8

9778e19

jetpack: Clean up test for wp_register_block_metadata_collection an…

6427bf4

…d the workaround for brokenness in WP 6.7

jetpack-mu-wpcom: Remove obsolete hotfixes

9adc91b

Remove obsolete function_exists and version_compare checks

11a334f

anomiex requested a review from a team January 29, 2026 22:18

anomiex self-assigned this Jan 29, 2026

anomiex added [Status] In Progress [Type] Janitorial [Pri] Normal labels Jan 29, 2026

anomiex added 3 commits January 29, 2026 17:37

crm: PHP 7.4 still uses an older version of Codeception

a8d803f

Fix jetpack change entry

9fc2420

Revert "jetpack: Remove workaround for WP Core PHP 8.5 fail that shou…

166ad06

…ld be fixed by now." Not fixed after all.

manzoorwanijk reviewed Jan 30, 2026

View reviewed changes

manzoorwanijk approved these changes Jan 30, 2026

View reviewed changes

anomiex merged commit 99091ad into trunk Jan 30, 2026
94 checks passed

anomiex deleted the fix/clean-up-todos-after-wp-6.8 branch January 30, 2026 18:02

github-actions bot added [Status] UI Changes Add this to PRs that change the UI so documentation can be updated. and removed [Status] In Progress labels Jan 30, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up todos after WordPress 6.8#46843

Clean up todos after WordPress 6.8#46843
anomiex merged 16 commits intotrunkfrom
fix/clean-up-todos-after-wp-6.8

anomiex commented Jan 29, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 29, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 29, 2026 •

edited

Loading

Uh oh!

jp-launch-control bot commented Jan 29, 2026 •

edited

Loading

Uh oh!

manzoorwanijk Jan 30, 2026

Uh oh!

manzoorwanijk left a comment

Uh oh!

anomiex commented Jan 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

anomiex commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

Uh oh!

github-actions bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jp-launch-control bot commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage Summary

Uh oh!

manzoorwanijk Jan 30, 2026

Choose a reason for hiding this comment

Uh oh!

manzoorwanijk left a comment

Choose a reason for hiding this comment

Uh oh!

anomiex commented Jan 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

anomiex commented Jan 29, 2026 •

edited

Loading

github-actions bot commented Jan 29, 2026 •

edited

Loading

github-actions bot commented Jan 29, 2026 •

edited

Loading

jp-launch-control bot commented Jan 29, 2026 •

edited

Loading