Merge pull request #32604 from nextcloud/backport/32575/stable23

blizzz · web-flow · commit 6d483c03920d · 2022-06-12T02:34:45.000+02:00
[stable23] Improve warning about missing pnctl
diff --git a/console.php b/console.php
@@ -84,8 +84,9 @@ function exceptionHandler($exception) {
 		exit(1);
 	}
 
-	if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {
+	if (!(function_exists('pcntl_signal') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) {
 		echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php" . PHP_EOL;
+		echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;
 	}
 
 	$application = new Application(

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,9 @@ function exceptionHandler($exception) {`
`84`	`84`	`exit(1);`
`85`	`85`	`}`
`86`	`86`
`87`		`- if (!function_exists('pcntl_signal') && !in_array('--no-warnings', $argv)) {`
	`87`	`+ if (!(function_exists('pcntl_signal') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) {`
`88`	`88`	`echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php" . PHP_EOL;`
	`89`	`+ echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL;`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`$application = new Application(`