lkddi/nexusphp
1
0
Fork 0
mirror of https://github.com/lkddi/nexusphp.git synced 2026-05-01 01:27:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve pcntl function check

Browse Source
This commit is contained in:
xiaomlove
2023-06-15 21:29:05 +08:00
parent 0036c4ad28
commit ae77dfa0f6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/Test.php
+2 -3
View File
@@ -97,9 +97,8 @@ class Test extends Command
*/ */
public function handle() public function handle()
{ {
$r = executeCommand("php -m"); $r = executeCommand("php -r 'var_export(function_exists(\"pcntl_alarm\"));'");
$r = preg_split("/[\r\n]+/", $r); dd($r == 'true');
dd($r);
} }
} }
nexus/Install/Install.php
+8 -2
View File
@@ -38,7 +38,7 @@ class Install
]; ];
protected array $requiredFunctions = [ protected array $requiredFunctions = [
'symlink', 'putenv', 'proc_open', 'proc_get_status', 'exec', 'symlink', 'putenv', 'proc_open', 'proc_get_status', 'exec',
// 'pcntl_signal', 'pcntl_alarm', 'pcntl_async_signals' 'pcntl_signal', 'pcntl_alarm', 'pcntl_async_signals'
]; ];
protected string $lockFile = 'install.lock'; protected string $lockFile = 'install.lock';
@@ -168,7 +168,13 @@ class Install
$disabledFunctions = []; $disabledFunctions = [];
foreach ($this->requiredFunctions as $fn) { foreach ($this->requiredFunctions as $fn) {
if (!function_exists($fn)) { if (str_starts_with($fn, "pcntl_")) {
$phpPath = nexus_env('PHP_PATH') ?: 'php';
$exists = executeCommand("$phpPath -r 'var_export(function_exists(\"$fn\"));'") == 'true';
if (!$exists) {
$disabledFunctions[] = $fn;
}
} elseif (!function_exists($fn)) {
$disabledFunctions[] = $fn; $disabledFunctions[] = $fn;
} }
} }