Skip to content

Fix Jetpack conflict notice eligibility - #1131

Merged
pirate-bot merged 3 commits into
developmentfrom
codex/fix-jetpack-conflict-notice
Sep 2, 2026
Merged

Fix Jetpack conflict notice eligibility#1131
pirate-bot merged 3 commits into
developmentfrom
codex/fix-jetpack-conflict-notice

Conversation

@selul

@selul selul commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

Summary

  • add a Photon-specific compatibility whose should_load method checks Jetpack image Site Accelerator state
  • register Jetpack in the generic conflict definitions only when that compatibility loads
  • reuse the same should_load predicate for the dedicated Jetpack Photon dashboard conflict
  • cover Photon enabled and disabled states with regression tests

Fixes #1130

Testing

  • composer phpunit -- --filter=Test_(Jetpack|Plugin)_Conflicts (5 tests, 11 assertions)
  • composer phpunit (251 tests, 1406 assertions)
  • composer phpstan
  • vendor/bin/phpcs --standard=phpcs.xml inc/compatibilities/jetpack_photon_compatibility.php inc/conflicts/conflicting_plugins.php inc/conflicts/jetpack_photon.php inc/manager.php tests/test-jetpack-conflicts.php
  • local WP-CLI runtime check with Jetpack 15.8: Photon off reports no conflict; simulated Photon on loads the compatibility and reports both expected conflict surfaces

@pirate-bot

pirate-bot commented Sep 1, 2026

Copy link
Copy Markdown
Collaborator

Plugin build for 7a82eab is ready 🛎️!

@pirate-bot
pirate-bot merged commit 8436d77 into development Sep 2, 2026
12 checks passed
@pirate-bot
pirate-bot deleted the codex/fix-jetpack-conflict-notice branch September 2, 2026 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants