Merge branch 'develop' into filip/v17/fix-nested-tooltip-button

Author: aristath

classes/suggested-tasks/providers/class-remove-terms-without-posts.php

@@ -206,23 +206,6 @@ protected function is_specific_task_completed( $task_id ) {
 		return $term ? self::MIN_POSTS < $term->count : true;
 	}
 
-	/**
-	 * Transform data collector data into task data format.
-	 *
-	 * @param array $data The data from data collector.
-	 * @return array The transformed data with original data merged.
-	 */
-	protected function transform_collector_data( array $data ): array {
-		return \array_merge(
-			$data,
-			[
-				'target_term_id'   => $data['term_id'],
-				'target_taxonomy'  => $data['taxonomy'],
-				'target_term_name' => $data['name'],
-			]
-		);
-	}
-
 	/**
 	 * Get an array of tasks to inject.
 	 *
@@ -236,11 +219,11 @@ public function get_tasks_to_inject() {
 			return [];
 		}
 
-		$data    = $this->get_data_collector()->collect();
+		$data    = $this->transform_collector_data( $this->get_data_collector()->collect() );
 		$task_id = $this->get_task_id(
 			[
-				'term_id'  => $data['term_id'],
-				'taxonomy' => $data['taxonomy'],
+				'target_term_id'  => $data['target_term_id'],
+				'target_taxonomy' => $data['target_taxonomy'],
 			]
 		);
 
@@ -251,7 +234,7 @@ public function get_tasks_to_inject() {
 		// Transform the data to match the task data structure.
 		$task_data = $this->modify_injection_task_data(
 			$this->get_task_details(
-				$this->transform_collector_data( $data )
+				$data
 			)
 		);
 

classes/suggested-tasks/providers/class-tasks.php

@@ -540,4 +540,28 @@ public function get_task_details( $task_data = [] ) {
 			'snoozable'    => $this->is_snoozable(),
 		];
 	}
+
+	/**
+	 * Transform data collector data into task data format.
+	 *
+	 * @param array $data The data from data collector.
+	 * @return array The transformed data with original data merged.
+	 */
+	protected function transform_collector_data( array $data ): array {
+		$transform_keys = [
+			'term_id'    => 'target_term_id',
+			'taxonomy'   => 'target_taxonomy',
+			'name'       => 'target_term_name',
+			'post_id'    => 'target_post_id',
+			'post_title' => 'target_post_title',
+		];
+
+		foreach ( $transform_keys as $key => $value ) {
+			if ( isset( $data[ $key ] ) ) {
+				$data[ $value ] = $data[ $key ];
+			}
+		}
+
+		return $data;
+	}
 }

classes/suggested-tasks/providers/class-update-term-description.php

@@ -189,23 +189,6 @@ protected function is_specific_task_completed( $task_id ) {
 		return '' !== $term_description && ' ' !== $term_description;
 	}
 
-	/**
-	 * Transform data collector data into task data format.
-	 *
-	 * @param array $data The data from data collector.
-	 * @return array The transformed data with original data merged.
-	 */
-	protected function transform_collector_data( array $data ): array {
-		return \array_merge(
-			$data,
-			[
-				'target_term_id'   => $data['term_id'],
-				'target_taxonomy'  => $data['taxonomy'],
-				'target_term_name' => $data['name'],
-			]
-		);
-	}
-
 	/**
 	 * Get an array of tasks to inject.
 	 *

classes/suggested-tasks/providers/integrations/yoast/class-fix-orphaned-content.php

@@ -147,22 +147,6 @@ protected function is_specific_task_completed( $task_id ) {
 		return 0 !== (int) $linked_count;
 	}
 
-	/**
-	 * Transform data collector data into task data format.
-	 *
-	 * @param array $data The data from data collector.
-	 * @return array The transformed data with original data merged.
-	 */
-	protected function transform_collector_data( array $data ): array {
-		return \array_merge(
-			$data,
-			[
-				'target_post_id'    => $data['post_id'],
-				'target_post_title' => $data['post_title'],
-			]
-		);
-	}
-
 	/**
 	 * Get an array of tasks to inject.
 	 *
@@ -173,10 +157,10 @@ public function get_tasks_to_inject() {
 			return [];
 		}
 
-		$data    = $this->get_data_collector()->collect();
+		$data    = $this->transform_collector_data( $this->get_data_collector()->collect() );
 		$task_id = $this->get_task_id(
 			[
-				'post_id' => $data['post_id'],
+				'target_post_id' => $data['target_post_id'],
 			]
 		);
 
@@ -188,7 +172,7 @@ public function get_tasks_to_inject() {
 		// Transform the data to match the task data structure.
 		$task_data = $this->modify_injection_task_data(
 			$this->get_task_details(
-				$this->transform_collector_data( $data )
+				$data
 			)
 		);