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

Enhance package download logic to handle binary-only packages and improve error messaging for installation failures

Browse Source
This commit is contained in:
crazywhalecc
2026-03-21 12:43:39 +08:00
parent bf4d227a55
commit 75dd01aa91
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/StaticPHP/Package/PackageInstaller.php
View File

@@ -168,10 +168,23 @@ class PackageInstaller
// check download // check download
if ($this->download) { if ($this->download) {
$downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->options, 'dl'); $downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->options, 'dl');
$downloader = new ArtifactDownloader( // Collect packages that have no build stage for current OS but do have a platform binary.
[...$downloaderOptions, 'source-only' => implode(',', array_map(fn ($x) => $x->getName(), $this->build_packages))], // These must always download binary (not source), regardless of global prefer-source setting.
$this->interactive $binary_only_packages = array_filter(
$this->packages,
fn ($p) => $p instanceof LibraryPackage
&& !$this->isBuildPackage($p)
&& !$p->hasStage('build')
&& ($p->getArtifact()?->hasPlatformBinary() ?? false)
); );
$dl_opts = [
...$downloaderOptions,
'source-only' => implode(',', array_map(fn ($x) => $x->getName(), $this->build_packages)),
];
if ($binary_only_packages !== []) {
$dl_opts['binary-only'] = implode(',', array_map(fn ($x) => $x->getName(), $binary_only_packages));
}
$downloader = new ArtifactDownloader($dl_opts, $this->interactive);
$downloader->addArtifacts($this->getArtifacts())->download(); $downloader->addArtifacts($this->getArtifacts())->download();
} else { } else {
logger()->notice('Skipping download (--no-download option enabled)'); logger()->notice('Skipping download (--no-download option enabled)');
@@ -716,10 +729,13 @@ class PackageInstaller
} }
$is_to_build = $this->isBuildPackage($package); $is_to_build = $this->isBuildPackage($package);
$has_build_stage = $package instanceof LibraryPackage && $package->hasStage('build'); $has_build_stage = $package instanceof LibraryPackage && $package->hasStage('build');
$should_use_binary = $package instanceof LibraryPackage && ($package->getArtifact()?->shouldUseBinary() ?? false); // Use hasPlatformBinary() here (not shouldUseBinary()) because this runs before download,
// so the binary is not yet on disk. We only need to know if a binary is declared for
// the current platform in the artifact config.
$has_platform_binary = $package instanceof LibraryPackage && ($package->getArtifact()?->hasPlatformBinary() ?? false);
// Check if package can neither be built nor installed // Check if package can neither be built nor installed
if (!$is_to_build && !$should_use_binary && !$has_build_stage) { if (!$is_to_build && !$has_platform_binary && !$has_build_stage) {
throw new WrongUsageException("Package '{$package->getName()}' cannot be installed: no build stage defined and no binary artifact available for current OS: " . SystemTarget::getCurrentPlatformString()); throw new WrongUsageException("Package '{$package->getName()}' cannot be installed: no build stage defined and no binary artifact available for current OS: " . SystemTarget::getCurrentPlatformString());
} }
} }