mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-07-12 11:25:35 +08:00
Merge remote-tracking branch 'origin/v3-feat/check-update' into v3-feat/check-update
This commit is contained in:
@@ -169,7 +169,7 @@ class ArtifactCache
|
||||
throw new SPCInternalException("Invalid lock type '{$lock_type}' for artifact {$artifact_name}");
|
||||
}
|
||||
// save cache to file
|
||||
file_put_contents($this->cache_file, json_encode($this->cache, JSON_PRETTY_PRINT));
|
||||
file_put_contents($this->cache_file, json_encode($this->cache, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -287,7 +287,7 @@ class ArtifactCache
|
||||
*/
|
||||
public function save(): void
|
||||
{
|
||||
file_put_contents($this->cache_file, json_encode($this->cache, JSON_PRETTY_PRINT));
|
||||
file_put_contents($this->cache_file, json_encode($this->cache, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
|
||||
}
|
||||
|
||||
private function isObjectDownloaded(?array $object, bool $compare_hash = false): bool
|
||||
|
||||
@@ -22,7 +22,7 @@ class Git implements DownloadTypeInterface, CheckUpdateInterface
|
||||
if (isset($config['rev'])) {
|
||||
default_shell()->executeGitClone($config['url'], $config['rev'], $path, $shallow, $config['submodules'] ?? null);
|
||||
$shell = PHP_OS_FAMILY === 'Windows' ? cmd(false) : shell(false);
|
||||
$hash_result = $shell->execWithResult(SPC_GIT_EXEC . ' -C ' . escapeshellarg($path) . ' rev-parse HEAD');
|
||||
$hash_result = $shell->execWithResult(SPC_GIT_EXEC . ' -C ' . escapeshellarg($path) . ' rev-parse --short HEAD');
|
||||
$hash = ($hash_result[0] === 0 && !empty($hash_result[1])) ? trim($hash_result[1][0]) : '';
|
||||
$version = $hash !== '' ? "dev-{$config['rev']}+{$hash}" : "dev-{$config['rev']}";
|
||||
return DownloadResult::git($name, $config, extract: $config['extract'] ?? null, version: $version, downloader: static::class);
|
||||
@@ -80,7 +80,7 @@ class Git implements DownloadTypeInterface, CheckUpdateInterface
|
||||
if ($result[0] !== 0 || empty($result[1])) {
|
||||
throw new DownloaderException("Failed to ls-remote from {$config['url']}");
|
||||
}
|
||||
$new_hash = substr($result[1][0], 0, 40);
|
||||
$new_hash = substr($result[1][0], 0, 7);
|
||||
$new_version = "dev-{$config['rev']}+{$new_hash}";
|
||||
// Extract stored hash from "dev-{rev}+{hash}", null if bare mode or old format without hash
|
||||
$old_hash = ($old_version !== null && str_contains($old_version, '+')) ? substr(strrchr($old_version, '+'), 1) : null;
|
||||
|
||||
79
src/StaticPHP/Artifact/Downloader/Type/PECL.php
Normal file
79
src/StaticPHP/Artifact/Downloader/Type/PECL.php
Normal file
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace StaticPHP\Artifact\Downloader\Type;
|
||||
|
||||
use StaticPHP\Artifact\ArtifactDownloader;
|
||||
use StaticPHP\Artifact\Downloader\DownloadResult;
|
||||
use StaticPHP\Exception\DownloaderException;
|
||||
|
||||
/* pecl */
|
||||
class PECL implements DownloadTypeInterface, CheckUpdateInterface
|
||||
{
|
||||
private const string PECL_BASE_URL = 'https://pecl.php.net';
|
||||
|
||||
/** REST API: returns XML with <r><v>VERSION</v><s>STATE</s></r> per release */
|
||||
private const string PECL_REST_URL = 'https://pecl.php.net/rest/r/%s/allreleases.xml';
|
||||
|
||||
public function checkUpdate(string $name, array $config, ?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
|
||||
{
|
||||
[, $version] = $this->fetchPECLInfo($name, $config, $downloader);
|
||||
return new CheckUpdateResult(
|
||||
old: $old_version,
|
||||
new: $version,
|
||||
needUpdate: $old_version === null || version_compare($version, $old_version, '>'),
|
||||
);
|
||||
}
|
||||
|
||||
public function download(string $name, array $config, ArtifactDownloader $downloader): DownloadResult
|
||||
{
|
||||
[$filename, $version] = $this->fetchPECLInfo($name, $config, $downloader);
|
||||
$url = self::PECL_BASE_URL . '/get/' . $filename;
|
||||
$path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
|
||||
logger()->debug("Downloading {$name} from URL: {$url}");
|
||||
default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
|
||||
$extract = $config['extract'] ?? ('php-src/ext/' . $this->getExtractName($name));
|
||||
return DownloadResult::archive($filename, $config, $extract, version: $version, downloader: static::class);
|
||||
}
|
||||
|
||||
protected function fetchPECLInfo(string $name, array $config, ArtifactDownloader $downloader): array
|
||||
{
|
||||
$peclName = strtolower($config['name'] ?? $this->getExtractName($name));
|
||||
$url = sprintf(self::PECL_REST_URL, $peclName);
|
||||
logger()->debug("Fetching PECL release list for {$name} from REST API");
|
||||
$xml = default_shell()->executeCurl($url, retries: $downloader->getRetry());
|
||||
if ($xml === false) {
|
||||
throw new DownloaderException("Failed to fetch PECL release list for {$name}");
|
||||
}
|
||||
// Match <r><v>VERSION</v><s>STATE</s></r>
|
||||
preg_match_all('/<r><v>(?P<version>[^<]+)<\/v><s>(?P<state>[^<]+)<\/s><\/r>/', $xml, $matches);
|
||||
if (empty($matches['version'])) {
|
||||
throw new DownloaderException("Failed to parse PECL release list for {$name}");
|
||||
}
|
||||
$versions = [];
|
||||
logger()->debug('Matched ' . count($matches['version']) . " releases for {$name} from PECL");
|
||||
foreach ($matches['version'] as $i => $version) {
|
||||
if ($matches['state'][$i] !== 'stable') {
|
||||
continue;
|
||||
}
|
||||
$versions[$version] = $peclName . '-' . $version . '.tgz';
|
||||
}
|
||||
if (empty($versions)) {
|
||||
throw new DownloaderException("No stable releases found for {$name} on PECL");
|
||||
}
|
||||
uksort($versions, 'version_compare');
|
||||
$filename = end($versions);
|
||||
$version = array_key_last($versions);
|
||||
return [$filename, $version, $versions];
|
||||
}
|
||||
|
||||
/**
|
||||
* Derive the lowercase PECL package / extract name from the artifact name.
|
||||
* e.g. "ext-apcu" -> "apcu", "ext-ast" -> "ast"
|
||||
*/
|
||||
private function getExtractName(string $name): string
|
||||
{
|
||||
return strtolower(preg_replace('/^ext-/i', '', $name));
|
||||
}
|
||||
}
|
||||
@@ -10,9 +10,15 @@ use StaticPHP\Exception\DownloaderException;
|
||||
|
||||
class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpdateInterface
|
||||
{
|
||||
public const string PHP_API = 'https://www.php.net/releases/index.php?json&version={version}';
|
||||
public const string DEFAULT_PHP_DOMAIN = 'https://www.php.net';
|
||||
|
||||
public const string DOWNLOAD_URL = 'https://www.php.net/distributions/php-{version}.tar.xz';
|
||||
public const string API_URL = '/releases/index.php?json&version={version}';
|
||||
|
||||
public const string DOWNLOAD_URL = '/distributions/php-{version}.tar.xz';
|
||||
|
||||
public const string GIT_URL = 'https://github.com/php/php-src.git';
|
||||
|
||||
public const string GIT_REV = 'master';
|
||||
|
||||
private ?string $sha256 = '';
|
||||
|
||||
@@ -22,9 +28,9 @@ class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpda
|
||||
// Handle 'git' version to clone from php-src repository
|
||||
if ($phpver === 'git') {
|
||||
$this->sha256 = null;
|
||||
return (new Git())->download($name, ['url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $downloader);
|
||||
return (new Git())->download($name, ['url' => self::GIT_URL, 'rev' => self::GIT_REV], $downloader);
|
||||
}
|
||||
$info = $this->fetchPhpReleaseInfo($name, $downloader);
|
||||
$info = $this->fetchPhpReleaseInfo($name, $config, $downloader);
|
||||
$version = $info['version'];
|
||||
foreach ($info['source'] as $source) {
|
||||
if (str_ends_with($source['filename'], '.tar.xz')) {
|
||||
@@ -36,7 +42,8 @@ class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpda
|
||||
if (!isset($filename)) {
|
||||
throw new DownloaderException("No suitable source tarball found for PHP version {$version}");
|
||||
}
|
||||
$url = str_replace('{version}', $version, self::DOWNLOAD_URL);
|
||||
$url = $config['domain'] ?? self::DEFAULT_PHP_DOMAIN;
|
||||
$url .= str_replace('{version}', $version, self::DOWNLOAD_URL);
|
||||
logger()->debug("Downloading PHP release {$version} from {$url}");
|
||||
$path = DOWNLOAD_PATH . "/{$filename}";
|
||||
default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
|
||||
@@ -72,7 +79,7 @@ class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpda
|
||||
// git version: delegate to Git checkUpdate with master branch
|
||||
return (new Git())->checkUpdate($name, ['url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $old_version, $downloader);
|
||||
}
|
||||
$info = $this->fetchPhpReleaseInfo($name, $downloader);
|
||||
$info = $this->fetchPhpReleaseInfo($name, $config, $downloader);
|
||||
$new_version = $info['version'];
|
||||
return new CheckUpdateResult(
|
||||
old: $old_version,
|
||||
@@ -81,7 +88,7 @@ class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpda
|
||||
);
|
||||
}
|
||||
|
||||
protected function fetchPhpReleaseInfo(string $name, ArtifactDownloader $downloader): array
|
||||
protected function fetchPhpReleaseInfo(string $name, array $config, ArtifactDownloader $downloader): array
|
||||
{
|
||||
$phpver = $downloader->getOption('with-php', '8.4');
|
||||
// Handle 'git' version to clone from php-src repository
|
||||
@@ -90,8 +97,13 @@ class PhpRelease implements DownloadTypeInterface, ValidatorInterface, CheckUpda
|
||||
throw new DownloaderException("Cannot fetch PHP release info for 'git' version.");
|
||||
}
|
||||
|
||||
$url = $config['domain'] ?? self::DEFAULT_PHP_DOMAIN;
|
||||
$url .= self::API_URL;
|
||||
$url = str_replace('{version}', $phpver, $url);
|
||||
logger()->debug("Fetching PHP release info for version {$phpver} from {$url}");
|
||||
|
||||
// Fetch PHP release info first
|
||||
$info = default_shell()->executeCurl(str_replace('{version}', $phpver, self::PHP_API), retries: $downloader->getRetry());
|
||||
$info = default_shell()->executeCurl($url, retries: $downloader->getRetry());
|
||||
if ($info === false) {
|
||||
throw new DownloaderException("Failed to fetch PHP release info for version {$phpver}");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user