WPSC: Remove outside dependency device detection (#45879)

Co-authored-by: tbradsha <[email protected]>

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

Upstream-Ref: Automattic/jetpack@3af959f

Author: kraftbj

CHANGELOG.md

@@ -5,6 +5,13 @@
 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).
 
+## [3.0.4-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Changed
+- Device Detection: use an embedded version instead of the Composer dependency
+
 ## [3.0.3] - 2025-11-11
 ### Added
 - Tested up to WordPress 6.9. [#45571]
@@ -831,6 +838,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Misc fixes
 
+[3.0.4-alpha]: https://github.com/Automattic/wp-super-cache/compare/v3.0.3...v3.0.4-alpha
 [3.0.3]: https://github.com/Automattic/wp-super-cache/compare/v3.0.2...v3.0.3
 [3.0.2]: https://github.com/Automattic/wp-super-cache/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/Automattic/wp-super-cache/compare/v3.0.0...v3.0.1

composer.json

@@ -3,9 +3,6 @@
 	"description": "A very fast caching engine for WordPress that produces static html files.",
 	"type": "wordpress-plugin",
 	"license": "GPL-2.0-or-later",
-	"require": {
-		"automattic/jetpack-device-detection": "^3.3.0"
-	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "^4.0.0",
 		"automattic/jetpack-changelogger": "^6.0.9",
@@ -46,6 +43,6 @@
 		"wp-svn-autopublish": true
 	},
 	"config": {
-		"autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ3_0_3"
+		"autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ3_0_4_alpha"
 	}
 }

composer.lock

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-super-cache",
-	"version": "3.0.3",
+	"version": "3.0.4-alpha",
 	"private": true,
 	"description": "A very fast caching engine for WordPress that produces static html files.",
 	"homepage": "https://jetpack.com",

package.json

@@ -1,11 +1,8 @@
 <?php
 
