From b536d0c694f3fd3babb1ee44fffbd40de581dc22 Mon Sep 17 00:00:00 2001 From: henderkes Date: Mon, 27 Apr 2026 19:35:47 +0700 Subject: [PATCH] lint --- src/SPC/builder/Extension.php | 1 - src/SPC/builder/linux/LinuxBuilder.php | 10 +++++----- src/SPC/store/pkg/Zig.php | 5 ++--- src/SPC/util/PgoManager.php | 18 +++++++++--------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index b405612c..6b56f4e4 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -15,7 +15,6 @@ use SPC\toolchain\ToolchainManager; use SPC\toolchain\ZigToolchain; use SPC\util\GlobalEnvManager; use SPC\util\SPCConfigUtil; -use SPC\util\SPCTarget; class Extension { diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 3963c74e..770366ff 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -136,11 +136,11 @@ class LinuxBuilder extends UnixBuilderBase $pgo = PgoManager::active(); $needsClean = false; $sapiBuilds = [ - ['cli', $enableCli, true, fn () => $this->buildCli()], - ['fpm', $enableFpm, true, fn () => $this->buildFpm()], - ['cgi', $enableCgi, true, fn () => $this->buildCgi()], - ['micro', $enableMicro, true, fn () => $this->buildMicro()], - ['embed', $enableEmbed, true, function () use ($enableMicro): void { + ['cli', $enableCli, true, fn () => $this->buildCli()], + ['fpm', $enableFpm, true, fn () => $this->buildFpm()], + ['cgi', $enableCgi, true, fn () => $this->buildCgi()], + ['micro', $enableMicro, true, fn () => $this->buildMicro()], + ['embed', $enableEmbed, true, function () use ($enableMicro): void { if ($enableMicro) { FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la'); } diff --git a/src/SPC/store/pkg/Zig.php b/src/SPC/store/pkg/Zig.php index 5beba5bd..ffe46657 100644 --- a/src/SPC/store/pkg/Zig.php +++ b/src/SPC/store/pkg/Zig.php @@ -162,7 +162,7 @@ class Zig extends CustomPackage } $zig = "{$zig_bin_dir}/zig"; - $verLine = trim((string)shell_exec(escapeshellarg($zig) . ' cc --version 2>/dev/null')); + $verLine = trim((string) shell_exec(escapeshellarg($zig) . ' cc --version 2>/dev/null')); if (!preg_match('/clang version (\d+\.\d+\.\d+)/', $verLine, $m)) { logger()->warning('[zig] could not detect bundled clang version; skipping runtime bit build (--pgo + shared libs without __dso_handle)'); return; @@ -196,8 +196,7 @@ class Zig extends CustomPackage 'url' => $url, 'filename' => $tarball, ]); - } - catch (\Throwable $e) { + } catch (\Throwable $e) { logger()->warning("[zig] failed to download {$tarball}: {$e->getMessage()}"); return null; } diff --git a/src/SPC/util/PgoManager.php b/src/SPC/util/PgoManager.php index 57e2b3e9..91cee8e2 100644 --- a/src/SPC/util/PgoManager.php +++ b/src/SPC/util/PgoManager.php @@ -14,6 +14,10 @@ use SPC\store\FileSystem; */ class PgoManager { + public const MODE_INSTRUMENT = 'instrument'; + + public const MODE_USE = 'use'; + /** * SAPIs whose clang-compiled output can be PGO'd. frankenphp is included * because its cgo glue is C compiled by zig — the Go side it wraps is @@ -22,18 +26,14 @@ class PgoManager * frankenphp (because the cgo glue runs too). */ private const TRAINABLE = [ - 'cli' => BUILD_TARGET_CLI, - 'micro' => BUILD_TARGET_MICRO, - 'cgi' => BUILD_TARGET_CGI, - 'fpm' => BUILD_TARGET_FPM, - 'embed' => BUILD_TARGET_EMBED, + 'cli' => BUILD_TARGET_CLI, + 'micro' => BUILD_TARGET_MICRO, + 'cgi' => BUILD_TARGET_CGI, + 'fpm' => BUILD_TARGET_FPM, + 'embed' => BUILD_TARGET_EMBED, 'frankenphp' => BUILD_TARGET_FRANKENPHP, ]; - public const MODE_INSTRUMENT = 'instrument'; - - public const MODE_USE = 'use'; - private string $profileRoot; private string $mode;