crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-05 07:45:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor extension configuration and improve Windows build support

Browse Source
This commit is contained in:
crazywhalecc
2026-04-08 11:08:05 +08:00
parent 921870eaea
commit ee854eed41
12 changed files with 119 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/StaticPHP/Command/ResetCommand.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace StaticPHP\Command;
use StaticPHP\Runtime\Shell\Shell;
use StaticPHP\Util\FileSystem;
use StaticPHP\Util\InteractiveTerm;
use Symfony\Component\Console\Attribute\AsCommand;
@@ -87,20 +88,24 @@ class ResetCommand extends BaseCommand
// Try using PowerShell for force deletion
$escaped_path = escapeshellarg($path);
Shell::passthruCallback(fn () => InteractiveTerm::advance());
// Use PowerShell Remove-Item with -Force and -Recurse
$ps_cmd = "powershell -Command \"Remove-Item -Path {$escaped_path} -Recurse -Force -ErrorAction SilentlyContinue\"";
f_exec($ps_cmd, $output, $ret_code);
$result = cmd()->execWithResult("powershell -Command \"Remove-Item -Path {$escaped_path} -Recurse -Force -ErrorAction SilentlyContinue\"", false);
$ret_code = $result[0];
// If PowerShell fails or directory still exists, try cmd rmdir
if ($ret_code !== 0 || is_dir($path)) {
$cmd_command = "rmdir /s /q {$escaped_path}";
f_exec($cmd_command, $output, $ret_code);
$result = cmd()->execWithResult($cmd_command, false);
if ($result[0] === 0) {
return;
}
}
// Final fallback: use FileSystem::removeDir
if (is_dir($path)) {
FileSystem::removeDir($path);
}
Shell::passthruCallback(null);
}
}

2
src/StaticPHP/Config/ConfigValidator.php
View File

@@ -34,6 +34,7 @@ class ConfigValidator
'build-with-php' => ConfigType::BOOL,
'notes' => ConfigType::BOOL,
'display-name' => ConfigType::STRING,
'os' => ConfigType::LIST_ARRAY,
// library and target fields
'headers' => ConfigType::LIST_ARRAY, // @
@@ -88,6 +89,7 @@ class ConfigValidator
'build-with-php' => false,
'notes' => false,
'display-name' => false,
'os' => false,
];
public const array ARTIFACT_TYPE_FIELDS = [ // [required_fields, optional_fields]