Phan: Remove wpcomsh stubs from masterbar (#38410)

* Removed wpcomsh stubs from the masterbar package * changelog * Updated version * Removed masterbar file from Jetpack Phan config. * Removed files added by error * Update projects/packages/masterbar/changelog/remove-wpcomsh-phan-stubs-from-masterbar Co-authored-by: Brad Jorsch <[email protected]> * Updated version * Removed redundant changelog files * Fixed changelogs * Changed changelog type from removed to other --------- Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Jul 18, 2024 · fb45d03 · fb45d03
1 parent c5dfe76
commit fb45d03
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/projects/packages/masterbar/.phan/config.php b/projects/packages/masterbar/.phan/config.php
@@ -30,7 +30,6 @@
 			__DIR__ . '/../../../plugins/jetpack/modules/notes.php',
 			__DIR__ . '/../../../plugins/jetpack/modules/scan/class-admin-bar-notice.php',
 			__DIR__ . '/../../../plugins/jetpack/modules/stats.php',
-			__DIR__ . '/../../../plugins/wpcomsh/feature-plugins/masterbar.php',           // function wpcomsh_is_site_sticker_active
 			__DIR__ . '/../../../plugins/wpcomsh/private-site/private-site.php',           // function site_is_private
 		),
 	)

diff --git a/projects/packages/masterbar/changelog/remove-wpcomsh-phan-stubs-from-masterbar b/projects/packages/masterbar/changelog/remove-wpcomsh-phan-stubs-from-masterbar
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Removed loading wpcomsh phan stubs from the Masterbar, these stubs are already included globally now.
+
+
diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-masterbar",
-	"version": "0.4.0",
+	"version": "0.4.1-alpha",
 	"description": "The WordPress.com Toolbar feature replaces the default admin bar and offers quick links to the Reader, all your sites, your WordPress.com profile, and notifications.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/masterbar/#readme",
 	"bugs": {

diff --git a/projects/packages/masterbar/src/class-main.php b/projects/packages/masterbar/src/class-main.php
@@ -14,7 +14,7 @@
  */
 class Main {
 
-	const PACKAGE_VERSION = '0.4.0';
+	const PACKAGE_VERSION = '0.4.1-alpha';
 
 	/**
 	 * Initializer.

diff --git a/projects/plugins/jetpack/.phan/config.php b/projects/plugins/jetpack/.phan/config.php
@@ -36,7 +36,6 @@
 			// DO NOT add references to files in packages like this! Packages should be listed in composer.json 'require',
 			// or 'require-dev' if they're only needed in tests or build scripts.
 			__DIR__ . '/../../../plugins/vaultpress/vaultpress.php',                  // class VaultPress
-			__DIR__ . '/../../../plugins/wpcomsh/feature-plugins/masterbar.php',      // function wpcomsh_is_site_sticker_active
 			__DIR__ . '/../../../plugins/crm/includes/ZeroBSCRM.Core.Extensions.php', // functions zeroBSCRM_isExtensionInstalled, zeroBSCRM_extension_install_jetpackforms
 
 			// Make an exception to the above for packages/jetpack-mu-wpcom. Pulling in that whole package here seems more risky than beneficial.

diff --git a/projects/plugins/jetpack/changelog/remove-wpcomsh-phan-stubs-from-masterbar b/projects/plugins/jetpack/changelog/remove-wpcomsh-phan-stubs-from-masterbar
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Removed loading wpcomsh phan stubs from the Masterbar, these stubs are already included globally now.
+
+