packages: Add a bunch of missing deps (#37141)

* packages: Add a bunch of missing deps The following dependencies are added: * packages/backup: packages/my-jetpack * packages/boost-core: packages/connection * packages/forms: packages/logo, packages/status, packages/sync * packages/import: packages/sync * packages/search: packages/sync * packages/videopress: packages/my-jetpack * packages/yoast-promo: packages/assets Also, the following are added as dev-dependencies and flagged as test-only so they won't result in dependency cycles: * packages/config: 14 different things it can conditionally load * packages/connection: packages/licensing, packages/sync * packages/my-jetpack: packages/search, and mark packages/videopress as test-only too * packages/status: packages/connection, packages/identity-crisis, packages/plans * packages/sync: packages/search, packages/waf Note I haven't fully checked that all these really are test-only with any non-test uses properly checked with `class_exists` or the like. I do note that status→connection is only because of the `Jetpack_Options` class and is _not_ checked, which seems unfortunate and probably should be fixed somehow at some point.
Automattic · May 1, 2024 · ec16c44 · ec16c44
1 parent 385d636
commit ec16c44
Show file tree

Hide file tree

Showing 67 changed files with 1,051 additions and 129 deletions.
diff --git a/projects/packages/backup/.phan/baseline.php b/projects/packages/backup/.phan/baseline.php
@@ -13,11 +13,10 @@
     // PhanTypeMismatchReturn : 6 occurrences
     // PhanUndeclaredStaticMethod : 2 occurrences
     // PhanPossiblyUndeclaredVariable : 1 occurrence
-    // PhanUndeclaredClassMethod : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'src/class-jetpack-backup.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal', 'PhanUndeclaredClassMethod', 'PhanUndeclaredStaticMethod'],
+        'src/class-jetpack-backup.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal', 'PhanUndeclaredStaticMethod'],
         'src/class-rest-controller.php' => ['PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.

diff --git a/projects/packages/backup/changelog/add-lots-of-missing-deps b/projects/packages/backup/changelog/add-lots-of-missing-deps
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add missing package dependencies.
diff --git a/projects/packages/backup/composer.json b/projects/packages/backup/composer.json
@@ -13,6 +13,7 @@
 		"automattic/jetpack-config": "@dev",
 		"automattic/jetpack-connection": "@dev",
 		"automattic/jetpack-identity-crisis": "@dev",
+		"automattic/jetpack-my-jetpack": "@dev",
 		"automattic/jetpack-sync": "@dev",
 		"automattic/jetpack-status": "@dev"
 	},

diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php
@@ -16,7 +16,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '3.3.9';
+	const PACKAGE_VERSION = '3.3.10-alpha';
 
 	const PACKAGE_SLUG = 'backup';
 

diff --git a/projects/packages/boost-core/.phan/baseline.php b/projects/packages/boost-core/.phan/baseline.php
@@ -12,14 +12,12 @@
     // PhanAbstractStaticMethodCallInStatic : 3 occurrences
     // PhanParamTooMany : 2 occurrences
     // PhanTypeMismatchArgumentInternal : 2 occurrences
-    // PhanUndeclaredClassMethod : 2 occurrences
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
         'src/lib/class-boost-api.php' => ['PhanParamTooMany'],
         'src/lib/class-cacheable.php' => ['PhanAbstractStaticMethodCallInStatic'],
