Merge pull request #12837 from nextcloud/backport/12821/stable15

[stable15] Add setup check for recommended PHP modules (i.e. Imagick, intl)

2 files changed, 39 insertions, 13 deletions

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index c50781f1485..222b12b8f40 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -324,6 +324,19 @@
 							type: OC.SetupChecks.MESSAGE_TYPE_INFO
 						})
 					}
+					if (data.recommendedPHPModules.length > 0) {
+						var listOfRecommendedPHPModules = "";
+						data.recommendedPHPModules.forEach(function(element){
+							listOfRecommendedPHPModules += "<li>" + element + "</li>";
+						});
+						messages.push({
+							msg: t(
+								'core',
+								'This instance is missing some recommended PHP modules. For improved performance and better compatibility it is highly recommended to install them.'
+							) + "<ul><code>" + listOfRecommendedPHPModules + "</code></ul>",
+							type: OC.SetupChecks.MESSAGE_TYPE_INFO
+						})
+					}
 					if (data.isSqliteUsed) {
 						messages.push({
 							msg: t(
@@ -340,7 +353,7 @@
 							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
 						})
 					}
-					if (data.isPhpMailerUsed) {
+					if (data.isPHPMailerUsed) {
 						messages.push({
 							msg: t(
 								'core',
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index b8a2164de54..b6b127bae53 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -210,7 +210,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -259,7 +260,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -309,7 +311,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -357,7 +360,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -403,7 +407,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -451,7 +456,8 @@ describe('OC.SetupChecks tests', function() {
 					isMemoryLimitSufficient: true,
 					appDirsWithDifferentOwner: [
 						'/some/path'
-					]
+					],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -497,7 +503,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -543,7 +550,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -589,6 +597,7 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: [],
 					isMemoryLimitSufficient: false
 				})
 			);
@@ -656,7 +665,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -703,7 +713,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -750,7 +761,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);
 
@@ -797,7 +809,8 @@ describe('OC.SetupChecks tests', function() {
 						diffInSeconds: 0
 					},
 					isMemoryLimitSufficient: true,
-					appDirsWithDifferentOwner: []
+					appDirsWithDifferentOwner: [],
+					recommendedPHPModules: []
 				})
 			);