Release

inc/compatibilities/jetpack_photon_compatibility.php

@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * Class Optml_jetpack_photon_compatibility.
+ *
+ * @reason Register Jetpack as a conflicting plugin when its image Site Accelerator is active.
+ */
+class Optml_jetpack_photon_compatibility extends Optml_compatibility {
+	/**
+	 * Jetpack conflict key.
+	 */
+	const CONFLICT_KEY = 'jetpack_Photon';
+
+	/**
+	 * Jetpack plugin file.
+	 */
+	const PLUGIN_FILE = 'jetpack/jetpack.php';
+
+	/**
+	 * Check whether Jetpack's image Site Accelerator is active.
+	 *
+	 * @return bool Whether to load the compatibility.
+	 */
+	public function should_load() {
+		return class_exists( '\Jetpack', false ) && \Jetpack::is_module_active( 'photon' );
+	}
+
+	/**
+	 * Register the Jetpack conflict integration.
+	 *
+	 * @return void
+	 */
+	public function register() {
+		add_filter( 'optml_conflicting_defined_plugins', [ $this, 'add_conflicting_plugin' ] );
+	}
+
+	/**
+	 * Add Jetpack to the conflicting plugin definitions.
+	 *
+	 * @param array<string, string> $plugins Conflicting plugin definitions.
+	 * @return array<string, string>
+	 */
+	public function add_conflicting_plugin( $plugins ) {
+		$plugins[ self::CONFLICT_KEY ] = self::PLUGIN_FILE;
+
+		return $plugins;
+	}
+
+	/**
+	 * Register before the generic conflict notice is evaluated.
+	 *
+	 * @return bool
+	 */
+	public function should_load_early() {
+		return true;
+	}
+}

inc/conflicts/conflicting_plugins.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * The Conflicting Plugins class, documents and displays dashboard notice for conflicting plugins.
  *
@@ -54,7 +55,6 @@ private function defined_plugins() {
 			'litespeed'    => 'litespeed-cache/litespeed-cache.php',
 			'autoptimize'  => 'autoptimize/autoptimize.php',
 			'perfmatters'  => 'perfmatters/perfmatters.php',
-			'jetpack_Photon'      => 'jetpack/jetpack.php',
 			// 'plugin-slug' => 'plugin-folder/plugin-file.php'
 		];
 
@@ -73,6 +73,7 @@ private function get_active_plugins() {
 
 		$conflicting_plugins = $this->defined_plugins();
 		$conflicting_plugins = array_filter( $conflicting_plugins, 'is_plugin_active' );
+
 		return apply_filters( 'optml_conflicting_active_plugins', $conflicting_plugins );
 	}
 

inc/conflicts/jetpack_photon.php

@@ -34,14 +34,8 @@ public function define_message() {
 	 * @access  public
 	 */
 	public function is_conflict_valid() {
+		$compatibility = new Optml_jetpack_photon_compatibility();
 
-		if ( ! is_plugin_active( 'jetpack/jetpack.php' ) ) {
-			return false;
-		}
-		if ( ! class_exists( 'Jetpack', false ) ) {
-			return false;
-		}
-
-		return Jetpack::is_module_active( 'photon' );
+		return $compatibility->should_load();
 	}
 }