-        'src/lib/class-utils.php' => ['PhanTypeMismatchArgumentInternal', 'PhanUndeclaredClassMethod'],
-        'src/lib/class-wpcom-boost-api-client.php' => ['PhanUndeclaredClassMethod'],
+        'src/lib/class-utils.php' => ['PhanTypeMismatchArgumentInternal'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

diff --git a/projects/packages/boost-core/changelog/add-lots-of-missing-deps b/projects/packages/boost-core/changelog/add-lots-of-missing-deps
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add missing package dependencies.
diff --git a/projects/packages/boost-core/composer.json b/projects/packages/boost-core/composer.json
@@ -4,7 +4,8 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"php": ">=7.0"
+		"php": ">=7.0",
+		"automattic/jetpack-connection": "@dev"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",

diff --git a/projects/packages/boost-core/package.json b/projects/packages/boost-core/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-boost-core",
-	"version": "0.2.6",
+	"version": "0.2.7-alpha",
 	"description": "Core functionality for boost and relevant packages to depend on",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/boost-core/#readme",
 	"bugs": {

diff --git a/projects/packages/config/.phan/baseline.php b/projects/packages/config/.phan/baseline.php
@@ -9,13 +9,11 @@
  */
 return [
     // # Issue statistics:
-    // PhanUndeclaredClassMethod : 15+ occurrences
-    // PhanUndeclaredClassReference : 1 occurrence
-    // PhanUndeclaredClassStaticProperty : 1 occurrence
+    // PhanUndeclaredClassMethod : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
-        'src/class-config.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredClassReference', 'PhanUndeclaredClassStaticProperty'],
+        'src/class-config.php' => ['PhanUndeclaredClassMethod'],
     ],
     // 'directory_suppressions' => ['src/directory_name' => ['PhanIssueName1', 'PhanIssueName2']] can be manually added if needed.
     // (directory_suppressions will currently be ignored by subsequent calls to --save-baseline, but may be preserved in future Phan releases)

diff --git a/projects/packages/config/changelog/add-lots-of-missing-deps b/projects/packages/config/changelog/add-lots-of-missing-deps
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Add dev-deps for packages needed for Phan analysis. No change to functionality.
+
+
diff --git a/projects/packages/config/composer.json b/projects/packages/config/composer.json
@@ -7,7 +7,21 @@
 		"php": ">=7.0"
 	},
 	"require-dev": {
-		"automattic/jetpack-changelogger": "@dev"
+		"automattic/jetpack-changelogger": "@dev",
+		"automattic/jetpack-connection": "@dev",
+		"automattic/jetpack-identity-crisis": "@dev",
+		"automattic/jetpack-import": "@dev",
+		"automattic/jetpack-jitm": "@dev",
+		"automattic/jetpack-post-list": "@dev",
+		"automattic/jetpack-publicize": "@dev",
+		"automattic/jetpack-search": "@dev",
+		"automattic/jetpack-stats": "@dev",
+		"automattic/jetpack-stats-admin": "@dev",
+		"automattic/jetpack-sync": "@dev",
+		"automattic/jetpack-videopress": "@dev",
+		"automattic/jetpack-waf": "@dev",
+		"automattic/jetpack-wordads": "@dev",
+		"automattic/jetpack-yoast-promo": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -37,6 +51,29 @@
 		},
 		"branch-alias": {
 			"dev-trunk": "2.0.x-dev"
+		},
+		"dependencies": {
+			"test-only": [
+				"packages/connection",
+				"packages/identity-crisis",
+				"packages/import",
+				"packages/jitm",
+				"packages/post-list",
+				"packages/publicize",
+				"packages/search",
+				"packages/stats",
+				"packages/stats-admin",
+				"packages/sync",
+				"packages/videopress",
+				"packages/waf",
+				"packages/wordads",
+				"packages/yoast-promo"
+			]
+		}
+	},
+	"config": {
+		"allow-plugins": {
+			"automattic/jetpack-autoloader": true
 		}
 	}
 }
diff --git a/projects/packages/connection/.phan/baseline.php b/projects/packages/connection/.phan/baseline.php
@@ -16,10 +16,10 @@
     // PhanPluginDuplicateConditionalNullCoalescing : 15+ occurrences
     // PhanTypeMismatchReturn : 15+ occurrences
     // PhanTypeMismatchPropertyProbablyReal : 9 occurrences
-    // PhanUndeclaredClassMethod : 9 occurrences
     // PhanNoopNew : 8 occurrences
     // PhanTypeMismatchReturnProbablyReal : 8 occurrences
     // PhanUndeclaredProperty : 8 occurrences
+    // PhanUndeclaredClassMethod : 6 occurrences
     // PhanRedundantCondition : 5 occurrences
     // PhanTypeArraySuspiciousNullable : 5 occurrences
     // PhanTypeMismatchDefault : 5 occurrences
@@ -39,7 +39,6 @@
     // PhanPluginDuplicateAdjacentStatement : 1 occurrence
     // PhanPluginSimplifyExpressionBool : 1 occurrence
     // PhanTypeMismatchDeclaredParamNullable : 1 occurrence