-if ( ! class_exists( 'Automattic\Jetpack\Device_Detection' ) ) {
-	// Manually load Device_Detection before autoload is initialized.
-	if ( defined( 'WPCACHEHOME' ) ) {
-		if ( file_exists( WPCACHEHOME . '/vendor/automattic/jetpack-device-detection/src/class-device-detection.php' ) ) {
-			require_once WPCACHEHOME . '/vendor/automattic/jetpack-device-detection/src/class-device-detection.php';
-		}
+if ( defined( 'WPCACHEHOME' ) ) {
+	if ( file_exists( WPCACHEHOME . '/src/device-detection/class-device-detection.php' ) ) {
+		require_once WPCACHEHOME . '/src/device-detection/class-device-detection.php';
 	}
 }
 
@@ -69,11 +66,11 @@ function wp_super_cache_jetpack_cookie_check( $cache_key ) {
 		}
 	}
 
-	if ( ! class_exists( 'Automattic\Jetpack\Device_Detection' ) ) {
+	if ( ! class_exists( 'Automattic\WPSC\Device_Detection' ) ) {
 		return 'normal';
 	}
 
-	if ( \Automattic\Jetpack\Device_Detection::is_phone() ) {
+	if ( \Automattic\WPSC\Device_Detection::is_phone() ) {
 		return 'mobile';
 	} else {
 		return 'normal';

plugins/jetpack.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Device detection for Jetpack.
+ *
+ *  Since WPSC doesn't use an autoloader or composer, this is a simplified version of the package
+ *  as of November 11, 2025.
+ *
+ * @package automattic/jetpack-device-detection
+ */
+
+namespace Automattic\WPSC;
+
+require_once __DIR__ . '/functions.php';
+require_once __DIR__ . '/class-user-agent-info.php';
+
+use Automattic\WPSC\Device_Detection\User_Agent_Info;
+use function Automattic\WPSC\Device_Detection\wp_unslash;
+
+/**
+ * Class Automattic\WPSC\Device_Detection
+ *
+ * Determine if the current User Agent matches the passed $kind.
+ *
+ * Note: str_contains() and other PHP8+ functions that have a polyfill in core are not used here,
+ * as wp-includes/compat.php may not be loaded yet.
+ */
+class Device_Detection {
+
+	/**
+	 * Detects phone devices.
+	 *
+	 * @return bool
+	 */
+	public static function is_phone() {
+		if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
+			return false;
+		}
+
+		$ua_info = new User_Agent_Info( $_SERVER['HTTP_USER_AGENT'] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Handled in User_Agent_Info
+
+		$agent = strtolower( filter_var( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) );
+		if ( strpos( $agent, 'ipad' ) ) {
+			return false;
+		}
+
+		// Remove Samsung Galaxy tablets (SCH-I800) from being mobile devices.
+		if ( strpos( $agent, 'sch-i800' ) ) {
+			return false;
+		}
+
+		if ( $ua_info->is_android_tablet() && false === $ua_info->is_kindle_touch() ) {
+			return false;
+		}
+
+		if ( $ua_info->is_blackberry_tablet() ) {
+			return false;
+		}
+
+		// checks for iPhoneTier devices & RichCSS devices.
+		if ( $ua_info->isTierIphone() || $ua_info->isTierRichCSS() ) {
+			return true;
+		}
+
+		$dumb_agents = $ua_info->dumb_agents;
+
+		foreach ( $dumb_agents as $dumb_agent ) {
+			if ( false !== strpos( $agent, $dumb_agent ) ) {
+				return true;
+			}
+		}
+
+		if ( isset( $_SERVER['HTTP_X_WAP_PROFILE'] ) ) {
+			return true;
+		} elseif ( isset( $_SERVER['HTTP_ACCEPT'] ) && ( preg_match( '/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'] ) || false !== strpos( strtolower( $_SERVER['HTTP_ACCEPT'] ), 'application/vnd.wap.xhtml+xml' ) ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput -- This is doing the validating.
+			return true;
+		}
+
+		return false;
+	}
+}

src/device-detection/class-device-detection.php

@@ -2,6 +2,9 @@
 /**
  * User agent detection for Jetpack.
  *
+ * Since WPSC doesn't use an autoloader or composer, this is a simple copy/paste of the package
+ * as of November 11, 2025.
+ *
  * @package automattic/jetpack-device-detection
  *
  * We don't want to rename public members.
@@ -12,7 +15,7 @@
  * @phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
  */
 
-namespace Automattic\Jetpack\Device_Detection;
+namespace Automattic\WPSC\Device_Detection;
 
 require_once __DIR__ . '/functions.php';
 

…-detection/src/class-user-agent-info.php …vice-detection/class-user-agent-info.phpvendor/automattic/jetpack-device-detection/src/class-user-agent-info.php renamed to src/device-detection/class-user-agent-info.php vendor/automattic/jetpack-device-detection/src/class-user-agent-info.php renamed to src/device-detection/class-user-agent-info.php

@@ -2,10 +2,13 @@
 /**
  * Utility functions for device detection.
  *
+ *  Since WPSC doesn't use an autoloader or composer, this is a simple copy/paste of the package
+ *  as of November 11, 2025.
+ *
  * @package automattic/jetpack-device-detection
  */
 
-namespace Automattic\Jetpack\Device_Detection;
+namespace Automattic\WPSC\Device_Detection;
 
 // Check if the function is already defined, in case someone bypassed the autoloader or something
 // to get the two classes from different copies of the package.

…tpack-device-detection/src/functions.php src/device-detection/functions.phpvendor/automattic/jetpack-device-detection/src/functions.php renamed to src/device-detection/functions.php vendor/automattic/jetpack-device-detection/src/functions.php renamed to src/device-detection/functions.php

@@ -19,4 +19,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ3_0_3::getLoader();
+return ComposerAutoloaderInit6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ3_0_4_alpha::getLoader();