From 48aaba02964ae4096c45d742c089b9a49c4be444 Mon Sep 17 00:00:00 2001
From: Laurence Bahiirwa <laurence@freemius.com>
Date: Tue, 16 Apr 2024 19:13:36 +0300
Subject: [PATCH] [static-analysis] Fix php errors from static analysis.

---
 includes/class-freemius.php          | 7 ++++---
 includes/class-fs-plugin-updater.php | 2 +-
 includes/fs-plugin-info-dialog.php   | 2 +-
 templates/account.php                | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index fb8debae..870c247a 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -14300,15 +14300,15 @@ private function get_parent_and_addons_installs_info() {
                 $this->get_parent_instance() :
                 $this;
 
-            $installed_addons_ids_map = array();
+            $installed_addons_ids = array();
 
             $installed_addons_instances = $fs->get_installed_addons();
             foreach ( $installed_addons_instances as $instance ) {
-                $installed_addons_ids_map[] = $instance->get_id();
+                $installed_addons_ids[] = $instance->get_id();
             }
 
             $addons_ids = array_unique( array_merge(
-                $installed_addons_ids_map,
+                $installed_addons_ids,
                 $fs->get_updated_account_addons()
             ) );
 
@@ -14320,6 +14320,7 @@ private function get_parent_and_addons_installs_info() {
                 )
             );
 
+            $installed_addons_ids_map = array_flip( $installed_addons_ids );
             foreach ( $addons_ids as $addon_id ) {
                 $is_installed = isset( $installed_addons_ids_map[ $addon_id ] );
 
diff --git a/includes/class-fs-plugin-updater.php b/includes/class-fs-plugin-updater.php
index 2d112cda..4e14c6b7 100755
--- a/includes/class-fs-plugin-updater.php
+++ b/includes/class-fs-plugin-updater.php
@@ -1049,7 +1049,7 @@ function plugins_api_filter( $data, $action = '', $args = null ) {
                         false
                     );
 
-                    if ( is_array( $addon_plugin_data ) && $addon_plugin_data['Version'] ) {
+                    if ( is_array( $addon_plugin_data ) && isset( $addon_plugin_data['Version'] ) ) {
                         $addon_version = $addon_plugin_data['Version'];
                     }
                 }
diff --git a/includes/fs-plugin-info-dialog.php b/includes/fs-plugin-info-dialog.php
index 7183a71c..a57d348a 100755
--- a/includes/fs-plugin-info-dialog.php
+++ b/includes/fs-plugin-info-dialog.php
@@ -229,7 +229,7 @@ function _get_addon_info_filter( $data, $action = '', $args = null ) {
                         false
                     );
 
-                    if ( is_array( $addon_plugin_data ) && $addon_plugin_data['Version'] ) {
+                    if ( is_array( $addon_plugin_data ) && isset( $addon_plugin_data['Version'] ) ) {
                         $current_addon_version = $addon_plugin_data['Version'];
                     }
                 }
diff --git a/templates/account.php b/templates/account.php
index 1df94461..bc6f83e1 100755
--- a/templates/account.php
+++ b/templates/account.php
@@ -157,7 +157,7 @@
 
             $site_view_params[] = $view_params;
 
-            if ( null === $install ) {
+            if ( is_object( $install ) ) {
                 continue;
             }
 
@@ -186,6 +186,7 @@
 
     $bundle_subscription             = null;
     $is_bundle_first_payment_pending = false;
+    $bundle_plan_title               = '';
 
     if (
         $show_plan_row &&
@@ -468,11 +469,10 @@ class="dashicons dashicons-image-rotate"></i> <?php fs_esc_html_echo_x_inline( '
                                                     );
                                                 }
 											} else {
-                                                $bundle_title = ( $has_bundle_license ? ucfirst( $fs->get_module_type() ) : '' );
                                                 if ( $show_plan_row ) {
                                                     $profile[] = array(
                                                         'id'    => 'plan',
-                                                        'title' => $bundle_title . ' ' . $plan_text,
+                                                        'title' => ( $has_bundle_license ? ucfirst( $fs->get_module_type() ) . ' ' : '' ) . $plan_text,
                                                         'value' => strtoupper( is_string( $plan->name ) ?
                                                             $plan->title :
                                                             strtoupper( $free_text )
@@ -483,7 +483,7 @@ class="dashicons dashicons-image-rotate"></i> <?php fs_esc_html_echo_x_inline( '
                                                         $profile[] = array(
                                                             'id'    => 'bundle_plan',
                                                             'title' => $bundle_plan_text,
-                                                            'value' => $bundle_title
+                                                            'value' => $bundle_plan_title
                                                         );
                                                     }
                                                 }