-    // PhanUndeclaredClassReference : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
     'file_suppressions' => [
@@ -52,10 +51,8 @@
         'src/class-heartbeat.php' => ['PhanTypeMismatchPropertyDefault'],
         'src/class-manager.php' => ['PhanImpossibleCondition', 'PhanNoopNew', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanRedundantCondition', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchDeclaredParamNullable', 'PhanTypeMismatchDefault', 'PhanTypeMismatchPropertyProbablyReal', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnNullable', 'PhanTypeMismatchReturnProbablyReal'],
         'src/class-nonce-handler.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchReturnNullable'],
-        'src/class-package-version-tracker.php' => ['PhanUndeclaredClassMethod'],
         'src/class-partner-coupon.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
         'src/class-partner.php' => ['PhanTypeMismatchPropertyProbablyReal'],
-        'src/class-plugin-storage.php' => ['PhanUndeclaredClassMethod'],
         'src/class-rest-authentication.php' => ['PhanTypeMismatchPropertyDefault', 'PhanTypeMismatchPropertyProbablyReal'],
         'src/class-rest-connector.php' => ['PhanParamTooMany', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturnProbablyReal'],
         'src/class-secrets.php' => ['PhanNonClassMethodCall', 'PhanTypeMismatchArgument'],
@@ -66,7 +63,7 @@
         'src/sso/class-helpers.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'src/sso/class-sso.php' => ['PhanNoopNew', 'PhanRedundantCondition', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentProbablyReal'],
         'src/sso/class-user-admin.php' => ['PhanPluginUnreachableCode', 'PhanTypeMismatchArgument'],
-        'src/webhooks/class-authorize-redirect.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredClassReference'],
+        'src/webhooks/class-authorize-redirect.php' => ['PhanUndeclaredClassMethod'],
         'tests/php/test-class-nonce-handler.php' => ['PhanPluginDuplicateAdjacentStatement', 'PhanTypeMismatchArgument'],
         'tests/php/test-class-webhooks.php' => ['PhanDeprecatedFunction'],
         'tests/php/test-partner-coupon.php' => ['PhanDeprecatedFunction'],

diff --git a/projects/packages/connection/changelog/add-lots-of-missing-deps b/projects/packages/connection/changelog/add-lots-of-missing-deps
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Add dev-deps for packages needed for Phan analysis. No change to functionality.
+
+
diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json
@@ -17,7 +17,9 @@
 		"automattic/wordbless": "@dev",
 		"yoast/phpunit-polyfills": "1.1.0",
 		"brain/monkey": "2.6.1",
