From 774fbfd1aa3b96dce3fbd06413adeeb0e97a012f Mon Sep 17 00:00:00 2001
From: Robin Windey <ro.windey@gmail.com>
Date: Sat, 9 Apr 2022 11:52:03 +0000
Subject: [PATCH 1/3] Improve php extensions method

---
 lib/PhpStatistics.php        | 7 +++----
 templates/settings-admin.php | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/PhpStatistics.php b/lib/PhpStatistics.php
index 53e2a475..b8ebf15b 100644
--- a/lib/PhpStatistics.php
+++ b/lib/PhpStatistics.php
@@ -112,10 +112,9 @@ protected function getAPCuStatus(): array {
 	/**
 	 * Get all loaded php extensions
 	 *
-	 * @return string as csv list of loaded extensions
+	 * @return array of strings with the names of the loaded extensions
 	 */
-	protected function getLoadedPhpExtensions(): string {
-		$extensions = (function_exists('get_loaded_extensions') ? get_loaded_extensions() : ['Unable to list extensions']);
-		return implode(', ', $extensions);
+	protected function getLoadedPhpExtensions(): array {
+		return (function_exists('get_loaded_extensions') ? get_loaded_extensions() : ['Unable to list extensions']);
 	}
 }
diff --git a/templates/settings-admin.php b/templates/settings-admin.php
index e4c27130..e972f4de 100644
--- a/templates/settings-admin.php
+++ b/templates/settings-admin.php
@@ -283,7 +283,7 @@ class="barchart"
 						</p>
 						<p>
 							<?php p($l->t('Extensions:')); ?>
-							<em id="phpExtensions"><?php p($_['php']['extensions']); ?></em>
+							<em id="phpExtensions"><?php p(implode(', ', $_['php']['extensions'])); ?></em>
 						</p>
 					</div>
 				</div>

From 3e75536851bad74febabf862f0a7324cf7720dba Mon Sep 17 00:00:00 2001
From: Robin Windey <ro.windey@gmail.com>
Date: Sat, 9 Apr 2022 14:13:48 +0200
Subject: [PATCH 2/3] Update templates/settings-admin.php

Co-authored-by: Thomas Citharel <github@tcit.fr>
---
 templates/settings-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/settings-admin.php b/templates/settings-admin.php
index e972f4de..41695bd3 100644
--- a/templates/settings-admin.php
+++ b/templates/settings-admin.php
@@ -283,7 +283,7 @@ class="barchart"
 						</p>
 						<p>
 							<?php p($l->t('Extensions:')); ?>
-							<em id="phpExtensions"><?php p(implode(', ', $_['php']['extensions'])); ?></em>
+							<em id="phpExtensions"><?php p($_['php']['extensions'] !== null ? implode(', ', $_['php']['extensions']) : $l->t('Unable to list extensions')); ?></em>
 						</p>
 					</div>
 				</div>

From ce3f41b61dedc103fc1c392e3b6b2c9b202f9536 Mon Sep 17 00:00:00 2001
From: Robin Windey <ro.windey@gmail.com>
Date: Sat, 9 Apr 2022 14:13:55 +0200
Subject: [PATCH 3/3] Update lib/PhpStatistics.php

Co-authored-by: Thomas Citharel <github@tcit.fr>
---
 lib/PhpStatistics.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/PhpStatistics.php b/lib/PhpStatistics.php
index b8ebf15b..928d1ed2 100644
--- a/lib/PhpStatistics.php
+++ b/lib/PhpStatistics.php
@@ -114,7 +114,7 @@ protected function getAPCuStatus(): array {
 	 *
 	 * @return array of strings with the names of the loaded extensions
 	 */
-	protected function getLoadedPhpExtensions(): array {
-		return (function_exists('get_loaded_extensions') ? get_loaded_extensions() : ['Unable to list extensions']);
+	protected function getLoadedPhpExtensions(): ?array {
+		return (function_exists('get_loaded_extensions') ? get_loaded_extensions() : null);
 	}
 }