Fixes and improvements

Automattic · Aug 29, 2024 · 696be85 · 696be85
1 parent 7008ddf
commit 696be85
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/projects/packages/protect-models/src/class-status-model.php b/projects/packages/protect-models/src/class-status-model.php
@@ -54,11 +54,11 @@ class Status_Model {
 	public $status;
 
 	/**
-	 * Fixable threats.
+	 * List of fixable threat IDs.
 	 *
-	 * @var array
+	 * @var number[]
 	 */
-	public $fixable_threats = array();
+	public $fixable_threat_ids = array();
 
 	/**
 	 * WordPress core status.

diff --git a/projects/packages/protect-status/src/class-scan-status.php b/projects/packages/protect-status/src/class-scan-status.php
@@ -170,7 +170,7 @@ private static function normalize_api_data( $scan_data ) {
 		if ( isset( $scan_data->threats ) && is_array( $scan_data->threats ) ) {
 			foreach ( $scan_data->threats as $threat ) {
 				if ( isset( $threat->fixable ) && $threat->fixable ) {
-					$status->fixable_threats[] = $threat->id;
+					$status->fixable_threat_ids[] = $threat->id;
 				}
 
 				if ( isset( $threat->extension->type ) ) {

diff --git a/projects/packages/protect-status/tests/php/test-scan-status.php b/projects/packages/protect-status/tests/php/test-scan-status.php
@@ -134,7 +134,7 @@ public function get_sample_status() {
 				'num_plugins_threats' => 1,
 				'num_themes_threats'  => 0,
 				'status'              => 'idle',
-				'fixable_threats'     => array( '69353714' ),
+				'fixable_threat_ids'  => array( '69353714' ),
 				'plugins'             => array(
 					new Extension_Model(
 						array(

diff --git a/projects/plugins/protect/src/class-threats.php b/projects/plugins/protect/src/class-threats.php
@@ -144,7 +144,7 @@ public static function fix_threats( $threat_ids ) {
 	 * @return bool|array
 	 */
 	public static function fix_threats_status( $threat_ids ) {
-		if ( ! $threat_ids ) {
+		if ( empty( $threat_ids ) ) {
 			return false;
 		}