Remove dependency on automattic/jetpack-mu-wpcom that was added for P…

…han and causes odd dependency loops (#41931) Make Phan happy in a different way for now. Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Feb 20, 2025 · 7a3559d · 7a3559d
1 parent 4287fda
commit 7a3559d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/projects/packages/masterbar/.phan/config.php b/projects/packages/masterbar/.phan/config.php
@@ -31,6 +31,10 @@
 			__DIR__ . '/../../../plugins/jetpack/modules/scan/class-admin-bar-notice.php',
 			__DIR__ . '/../../../plugins/jetpack/modules/stats.php',
 			__DIR__ . '/../../../plugins/wpcomsh/private-site/private-site.php',           // function site_is_private
+
+			// Make an exception to the above for packages/jetpack-mu-wpcom. Pulling in that whole package here causes more trouble than it solves.
+			__DIR__ . '/../../../packages/jetpack-mu-wpcom/src/features/custom-css/custom-css.php', // class Jetpack_Custom_CSS_Enhancements
+			__DIR__ . '/../../../packages/jetpack-mu-wpcom/src/features/wpcom-admin-interface/wpcom-admin-interface.php', // function wpcom_is_duplicate_views_experiment_enabled
 		),
 	)
 );
diff --git a/projects/packages/masterbar/changelog/update-move-wpcom-themes-api b/projects/packages/masterbar/changelog/update-move-wpcom-themes-api
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Remove dependency on automattic/jetpack-mu-wpcom that was added for Phan and causes odd dependency loops. Make Phan happy in a different way for now.
+
+
diff --git a/projects/packages/masterbar/composer.json b/projects/packages/masterbar/composer.json
@@ -19,7 +19,6 @@
 		"brain/monkey": "^2.6.2",
 		"yoast/phpunit-polyfills": "^1.1.1",
 		"automattic/jetpack-changelogger": "@dev",
-		"automattic/jetpack-mu-wpcom": "@dev",
 		"automattic/patchwork-redefine-exit": "@dev",
 		"automattic/jetpack-test-environment": "@dev"
 	},
@@ -75,11 +74,6 @@
 		"changelogger": {
 			"link-template": "https://github.com/Automattic/jetpack-masterbar/compare/v${old}...v${new}"
 		},
-		"dependencies": {
-			"test-only": [
-				"packages/jetpack-mu-wpcom"
-			]
-		},
 		"mirror-repo": "Automattic/jetpack-masterbar",
 		"textdomain": "jetpack-masterbar",
 		"version-constants": {

diff --git a/projects/plugins/jetpack/changelog/update-move-wpcom-themes-api b/projects/plugins/jetpack/changelog/update-move-wpcom-themes-api
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Update composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-move-wpcom-themes-api#2 b/projects/plugins/mu-wpcom-plugin/changelog/update-move-wpcom-themes-api#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Update composer.lock.
+
+
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
diff --git a/projects/plugins/wpcomsh/changelog/update-move-wpcom-themes-api#2 b/projects/plugins/wpcomsh/changelog/update-move-wpcom-themes-api#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Update composer.lock.
+
+
diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock