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

Avoid useless exception on startup version mismatch

Browse Source
This commit is contained in:
crazywhalecc
2025-07-15 21:11:38 +08:00
parent a5d26d6517
commit 5f2459ae43
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/SPC/builder/BuilderBase.php
View File

@@ -333,16 +333,21 @@ abstract class BuilderBase
throw new RuntimeException('PHP version file format is malformed, please remove it and download again'); throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
} }
public function getPHPVersion(): string public function getPHPVersion(bool $exception_on_failure = true): string
{ {
if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) { if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
if (!$exception_on_failure) {
return 'unknown';
}
throw new WrongUsageException('PHP source files are not available, you need to download them first'); throw new WrongUsageException('PHP source files are not available, you need to download them first');
} }
$file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h'); $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
if (preg_match('/PHP_VERSION "(.*)"/', $file, $match) !== 0) { if (preg_match('/PHP_VERSION "(.*)"/', $file, $match) !== 0) {
return $match[1]; return $match[1];
} }
if (!$exception_on_failure) {
return 'unknown';
}
throw new RuntimeException('PHP version file format is malformed, please remove it and download again'); throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
} }
@@ -360,7 +365,7 @@ abstract class BuilderBase
} }
$file = LockFile::getLockFullPath($lock); $file = LockFile::getLockFullPath($lock);
} }
if (preg_match('/php-(\d+\.\d+\.\d+(?:RC\d+)?)\.tar\.(?:gz|bz2|xz)/', $file, $match)) { if (preg_match('/php-(\d+\.\d+\.\d+(?:RC\d+|alpha\d+|beta\d+)?)\.tar\.(?:gz|bz2|xz)/', $file, $match)) {
return $match[1]; return $match[1];
} }
return false; return false;

3
src/SPC/command/BuildPHPCommand.php
View File

@@ -159,7 +159,7 @@ class BuildPHPCommand extends BuildCommand
$indent_texts['UPX Pack'] = 'enabled'; $indent_texts['UPX Pack'] = 'enabled';
} }
$ver = $builder->getPHPVersionFromArchive() ?: $builder->getPHPVersion(); $ver = $builder->getPHPVersionFromArchive() ?: $builder->getPHPVersion(false);
$indent_texts['PHP Version'] = $ver; $indent_texts['PHP Version'] = $ver;
if (!empty($not_included)) { if (!empty($not_included)) {
@@ -269,6 +269,7 @@ class BuildPHPCommand extends BuildCommand
} catch (WrongUsageException $e) { } catch (WrongUsageException $e) {
// WrongUsageException is not an exception, it's a user error, so we just print the error message // WrongUsageException is not an exception, it's a user error, so we just print the error message
logger()->critical($e->getMessage()); logger()->critical($e->getMessage());
logger()->error($e->getTraceAsString());
return static::FAILURE; return static::FAILURE;
} catch (\Throwable $e) { } catch (\Throwable $e) {
if ($this->getOption('debug')) { if ($this->getOption('debug')) {