-		"automattic/jetpack-changelogger": "@dev"
+		"automattic/jetpack-changelogger": "@dev",
+		"automattic/jetpack-licensing": "@dev",
+		"automattic/jetpack-sync": "@dev"
 	},
 	"suggest": {
 		"automattic/jetpack-autoloader": "Allow for better interoperability with other plugins that use this package."
@@ -68,6 +70,12 @@
 		},
 		"branch-alias": {
 			"dev-trunk": "2.7.x-dev"
+		},
+		"dependencies": {
+			"test-only": [
+				"packages/licensing",
+				"packages/sync"
+			]
 		}
 	},
 	"config": {

diff --git a/projects/packages/connection/tests/php/test_package_version_tracker.php b/projects/packages/connection/tests/php/test_package_version_tracker.php
@@ -3,6 +3,7 @@
 namespace Automattic\Jetpack\Connection;
 
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Sync\Settings as Sync_Settings;
 use PHPUnit\Framework\TestCase;
 use WorDBless\Options as WorDBless_Options;
 
@@ -46,6 +47,7 @@ class Test_Package_Version_Tracker extends TestCase {
 	 */
 	public function set_up() {
 		Constants::set_constant( 'JETPACK__WPCOM_JSON_API_BASE', 'https://public-api.wordpress.com' );
+		Sync_Settings::update_settings( array( 'disable' => true ) );
 	}
 
 	/**

diff --git a/projects/packages/connection/tests/php/test_plugin_storage.php b/projects/packages/connection/tests/php/test_plugin_storage.php
@@ -9,6 +9,7 @@
 namespace Automattic\Jetpack\Connection;
 
 use Automattic\Jetpack\Constants;
+use Automattic\Jetpack\Sync\Settings as Sync_Settings;
 use PHPUnit\Framework\TestCase;
 use WorDBless\Options as WorDBless_Options;
 
@@ -33,6 +34,7 @@ class Test_Plugin_Storage extends TestCase {
 	 */
 	public function set_up() {
 		Constants::set_constant( 'JETPACK__WPCOM_JSON_API_BASE', 'https://public-api.wordpress.com' );
+		Sync_Settings::update_settings( array( 'disable' => true ) );
 	}
 
 	/**

diff --git a/projects/packages/forms/.phan/baseline.php b/projects/packages/forms/.phan/baseline.php
@@ -14,10 +14,10 @@
     // PhanUndeclaredMethod : 10+ occurrences
     // PhanTypeMismatchReturnProbablyReal : 9 occurrences
     // PhanTypeMismatchArgumentInternal : 7 occurrences
-    // PhanUndeclaredClassMethod : 7 occurrences
     // PhanTypeMismatchArgumentProbablyReal : 6 occurrences
     // PhanDeprecatedFunction : 5 occurrences
     // PhanRedundantCondition : 4 occurrences
+    // PhanUndeclaredClassMethod : 4 occurrences
     // PhanTypeMismatchReturn : 3 occurrences
     // PhanTypePossiblyInvalidDimOffset : 3 occurrences
     // PhanPluginRedundantAssignment : 2 occurrences
@@ -39,11 +39,11 @@
     'file_suppressions' => [
         'src/blocks/contact-form/class-contact-form-block.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredFunction'],
         'src/class-wpcom-rest-api-v2-endpoint-forms.php' => ['PhanTypePossiblyInvalidDimOffset', 'PhanUndeclaredFunction'],
-        'src/contact-form/class-admin.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPossiblyUndeclaredVariable', 'PhanRedundantCondition', 'PhanTypeArraySuspiciousNullable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturn', 'PhanUndeclaredClassMethod'],
+        'src/contact-form/class-admin.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPossiblyUndeclaredVariable', 'PhanRedundantCondition', 'PhanTypeArraySuspiciousNullable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturn'],
         'src/contact-form/class-contact-form-field.php' => ['PhanParamTooMany', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPossiblyNullTypeMismatchProperty', 'PhanTypeConversionFromArray', 'PhanTypeMismatchArgument', 'PhanTypeMismatchReturnProbablyReal', 'PhanUndeclaredClassMethod', 'PhanUndeclaredProperty'],
         'src/contact-form/class-contact-form-plugin.php' => ['PhanPluginDuplicateAdjacentStatement', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginRedundantAssignment', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturn', 'PhanTypeMismatchReturnProbablyReal', 'PhanUndeclaredClassMethod'],
         'src/contact-form/class-contact-form-shortcode.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
-        'src/contact-form/class-contact-form.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginRedundantAssignment', 'PhanRedundantCondition', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchReturnNullable', 'PhanTypeMismatchReturnProbablyReal', 'PhanUndeclaredClassMethod'],
+        'src/contact-form/class-contact-form.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginRedundantAssignment', 'PhanRedundantCondition', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchReturnNullable', 'PhanTypeMismatchReturnProbablyReal'],
         'src/dashboard/class-dashboard-view-switch.php' => ['PhanUnreferencedUseNormal'],
         'src/dashboard/class-dashboard.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredConstant'],
         'src/service/class-google-drive.php' => ['PhanTypeMismatchReturnProbablyReal'],

diff --git a/projects/packages/forms/changelog/add-lots-of-missing-deps b/projects/packages/forms/changelog/add-lots-of-missing-deps
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add missing package dependencies.
diff --git a/projects/packages/forms/composer.json b/projects/packages/forms/composer.json
@@ -8,7 +8,9 @@
 		"automattic/jetpack-blocks": "@dev",
 		"automattic/jetpack-assets": "@dev",
 		"automattic/jetpack-connection": "@dev",
-		"automattic/jetpack-status": "@dev"
+		"automattic/jetpack-logo": "@dev",
+		"automattic/jetpack-status": "@dev",
+		"automattic/jetpack-sync": "@dev"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",

diff --git a/projects/packages/import/.phan/baseline.php b/projects/packages/import/.phan/baseline.php
@@ -18,7 +18,6 @@
     // PhanImpossibleTypeComparison : 1 occurrence
     // PhanRedundantArrayValuesCall : 1 occurrence
     // PhanTraitParentReference : 1 occurrence
-    // PhanUndeclaredClassMethod : 1 occurrence
     // PhanUndeclaredMethod : 1 occurrence
 
     // Currently, file_suppressions and directory_suppressions are the only supported suppressions
@@ -28,7 +27,7 @@
         'src/endpoints/class-end.php' => ['PhanPluginMixedKeyNoKey', 'PhanTypeMismatchReturnProbablyReal'],
         'src/endpoints/class-global-style.php' => ['PhanTypeMismatchReturn'],
         'src/endpoints/class-menu.php' => ['PhanTypeMismatchArgumentProbablyReal'],
-        'src/endpoints/class-post.php' => ['PhanAccessMethodInternal', 'PhanImpossibleTypeComparison', 'PhanRedundantArrayValuesCall', 'PhanUndeclaredClassMethod'],
+        'src/endpoints/class-post.php' => ['PhanAccessMethodInternal', 'PhanImpossibleTypeComparison', 'PhanRedundantArrayValuesCall'],
         'src/endpoints/class-start.php' => ['PhanPluginMixedKeyNoKey', 'PhanTypeMismatchReturnProbablyReal'],
         'src/endpoints/class-tag.php' => ['PhanTypeMismatchArgumentProbablyReal'],
         'src/endpoints/trait-import-id.php' => ['PhanTraitParentReference'],

diff --git a/projects/packages/import/changelog/add-lots-of-missing-deps b/projects/packages/import/changelog/add-lots-of-missing-deps
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add missing package dependencies.
diff --git a/projects/packages/import/composer.json b/projects/packages/import/composer.json
@@ -5,7 +5,8 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"php": ">=7.0",
-		"automattic/jetpack-connection": "@dev"
+		"automattic/jetpack-connection": "@dev",
+		"automattic/jetpack-sync": "@dev"
 	},
 	"require-dev": {
 		"yoast/phpunit-polyfills": "1.1.0",

diff --git a/projects/packages/import/package.json b/projects/packages/import/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-import",
-	"version": "0.8.4",
+	"version": "0.8.5-alpha",
 	"description": "Set of REST API routes used in WPCOM Unified Importer.",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/import/#readme",
 	"bugs": {

diff --git a/projects/packages/import/src/class-main.php b/projects/packages/import/src/class-main.php
@@ -20,7 +20,7 @@ class Main {
 	 *
 	 * @var string
 	 */
-	const PACKAGE_VERSION = '0.8.4';
+	const PACKAGE_VERSION = '0.8.5-alpha';
 
 	/**
 	 * A list of all the routes.

diff --git a/projects/packages/my-jetpack/.phan/baseline.php b/projects/packages/my-jetpack/.phan/baseline.php
@@ -14,9 +14,9 @@
     // PhanParamTooMany : 10+ occurrences
     // PhanTypeMismatchReturnProbablyReal : 10+ occurrences
     // PhanAbstractStaticMethodCallInStatic : 8 occurrences
-    // PhanUndeclaredClassMethod : 8 occurrences
     // PhanNoopNew : 6 occurrences
     // PhanTypeMismatchReturn : 6 occurrences
+    // PhanUndeclaredClassMethod : 6 occurrences
     // PhanUndeclaredStaticProperty : 6 occurrences
     // PhanPluginDuplicateConditionalNullCoalescing : 5 occurrences
     // PhanTypeMismatchReturnNullable : 3 occurrences
@@ -53,7 +53,7 @@
         'src/products/class-product.php' => ['PhanAbstractStaticMethodCallInStatic', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchPropertyDefault'],
         'src/products/class-protect.php' => ['PhanTypeMismatchPropertyDefault'],
         'src/products/class-scan.php' => ['PhanTypeMismatchArgumentNullable'],
-        'src/products/class-search.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchPropertyDefault', 'PhanTypeMismatchReturnNullable', 'PhanUndeclaredClassMethod'],
+        'src/products/class-search.php' => ['PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchPropertyDefault', 'PhanTypeMismatchReturnNullable'],
         'src/products/class-security.php' => ['PhanTypeMismatchArgumentNullable'],
         'src/products/class-social.php' => ['PhanTypeMismatchPropertyDefault'],
         'src/products/class-starter.php' => ['PhanTypeMismatchArgumentNullable'],

diff --git a/projects/packages/my-jetpack/changelog/add-lots-of-missing-deps b/projects/packages/my-jetpack/changelog/add-lots-of-missing-deps
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Add dev-deps for packages needed for Phan analysis (and mark existing packages/videopress dep as such too). No change to functionality.
+
+
diff --git a/projects/packages/my-jetpack/composer.json b/projects/packages/my-jetpack/composer.json
@@ -21,6 +21,7 @@
 		"yoast/phpunit-polyfills": "1.1.0",
 		"automattic/jetpack-changelogger": "@dev",
 		"automattic/wordbless": "@dev",
+		"automattic/jetpack-search": "@dev",
 		"automattic/jetpack-videopress": "@dev"
 	},
 	"suggest": {
@@ -82,6 +83,12 @@
 		},
 		"version-constants": {
 			"::PACKAGE_VERSION": "src/class-initializer.php"
+		},
+		"dependencies": {
+			"test-only": [
+				"packages/search",
+				"packages/videopress"
+			]
 		}
 	},
 	"config": {