Merge branch 'add/governance-plugin' of github.com:Automattic/vip-go-…

…mu-plugins into add/governance-plugin
Automattic · Sep 29, 2023 · d88d711 · d88d711
2 parents a76a4ad + 75e0835
commit d88d711
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 61 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/search/elasticpress-next b/search/elasticpress-next
diff --git a/search/includes/classes/class-health.php b/search/includes/classes/class-health.php
@@ -56,9 +56,17 @@ class Health {
 	 * Instance of Search class
 	 *
 	 * Useful for overriding (dependency injection) for tests
+	 *
+	 * @var \Automattic\VIP\Search\Search
 	 */
 	public $search;
 
+	/** @var \ElasticPress\Indexables */
+	public $indexables;
+
+	/** @var \ElasticPress\Elasticsearch */
+	public $elasticsearch;
+
 	public function __construct( \Automattic\VIP\Search\Search $search ) {
 		$this->search        = $search;
 		$this->indexables    = \ElasticPress\Indexables::factory();

diff --git a/search/includes/classes/class-healthjob.php b/search/includes/classes/class-healthjob.php
@@ -30,20 +30,26 @@ class HealthJob {
 	 * Instance of the Health class
 	 *
 	 * Useful for overriding in tests via dependency injection
+	 *
+	 * @var Health
 	 */
 	public $health;
 
 	/**
 	 * Instance of Search class
 	 *
 	 * Useful for overriding (dependency injection) for tests
+	 *
+	 * @var \Automattic\VIP\Search\Search
 	 */
 	public $search;
 
 	/**
 	 * Instance of \ElasticPress\Indexables
 	 *
 	 * Useful for overriding (dependency injection) for tests
+	 *
+	 * @var \ElasticPress\Indexables
 	 */
 	public $indexables;
 

diff --git a/search/includes/classes/class-queue.php b/search/includes/classes/class-queue.php
@@ -14,7 +14,9 @@ class Queue {
 
 	/** @var Queue\Schema */
 	public $schema;
+	/** @var Indexables */
 	public $indexables;
+	/** @var \Automattic\VIP\Logstash\Logger */
 	public $logger;
 	/** @var Queue\Cron */
 	public $cron;

diff --git a/search/includes/classes/class-search.php b/search/includes/classes/class-search.php
@@ -186,6 +186,8 @@ class Search {
 	public $concurrency_limiter;
 	public $time;
 	public static $stat_sampling_drop_value = 5; // Value to compare >= against rand( 1, 10 ). 5 should result in roughly half being true.
+	/** @var Cache */
+	public $cache;
 
 	/**
 	 * Maximum number of queries before rate-limiting kicks in.

diff --git a/search/includes/classes/class-settingshealthjob.php b/search/includes/classes/class-settingshealthjob.php
@@ -39,20 +39,26 @@ class SettingsHealthJob {
 	 * Instance of the Health class
 	 *
 	 * Useful for overriding in tests via dependency injection
+	 *
+	 * @var Health
 	 */
 	public $health;
 
 	/**
 	 * Instance of Search class
 	 *
 	 * Useful for overriding (dependency injection) for tests
+	 *
+	 * @var \Automattic\VIP\Search\Search
 	 */
 	public $search;
 
 	/**
 	 * Instance of \ElasticPress\Indexables
 	 *
 	 * Useful for overriding (dependency injection) for tests
+	 *
+	 * @var \ElasticPress\Indexables
 	 */
 	public $indexables;
 

diff --git a/search/includes/classes/class-versioningcleanupjob.php b/search/includes/classes/class-versioningcleanupjob.php
@@ -11,6 +11,9 @@ class VersioningCleanupJob {
 
 	const SEARCH_ALERT_SLACK_CHAT = '#vip-go-es-alerts';
 
+	public $indexables;
+	public $versioning;
+
 	public function __construct( $indexables, $versioning ) {
 		$this->indexables = $indexables;
 		$this->versioning = $versioning;

diff --git a/search/includes/classes/commands/class-documentcommand.php b/search/includes/classes/commands/class-documentcommand.php
@@ -35,7 +35,7 @@ public function get( $args, $assoc_args ) {
 		$type      = $args[0];
 		$object_id = $args[1];
 
-		$search = \Automattic\VIP\Search\Search::instance();
+		\Automattic\VIP\Search\Search::instance();
 
 		$indexable = \ElasticPress\Indexables::factory()->get( $type );
 

diff --git a/search/search-dev-tools/package-lock.json b/search/search-dev-tools/package-lock.json
diff --git a/tests/files/test-curl-streamer.php b/tests/files/test-curl-streamer.php
@@ -31,6 +31,13 @@ public function tearDown(): void {
 	}
 
 	public function test__init() {
+		global $wp_version;
+
+		$version = preg_replace( '/-.*$/', '', $wp_version );
+		if ( version_compare( $version, '6.4', '>=' ) ) {
+			$this->setExpectedDeprecated( 'http_api_transports' );
+		}
+
 		$expected_transport = 'WP_Http_Curl';
 
 		$wp_http          = new \WP_Http();

diff --git a/vip-helpers/vip-media.php b/vip-helpers/vip-media.php
@@ -84,7 +84,8 @@ function wpcom_vip_set_image_quality( $quality, $strip = false ) {
 
 	add_filter( 'the_content', function ( $content ) use ( $quality, $strip ) {
 		if ( false !== strpos( $content, 'files.wordpress.com' ) ) {
-			$content = preg_replace_callback( '#https?://\w+\.files\.WordPress\.com[^\s"\'>]+#', function ( $matches ) use ( $quality, $strip ) {
+			// phpcs:ignore WordPress.WP.CapitalPDangit.MisspelledInText
+			$content = preg_replace_callback( '#https?://\w+\.files\.wordpress\.com[^\s"\'>]+#', function ( $matches ) use ( $quality, $strip ) {
 				return wpcom_vip_set_image_quality_for_url( $matches[0], $quality, $strip );
 			}, $content );
 		}
+7 −0		includes/classes/Feature/Facets/Block.php
+16 −0		includes/classes/Indexable.php