Add requirements check in CLI (#3410)

* Add requirements check in CLI

#fix https://github.com/FreshRSS/FreshRSS/issues/1853

* More checks

#fix https://github.com/FreshRSS/FreshRSS/issues/1853

12 files changed, 25 insertions, 4 deletions

diff --git a/app/actualize_script.php b/app/actualize_script.php
index 8bbc45e41..7df84b805 100755
--- a/app/actualize_script.php
+++ b/app/actualize_script.php
@@ -19,7 +19,6 @@ function notice($message) {
 session_cache_limiter('');
 ob_implicit_flush(false);
 ob_start();
-echo 'Results: ', "\n";	//Buffered
 
 $begin_date = date_create('now');
 
@@ -39,7 +38,11 @@ define('SIMPLEPIE_SYSLOG_ENABLED', FreshRSS_Context::$system_conf->simplepie_sys
 notice('FreshRSS starting feeds actualization at ' . $begin_date->format('c'));
 
 // make sure the PHP setup of the CLI environment is compatible with FreshRSS as well
+echo 'Failed requirements!', "\n";
 performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+ob_clean();
+
+echo 'Results: ', "\n";	//Buffered
 
 // Create the list of users to actualize.
 // Users are processed in a random order but always start with default user
diff --git a/cli/_cli.php b/cli/_cli.php
index 68a201ccb..112ab242e 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -54,13 +54,13 @@ function done($ok = true) {
 function performRequirementCheck($databaseType) {
 	$requirements = checkRequirements($databaseType);
 	if ($requirements['all'] !== 'ok') {
-		$message = 'FreshRSS install failed requirements:' . "\n";
+		$message = 'FreshRSS failed requirements:' . "\n";
 		foreach ($requirements as $requirement => $check) {
 			if ($check !== 'ok' && !in_array($requirement, array('all', 'pdo', 'message'))) {
 				$message .= '• ' . $requirement . "\n";
 			}
 		}
-		if (!empty($requirements['message'])) {
+		if (!empty($requirements['message']) && $requirements['message'] !== 'ok') {
 			$message .= '• ' . $requirements['message'] . "\n";
 		}
 		fail($message);
diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php
index 2b01fd011..9ccc0dce8 100644
--- a/cli/_update-or-create-user.php
+++ b/cli/_update-or-create-user.php
@@ -1,6 +1,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 		'user:',
 		'password:',
diff --git a/cli/actualize-user.php b/cli/actualize-user.php
index 6e514bf4e..347c9a953 100755
--- a/cli/actualize-user.php
+++ b/cli/actualize-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 );
diff --git a/cli/db-optimize.php b/cli/db-optimize.php
index 56064de5a..757b94ef6 100755
--- a/cli/db-optimize.php
+++ b/cli/db-optimize.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 );
diff --git a/cli/delete-user.php b/cli/delete-user.php
index 5e3eac90c..86424e9f7 100755
--- a/cli/delete-user.php
+++ b/cli/delete-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 );
diff --git a/cli/export-opml-for-user.php b/cli/export-opml-for-user.php
index c6977f0ef..2f728742a 100755
--- a/cli/export-opml-for-user.php
+++ b/cli/export-opml-for-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 );
diff --git a/cli/export-sqlite-for-user.php b/cli/export-sqlite-for-user.php
index 3f14b4e06..78c21ce1e 100755
--- a/cli/export-sqlite-for-user.php
+++ b/cli/export-sqlite-for-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = [
 	'user:',
 	'filename:',
diff --git a/cli/export-zip-for-user.php b/cli/export-zip-for-user.php
index 15ab94e5f..a650b10f4 100755
--- a/cli/export-zip-for-user.php
+++ b/cli/export-zip-for-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 	'max-feed-entries:',
diff --git a/cli/import-for-user.php b/cli/import-for-user.php
index 17b4812ba..2bfc1b842 100755
--- a/cli/import-for-user.php
+++ b/cli/import-for-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = array(
 	'user:',
 	'filename:',
diff --git a/cli/import-sqlite-for-user.php b/cli/import-sqlite-for-user.php
index dee0986f3..544a82a72 100755
--- a/cli/import-sqlite-for-user.php
+++ b/cli/import-sqlite-for-user.php
@@ -2,6 +2,8 @@
 <?php
 require(__DIR__ . '/_cli.php');
 
+performRequirementCheck(FreshRSS_Context::$system_conf->db['type']);
+
 $params = [
 	'user:',
 	'filename:',
diff --git a/lib/lib_install.php b/lib/lib_install.php
index 19b3274e3..f8b2ba969 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -68,7 +68,7 @@ function checkRequirements($dbType = '') {
 		'users' => $users ? 'ok' : 'ko',
 		'favicons' => $favicons ? 'ok' : 'ko',
 		'http_referer' => $http_referer ? 'ok' : 'ko',
-		'message' => $message ?: 'ok',
+		'message' => $message ?: '',
 		'all' => $php && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
 		         $data && $cache && $tmp && $users && $favicons && $http_referer && $message == '' ? 'ok' : 'ko'
 	);