From 4150bcc937760b6a037e68755dd3e2dbe2c42912 Mon Sep 17 00:00:00 2001
From: Mehul-WP <mehul.gitech@gmail.com>
Date: Mon, 28 Oct 2024 18:28:24 +0530
Subject: [PATCH] Fixed undefine errors

---
 inc/class-addon-manager.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/inc/class-addon-manager.php b/inc/class-addon-manager.php
index aa73685a958..75a77137bbf 100644
--- a/inc/class-addon-manager.php
+++ b/inc/class-addon-manager.php
@@ -816,8 +816,8 @@ protected function get_site_information_default() {
 	 */
 	protected function map_site_information( $site_information ) {
 		return (object) [
-			'url'           => $site_information->url,
-			'subscriptions' => array_map( [ $this, 'map_subscription' ], $site_information->subscriptions ),
+			'url'           => $site_information->url ?? null,
+			'subscriptions' => array_map( [ $this, 'map_subscription' ], $site_information->subscriptions ?? [] ),
 		];
 	}
 
@@ -831,17 +831,16 @@ protected function map_site_information( $site_information ) {
 	protected function map_subscription( $subscription ) {
 		// phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase -- Not our properties.
 		return (object) [
-			'renewal_url' => $subscription->renewalUrl,
-			'expiry_date' => $subscription->expiryDate,
+			'renewal_url' => $subscription->renewalUrl ?? null,
+			'expiry_date' => $subscription->expiryDate ?? null,
 			'product'     => (object) [
-				'version'      => $subscription->product->version,
-				'name'         => $subscription->product->name,
-				'slug'         => $subscription->product->slug,
-				'last_updated' => $subscription->product->lastUpdated,
-				'store_url'    => $subscription->product->storeUrl,
-				// Ternary operator is necessary because download can be undefined.
-				'download'     => ( $subscription->product->download ?? null ),
-				'changelog'    => $subscription->product->changelog,
+				'version'      => $subscription->product->version ?? null,
+				'name'         => $subscription->product->name ?? null,
+				'slug'         => $subscription->product->slug ?? null,
+				'last_updated' => $subscription->product->lastUpdated ?? null,
+				'store_url'    => $subscription->product->storeUrl ?? null,
+				'download'     => $subscription->product->download ?? null,
+				'changelog'    => $subscription->product->changelog ?? null,
 			],
 		];
 		// phpcs:enable