From 01a1db85b1bcbd4f28ffff3d605593dabaea898a Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 16 Jul 2026 14:36:35 +0800 Subject: [PATCH] Add getResolvedPackageClosure method to DependencyResolver for improved package resolution --- src/Package/Extension/rdkafka.php | 3 +- src/Package/Extension/swoole.php | 3 +- src/Package/Library/krb5.php | 2 +- src/Package/Library/postgresql.php | 2 +- src/Package/Target/php/frankenphp.php | 5 +- src/Package/Target/php/unix.php | 4 +- src/Package/Target/php/windows.php | 2 +- src/StaticPHP/Package/LibraryPackage.php | 4 +- src/StaticPHP/Package/PhpExtensionPackage.php | 4 +- src/StaticPHP/Util/DependencyResolver.php | 46 +++ src/StaticPHP/Util/SPCConfigUtil.php | 262 +++++++++--------- .../Command/SPCConfigCommandTest.php | 79 ++++++ .../StaticPHP/Util/DependencyResolverTest.php | 33 +++ tests/StaticPHP/Util/SPCConfigUtilTest.php | 207 ++++++++++++++ 14 files changed, 512 insertions(+), 144 deletions(-) create mode 100644 tests/StaticPHP/Command/SPCConfigCommandTest.php create mode 100644 tests/StaticPHP/Util/SPCConfigUtilTest.php diff --git a/src/Package/Extension/rdkafka.php b/src/Package/Extension/rdkafka.php index 4bb28ee5..2a77ab61 100644 --- a/src/Package/Extension/rdkafka.php +++ b/src/Package/Extension/rdkafka.php @@ -49,7 +49,8 @@ class rdkafka extends PhpExtensionPackage #[CustomPhpConfigureArg('Linux')] public function getUnixConfigureArg(bool $shared, PackageBuilder $builder): string { - $pkgconf_libs = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true])->getExtensionConfig($this); + $pkgconf_libs = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]) + ->configForResolvedBuild([$this->getName()], $this->getInstaller()); return '--with-rdkafka=' . ($shared ? 'shared,' : '') . $builder->getBuildRootPath() . " RDKAFKA_LIBS=\"{$pkgconf_libs['libs']}\""; } } diff --git a/src/Package/Extension/swoole.php b/src/Package/Extension/swoole.php index 10fb1928..70ca033a 100644 --- a/src/Package/Extension/swoole.php +++ b/src/Package/Extension/swoole.php @@ -93,7 +93,8 @@ class swoole extends PhpExtensionPackage $arg .= $installer->getPhpExtensionPackage('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd'; $arg .= $installer->getPhpExtensionPackage('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite'; if ($installer->getPhpExtensionPackage('swoole-hook-odbc')) { - $config = new SPCConfigUtil()->getLibraryConfig($installer->getLibraryPackage('unixodbc')); + $config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]) + ->configForResolvedBuild(['unixodbc'], $installer); $arg .= " --with-swoole-odbc=unixODBC,{$builder->getBuildRootPath()} SWOOLE_ODBC_LIBS=\"{$config['libs']}\""; } diff --git a/src/Package/Library/krb5.php b/src/Package/Library/krb5.php index 1370afcc..428c6d9b 100644 --- a/src/Package/Library/krb5.php +++ b/src/Package/Library/krb5.php @@ -27,7 +27,7 @@ class krb5 $resolved = array_keys($installer->getResolvedPackages()); $spc = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]); - $config = $spc->getPackageDepsConfig($lib->getName(), $resolved, include_suggests: true); + $config = $spc->getPackageDepsConfig($lib->getName(), $resolved); $extraEnv = [ 'CFLAGS' => '-fcommon', 'LIBS' => $config['libs'], diff --git a/src/Package/Library/postgresql.php b/src/Package/Library/postgresql.php index 25d600e2..0d8c9ca7 100644 --- a/src/Package/Library/postgresql.php +++ b/src/Package/Library/postgresql.php @@ -129,7 +129,7 @@ class postgresql extends LibraryPackage public function buildUnix(PackageInstaller $installer, PackageBuilder $builder): void { $spc_config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]); - $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages()), include_suggests: $builder->getOption('with-suggests', false)); + $config = $spc_config->getPackageDepsConfig('postgresql', array_keys($installer->getResolvedPackages())); $env_vars = [ 'CFLAGS' => $config['cflags'] . ' -std=c17', diff --git a/src/Package/Target/php/frankenphp.php b/src/Package/Target/php/frankenphp.php index 854dc8cf..c2e67c2f 100644 --- a/src/Package/Target/php/frankenphp.php +++ b/src/Package/Target/php/frankenphp.php @@ -122,10 +122,7 @@ trait frankenphp $staticFlags = ''; } - $resolved = array_keys($installer->getResolvedPackages()); - // remove self from deps - $resolved = array_filter($resolved, fn ($pkg_name) => $pkg_name !== $package->getName()); - $config = new SPCConfigUtil()->config($resolved); + $config = new SPCConfigUtil()->configForResolvedBuild([$package->getName()], $installer); $cflags = "{$package->getLibExtraCFlags()} {$config['cflags']} " . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . " -DFRANKENPHP_VERSION={$frankenphp_version}"; $libs = $config['libs']; diff --git a/src/Package/Target/php/unix.php b/src/Package/Target/php/unix.php index 7dcc6d8b..e306647f 100644 --- a/src/Package/Target/php/unix.php +++ b/src/Package/Target/php/unix.php @@ -590,7 +590,7 @@ trait unix copy(ROOT_DIR . '/src/globals/common-tests/embed.c', $sample_file_path . '/embed.c'); copy(ROOT_DIR . '/src/globals/common-tests/embed.php', $sample_file_path . '/embed.php'); - $config = new SPCConfigUtil()->config($installer->getAvailableResolvedPackageNames()); + $config = new SPCConfigUtil()->configForResolvedBuild(['php'], $installer); $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}"; if ($toolchain->isStatic()) { $lens .= ' -static'; @@ -785,7 +785,7 @@ trait unix */ private function makeVars(PackageInstaller $installer): array { - $config = new SPCConfigUtil(['libs_only_deps' => true])->config($installer->getAvailableResolvedPackageNames()); + $config = new SPCConfigUtil(['libs_only_deps' => true])->configForResolvedBuild(['php'], $installer); $static = ApplicationContext::get(ToolchainInterface::class)->isStatic() ? '-all-static' : ''; $pie = SystemTarget::getTargetOS() === 'Linux' ? '-pie' : ''; diff --git a/src/Package/Target/php/windows.php b/src/Package/Target/php/windows.php index 915b1821..7bfcd53e 100644 --- a/src/Package/Target/php/windows.php +++ b/src/Package/Target/php/windows.php @@ -708,7 +708,7 @@ C_CODE; // Get build configuration using spc-config $util = new \StaticPHP\Util\SPCConfigUtil(); - $config = $util->config(array_map(fn ($x) => $x->getName(), $installer->getResolvedPackages())); + $config = $util->configForResolvedBuild(['php'], $installer); // Build the embed test executable using cl.exe // Note: MSVCToolchain already initialized the VC environment, no need for vcvarsall diff --git a/src/StaticPHP/Package/LibraryPackage.php b/src/StaticPHP/Package/LibraryPackage.php index cd8c626e..92cd627d 100644 --- a/src/StaticPHP/Package/LibraryPackage.php +++ b/src/StaticPHP/Package/LibraryPackage.php @@ -305,8 +305,8 @@ class LibraryPackage extends Package */ public function getStaticLibFiles(): string { - $config = new SPCConfigUtil(['libs_only_deps' => true, 'absolute_libs' => true]); - $res = $config->config([$this->getName()]); + $config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true, 'absolute_libs' => true]); + $res = $config->configForResolvedBuild([$this->getName()], $this->getInstaller()); return $res['libs']; } diff --git a/src/StaticPHP/Package/PhpExtensionPackage.php b/src/StaticPHP/Package/PhpExtensionPackage.php index fef88efd..68a5b8a3 100644 --- a/src/StaticPHP/Package/PhpExtensionPackage.php +++ b/src/StaticPHP/Package/PhpExtensionPackage.php @@ -274,13 +274,13 @@ class PhpExtensionPackage extends Package $compiler_extra = trim($compiler_extra . ' -lcompiler_rt'); GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}"); } - $config = (new SPCConfigUtil())->getExtensionConfig($this); + $config = (new SPCConfigUtil())->configForResolvedBuild([$this->getName()], $this->getInstaller()); [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']); $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group '; $postStatic = PHP_OS_FAMILY === 'Darwin' ? '' : ' -Wl,--end-group '; return [ 'CFLAGS' => $config['cflags'], - 'CXXFLAGS' => $config['cflags'], + 'CXXFLAGS' => $config['cxxflags'], 'LDFLAGS' => $config['ldflags'], 'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"), 'LD_LIBRARY_PATH' => BUILD_LIB_PATH, diff --git a/src/StaticPHP/Util/DependencyResolver.php b/src/StaticPHP/Util/DependencyResolver.php index 129468f9..9833e067 100644 --- a/src/StaticPHP/Util/DependencyResolver.php +++ b/src/StaticPHP/Util/DependencyResolver.php @@ -136,6 +136,52 @@ class DependencyResolver return $sorted; } + /** + * Get the link closure for one or more roots within an already-resolved package set. + * + * Both depends and suggests may be traversed, but only packages present in the + * resolved set are returned. Dependency overrides add build-specific graph edges, + * such as PHP's resolved static extensions and virtual SAPI targets. + * + * @param array $packages + * @param string[] $resolved_packages + * @param array $dependency_overrides + * @return string[] Packages in dependency order, including the roots + */ + public static function getResolvedPackageClosure( + array $packages, + array $resolved_packages, + array $dependency_overrides = [], + bool $include_suggests = true, + ): array { + $resolved_set = array_flip($resolved_packages); + $dep_map = []; + foreach ($resolved_packages as $package) { + $dep_map[$package] = [ + 'depends' => array_merge( + PackageConfig::get($package, 'depends', []), + $dependency_overrides[$package] ?? [], + ), + 'suggests' => PackageConfig::get($package, 'suggests', []), + ]; + } + + $visited = []; + $sorted = []; + foreach ($packages as $package) { + $name = is_string($package) ? $package : $package->getName(); + if (!PackageConfig::isPackageExists($name)) { + throw new WrongUsageException("Package '{$name}' does not exist in config, please check your package name !"); + } + if (!isset($resolved_set[$name])) { + throw new WrongUsageException("Package '{$name}' is not part of the resolved package set."); + } + self::visitSubDeps($name, $dep_map, $resolved_set, $include_suggests, $visited, $sorted); + } + + return $sorted; + } + /** * Build a reverse dependency map for the resolved packages. * For each package that is depended upon, list which packages depend on it. diff --git a/src/StaticPHP/Util/SPCConfigUtil.php b/src/StaticPHP/Util/SPCConfigUtil.php index 63b0e90e..3c9fa37d 100644 --- a/src/StaticPHP/Util/SPCConfigUtil.php +++ b/src/StaticPHP/Util/SPCConfigUtil.php @@ -7,7 +7,10 @@ namespace StaticPHP\Util; use StaticPHP\Config\PackageConfig; use StaticPHP\Exception\WrongUsageException; use StaticPHP\Package\LibraryPackage; +use StaticPHP\Package\Package; +use StaticPHP\Package\PackageInstaller; use StaticPHP\Package\PhpExtensionPackage; +use StaticPHP\Package\TargetPackage; use StaticPHP\Runtime\SystemTarget; class SPCConfigUtil @@ -32,95 +35,72 @@ class SPCConfigUtil $this->absolute_libs = $options['absolute_libs'] ?? false; } + /** + * Resolve a standalone package request and generate its configuration. + * + * This is the entry point for spc-config and callers that do not already have + * a PackageInstaller resolution result. + * + * @param array $packages + * @return array{cflags: string, cxxflags: string, ldflags: string, libs: string} + */ public function config(array $packages = [], bool $include_suggests = false): array { // if have php, make php as all extension's dependency + $package_names = array_map(fn ($package) => is_string($package) ? $package : $package->getName(), $packages); + $dep_override = $this->no_php + ? [] + : ['php' => array_values(array_filter($package_names, fn ($name) => str_starts_with($name, 'ext-')))]; + + return $this->configWithResolvedPackages( + DependencyResolver::resolve($packages, $dep_override, $include_suggests) + ); + } + + /** + * Build configuration for roots within the installer's resolved package graph. + * + * The installer decides whether suggested packages are enabled. This method always + * walks depends and suggests, then filters every edge through that resolved set. + * + * @param string[] $package_names Root package names whose link closure is required + * @return array{cflags: string, cxxflags: string, ldflags: string, libs: string} + */ + public function configForResolvedBuild(array $package_names, PackageInstaller $installer): array + { + $dependency_overrides = []; if (!$this->no_php) { - $dep_override = ['php' => array_filter($packages, fn ($y) => str_starts_with($y, 'ext-'))]; - } else { - $dep_override = []; - } - $resolved = DependencyResolver::resolve($packages, $dep_override, $include_suggests); - - $ldflags = $this->getLdflagsString(); - $cflags = $this->getIncludesString($resolved); - $libs = $this->getLibsString($resolved, !$this->absolute_libs); - - // additional OS-specific libraries (e.g. macOS -lresolv) - // embed - if ($extra_libs = SystemTarget::getRuntimeLibs()) { - $libs .= " {$extra_libs}"; - } - - $extra_env = getenv('SPC_EXTRA_LIBS'); - if (is_string($extra_env) && !empty($extra_env)) { - $libs .= " {$extra_env}"; - } - // package frameworks - if (SystemTarget::getTargetOS() === 'Darwin') { - $libs .= " {$this->getFrameworksString($resolved)}"; - } - // C++ - if ($this->hasCpp($resolved)) { - $target_os = SystemTarget::getTargetOS(); - if ($target_os === 'Darwin') { - $libcpp = '-lc++'; - $libs = str_replace($libcpp, '', $libs) . " {$libcpp}"; - } elseif ($target_os !== 'Windows') { - // Linux and other Unix-like systems use libstdc++ - $libcpp = '-lstdc++'; - $libs = str_replace($libcpp, '', $libs) . " {$libcpp}"; + $php_link_packages = []; + foreach ($installer->getResolvedPackages(PhpExtensionPackage::class) as $extension) { + if ($extension->isBuildStatic()) { + $php_link_packages[] = $extension->getName(); + } } - // Windows (MSVC): C++ runtime is linked automatically, no explicit lib needed - } - - if ($this->libs_only_deps) { - // mimalloc must come first - if (in_array('mimalloc', $resolved) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { - $libs = BUILD_LIB_PATH . '/libmimalloc.a ' . str_replace([BUILD_LIB_PATH . '/libmimalloc.a', '-lmimalloc'], ['', ''], $libs); + foreach ($installer->getResolvedPackages(TargetPackage::class) as $target) { + if ($target->isVirtualTarget()) { + $php_link_packages[] = $target->getName(); + } } - return [ - 'cflags' => clean_spaces(getenv('CFLAGS') . ' ' . $cflags), - 'ldflags' => clean_spaces(getenv('LDFLAGS') . ' ' . $ldflags), - 'libs' => clean_spaces(getenv('LIBS') . ' ' . $libs), - ]; + $dependency_overrides['php'] = $php_link_packages; } - // embed - if (!$this->no_php) { - if (SystemTarget::getTargetOS() === 'Windows') { - // Windows: use php8embed.lib directly (either full path or short name) - $major = intdiv(PHP_VERSION_ID, 10000); - $php_lib = $this->absolute_libs ? BUILD_LIB_PATH . "\\php{$major}embed.lib" : "php{$major}embed.lib"; - // Windows system libs required by PHP - // Use same system libs as PHP Makefile: LIBS=kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib psapi.lib bcrypt.lib - $libs = "{$php_lib} {$libs} kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib dnsapi.lib psapi.lib bcrypt.lib"; - } else { - $libs = "-lphp {$libs} -lc"; - } - } - - $allLibs = getenv('LIBS') . ' ' . $libs; - - // mimalloc must come first - if (in_array('mimalloc', $resolved) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { - $allLibs = BUILD_LIB_PATH . '/libmimalloc.a ' . str_replace([BUILD_LIB_PATH . '/libmimalloc.a', '-lmimalloc'], ['', ''], $allLibs); - } - - return [ - 'cflags' => clean_spaces(getenv('CFLAGS') . ' ' . $cflags), - 'ldflags' => clean_spaces(getenv('LDFLAGS') . ' ' . $ldflags), - 'libs' => clean_spaces($allLibs), - ]; + return $this->configWithResolvedPackages( + DependencyResolver::getResolvedPackageClosure( + $package_names, + array_keys($installer->getResolvedPackages()), + $dependency_overrides, + ) + ); } /** * [Helper function] * Get configuration for a specific extension(s) dependencies. * - * @param array|PhpExtensionPackage $extension_packages Extension instance or list + * @param PhpExtensionPackage|PhpExtensionPackage[] $extension_packages Extension instance or list * @return array{ * cflags: string, + * cxxflags: string, * ldflags: string, * libs: string * } @@ -131,7 +111,7 @@ class SPCConfigUtil $extension_packages = [$extension_packages]; } return $this->config( - packages: array_map(fn ($y) => $y->getName(), $extension_packages), + packages: array_map(fn ($extension_package) => $extension_package->getName(), $extension_packages), include_suggests: $include_suggests, ); } @@ -140,30 +120,33 @@ class SPCConfigUtil * [Helper function] * Get configuration for a specific library(s) dependencies. * - * @param array|LibraryPackage $lib Library instance or list - * @param bool $include_suggests Whether to include suggested libraries + * @param LibraryPackage|LibraryPackage[] $library_packages Library instance or list + * @param bool $include_suggests Whether to include suggested libraries * @return array{ * cflags: string, + * cxxflags: string, * ldflags: string, * libs: string * } */ - public function getLibraryConfig(array|LibraryPackage $lib, bool $include_suggests = false): array + public function getLibraryConfig(array|LibraryPackage $library_packages, bool $include_suggests = false): array { - if (!is_array($lib)) { - $lib = [$lib]; + if (!is_array($library_packages)) { + $library_packages = [$library_packages]; } $save_no_php = $this->no_php; $this->no_php = true; $save_libs_only_deps = $this->libs_only_deps; $this->libs_only_deps = true; - $ret = $this->config( - packages: array_map(fn ($y) => $y->getName(), $lib), - include_suggests: $include_suggests, - ); - $this->no_php = $save_no_php; - $this->libs_only_deps = $save_libs_only_deps; - return $ret; + try { + return $this->config( + packages: array_map(fn ($library_package) => $library_package->getName(), $library_packages), + include_suggests: $include_suggests, + ); + } finally { + $this->no_php = $save_no_php; + $this->libs_only_deps = $save_libs_only_deps; + } } /** @@ -173,23 +156,25 @@ class SPCConfigUtil * library and all its transitive dependencies. It properly handles optional * dependencies by only including those that were actually resolved. * - * @param string $package_name The package to get config for - * @param string[] $resolved_packages The full resolved package list - * @param bool $include_suggests Whether to include resolved suggests + * @param string $package_name The package to get config for + * @param string[] $resolved_package_names The full resolved package name list + * @param bool $include_suggests Whether to include resolved suggests * @return array{ * cflags: string, + * cxxflags: string, * ldflags: string, * libs: string * } */ - public function getPackageDepsConfig(string $package_name, array $resolved_packages, bool $include_suggests = false): array + public function getPackageDepsConfig(string $package_name, array $resolved_package_names, bool $include_suggests = true): array { // Get sub-dependencies within the resolved set - $sub_deps = DependencyResolver::getSubDependencies($package_name, $resolved_packages, $include_suggests); + $sub_deps = DependencyResolver::getSubDependencies($package_name, $resolved_package_names, $include_suggests); if (empty($sub_deps)) { return [ 'cflags' => '', + 'cxxflags' => '', 'ldflags' => '', 'libs' => '', ]; @@ -201,29 +186,36 @@ class SPCConfigUtil $this->no_php = true; $this->libs_only_deps = true; - $ret = $this->configWithResolvedPackages($sub_deps); - - $this->no_php = $save_no_php; - $this->libs_only_deps = $save_libs_only_deps; - - return $ret; + try { + return $this->configWithResolvedPackages($sub_deps); + } finally { + $this->no_php = $save_no_php; + $this->libs_only_deps = $save_libs_only_deps; + } } /** - * Get configuration using already-resolved packages (skip dependency resolution). + * Generate configuration from an exact, dependency-ordered package list. * - * @param string[] $resolved_packages Already resolved package names in build order + * This low-level method does not resolve dependencies or filter packages. + * + * @param string[] $resolved_package_names Already resolved package names in build order * @return array{ * cflags: string, + * cxxflags: string, * ldflags: string, * libs: string * } */ - public function configWithResolvedPackages(array $resolved_packages): array + public function configWithResolvedPackages(array $resolved_package_names): array { $ldflags = $this->getLdflagsString(); - $cflags = $this->getIncludesString($resolved_packages); - $libs = $this->getLibsString($resolved_packages, !$this->absolute_libs); + $includes = $this->getIncludesString($resolved_package_names); + $libs = $this->getLibsString($resolved_package_names, !$this->absolute_libs); + + $cflags = deduplicate_flags(clean_spaces((getenv('SPC_DEFAULT_CFLAGS') ?: '') . ' ' . getenv('CFLAGS') . ' ' . $includes)); + $cxxflags = deduplicate_flags(clean_spaces((getenv('SPC_DEFAULT_CXXFLAGS') ?: '') . ' ' . getenv('CXXFLAGS') . ' ' . $includes)); + $ldflags = deduplicate_flags(clean_spaces((getenv('SPC_DEFAULT_LDFLAGS') ?: '') . ' ' . getenv('LDFLAGS') . ' ' . $ldflags)); // additional OS-specific libraries (e.g. macOS -lresolv) if ($extra_libs = SystemTarget::getRuntimeLibs()) { @@ -237,11 +229,11 @@ class SPCConfigUtil // package frameworks if (SystemTarget::getTargetOS() === 'Darwin') { - $libs .= " {$this->getFrameworksString($resolved_packages)}"; + $libs .= " {$this->getFrameworksString($resolved_package_names)}"; } // C++ - if ($this->hasCpp($resolved_packages)) { + if ($this->hasCpp($resolved_package_names)) { $target_os = SystemTarget::getTargetOS(); if ($target_os === 'Darwin') { $libcpp = '-lc++'; @@ -256,40 +248,49 @@ class SPCConfigUtil if ($this->libs_only_deps) { // mimalloc must come first - if (in_array('mimalloc', $resolved_packages) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { + if (in_array('mimalloc', $resolved_package_names) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { $libs = BUILD_LIB_PATH . '/libmimalloc.a ' . str_replace([BUILD_LIB_PATH . '/libmimalloc.a', '-lmimalloc'], ['', ''], $libs); } return [ - 'cflags' => clean_spaces(getenv('CFLAGS') . ' ' . $cflags), - 'ldflags' => clean_spaces(getenv('LDFLAGS') . ' ' . $ldflags), + 'cflags' => $cflags, + 'cxxflags' => $cxxflags, + 'ldflags' => $ldflags, 'libs' => clean_spaces(getenv('LIBS') . ' ' . $libs), ]; } // embed if (!$this->no_php) { - $libs = "-lphp {$libs} -lc"; + if (SystemTarget::getTargetOS() === 'Windows') { + $major = intdiv(PHP_VERSION_ID, 10000); + $php_lib = $this->absolute_libs ? BUILD_LIB_PATH . "\\php{$major}embed.lib" : "php{$major}embed.lib"; + $libs = "{$php_lib} {$libs} kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib dnsapi.lib psapi.lib bcrypt.lib"; + } else { + $libs = "-lphp {$libs} -lc"; + } } $allLibs = getenv('LIBS') . ' ' . $libs; // mimalloc must come first - if (in_array('mimalloc', $resolved_packages) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { + if (in_array('mimalloc', $resolved_package_names) && file_exists(BUILD_LIB_PATH . '/libmimalloc.a')) { $allLibs = BUILD_LIB_PATH . '/libmimalloc.a ' . str_replace([BUILD_LIB_PATH . '/libmimalloc.a', '-lmimalloc'], ['', ''], $allLibs); } return [ - 'cflags' => clean_spaces(getenv('CFLAGS') . ' ' . $cflags), - 'ldflags' => clean_spaces(getenv('LDFLAGS') . ' ' . $ldflags), + 'cflags' => $cflags, + 'cxxflags' => $cxxflags, + 'ldflags' => $ldflags, 'libs' => clean_spaces($allLibs), ]; } - public function getFrameworksString(array $extensions): string + /** @param string[] $package_names */ + public function getFrameworksString(array $package_names): string { $list = []; - foreach ($extensions as $extension) { - foreach (PackageConfig::get($extension, 'frameworks', []) as $fw) { + foreach ($package_names as $package_name) { + foreach (PackageConfig::get($package_name, 'frameworks', []) as $fw) { $ks = '-framework ' . $fw; if (!in_array($ks, $list)) { $list[] = $ks; @@ -299,10 +300,11 @@ class SPCConfigUtil return implode(' ', $list); } - private function hasCpp(array $packages): bool + /** @param string[] $package_names */ + private function hasCpp(array $package_names): bool { - foreach ($packages as $package) { - $lang = PackageConfig::get($package, 'lang', 'c'); + foreach ($package_names as $package_name) { + $lang = PackageConfig::get($package_name, 'lang', 'c'); if ($lang === 'cpp') { return true; } @@ -310,7 +312,8 @@ class SPCConfigUtil return false; } - private function getIncludesString(array $packages): string + /** @param string[] $package_names */ + private function getIncludesString(array $package_names): string { $base = BUILD_INCLUDE_PATH; @@ -347,8 +350,8 @@ class SPCConfigUtil // parse pkg-configs (only for Unix) if (SystemTarget::isUnix()) { - foreach ($packages as $package) { - $pc = PackageConfig::get($package, 'pkg-configs', []); + foreach ($package_names as $package_name) { + $pc = PackageConfig::get($package_name, 'pkg-configs', []); $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: ''; $search_paths = array_filter(explode(':', $pkg_config_path)); foreach ($pc as $file) { @@ -360,7 +363,7 @@ class SPCConfigUtil } } if (!$found) { - throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$package}] does not exist. Please build it first."); + throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$package_name}] does not exist. Please build it first."); } } $pc_cflags = implode(' ', $pc); @@ -386,16 +389,17 @@ class SPCConfigUtil return '-L' . BUILD_LIB_PATH; } - private function getLibsString(array $packages, bool $use_short_libs = true): string + /** @param string[] $package_names */ + private function getLibsString(array $package_names, bool $use_short_libs = true): string { $lib_names = []; $frameworks = []; - foreach ($packages as $package) { + foreach ($package_names as $package_name) { // parse pkg-configs only for unix systems if (SystemTarget::isUnix()) { // add pkg-configs libs - $pkg_configs = PackageConfig::get($package, 'pkg-configs', []); + $pkg_configs = PackageConfig::get($package_name, 'pkg-configs', []); $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: ''; $search_paths = array_filter(explode(':', $pkg_config_path)); foreach ($pkg_configs as $pkg_config) { @@ -407,7 +411,7 @@ class SPCConfigUtil } } if (!$found) { - throw new WrongUsageException("pkg-config file '{$pkg_config}.pc' for lib [{$package}] does not exist. Please build it first."); + throw new WrongUsageException("pkg-config file '{$pkg_config}.pc' for lib [{$package_name}] does not exist. Please build it first."); } } $pkg_configs = implode(' ', $pkg_configs); @@ -418,12 +422,12 @@ class SPCConfigUtil } } // convert all static-libs to short names - $libs = array_reverse(PackageConfig::get($package, 'static-libs', [])); + $libs = array_reverse(PackageConfig::get($package_name, 'static-libs', [])); foreach ($libs as $lib) { if (FileSystem::isRelativePath($lib)) { // check file existence if (!file_exists(BUILD_LIB_PATH . "/{$lib}")) { - throw new WrongUsageException("Library file '{$lib}' for lib [{$package}] does not exist in '" . BUILD_LIB_PATH . "'. Please build it first."); + throw new WrongUsageException("Library file '{$lib}' for lib [{$package_name}] does not exist in '" . BUILD_LIB_PATH . "'. Please build it first."); } $lib_names[] = $this->getShortLibName($lib); } else { @@ -432,7 +436,7 @@ class SPCConfigUtil } // add frameworks for macOS if (SystemTarget::getTargetOS() === 'Darwin') { - $frameworks = array_merge($frameworks, PackageConfig::get($package, 'frameworks', [])); + $frameworks = array_merge($frameworks, PackageConfig::get($package_name, 'frameworks', [])); } } @@ -451,7 +455,7 @@ class SPCConfigUtil } } - if (in_array('imap', $packages) && SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'glibc') { + if (in_array('imap', $package_names) && SystemTarget::getTargetOS() === 'Linux' && SystemTarget::getLibc() === 'glibc') { if (file_exists(BUILD_LIB_PATH . '/libcrypt.a')) { $lib_names[] = '-lcrypt'; } diff --git a/tests/StaticPHP/Command/SPCConfigCommandTest.php b/tests/StaticPHP/Command/SPCConfigCommandTest.php new file mode 100644 index 00000000..3c0d9b85 --- /dev/null +++ b/tests/StaticPHP/Command/SPCConfigCommandTest.php @@ -0,0 +1,79 @@ +setPackageConfig([ + 'root' => [ + 'type' => 'library', + 'suggests' => ['optional'], + 'static-libs' => ['/fixtures/libroot.a'], + ], + 'optional' => [ + 'type' => 'library', + 'static-libs' => ['/fixtures/liboptional.a'], + ], + ]); + } + + protected function tearDown(): void + { + $this->setPackageConfig([]); + ApplicationContext::reset(); + logger()->setLevel(LogLevel::ERROR); + parent::tearDown(); + } + + public function testWithSuggestsOptionStillAffectsStandaloneCommand(): void + { + $withoutSuggests = $this->runCommand(false); + $withSuggests = $this->runCommand(true); + + $this->assertStringNotContainsString('/fixtures/liboptional.a', $withoutSuggests); + $this->assertStringContainsString('/fixtures/liboptional.a', $withSuggests); + } + + private function runCommand(bool $withSuggests): string + { + $application = new Application(); + $application->setAutoExit(false); + $application->add(new SPCConfigCommand()); + $tester = new CommandTester($application->find('spc-config')); + $input = [ + '--with-libs' => 'root', + '--libs-only-deps' => true, + '--no-php' => true, + '--no-ansi' => true, + ]; + if ($withSuggests) { + $input['--with-suggests'] = true; + } + $tester->execute($input); + + return $tester->getDisplay(); + } + + private function setPackageConfig(array $config): void + { + $reflection = new \ReflectionClass(PackageConfig::class); + $reflection->getProperty('package_configs')->setValue(null, $config); + } +} diff --git a/tests/StaticPHP/Util/DependencyResolverTest.php b/tests/StaticPHP/Util/DependencyResolverTest.php index b9098c66..ce137de7 100644 --- a/tests/StaticPHP/Util/DependencyResolverTest.php +++ b/tests/StaticPHP/Util/DependencyResolverTest.php @@ -412,6 +412,39 @@ class DependencyResolverTest extends TestCase $this->assertNotContains('c', $subDeps, 'c is not in the resolved set, should be excluded'); } + public function testGetResolvedPackageClosureFiltersSuggestsThroughResolvedSet(): void + { + $this->loadConfig([ + 'a' => ['type' => 'target', 'depends' => ['b'], 'suggests' => ['c']], + 'b' => ['type' => 'library'], + 'c' => ['type' => 'library'], + ]); + + $withoutSuggested = DependencyResolver::getResolvedPackageClosure(['a'], ['b', 'a']); + $withSuggested = DependencyResolver::getResolvedPackageClosure(['a'], ['b', 'c', 'a']); + + $this->assertSame(['b', 'a'], $withoutSuggested); + $this->assertSame(['b', 'c', 'a'], $withSuggested); + } + + public function testGetResolvedPackageClosureAppliesDependencyOverrides(): void + { + $this->loadConfig([ + 'php' => ['type' => 'target', 'depends' => ['libxml2']], + 'libxml2' => ['type' => 'library'], + 'ext-demo' => ['type' => 'php-extension', 'depends' => ['demo-lib']], + 'demo-lib' => ['type' => 'library'], + ]); + + $closure = DependencyResolver::getResolvedPackageClosure( + ['php'], + ['libxml2', 'demo-lib', 'ext-demo', 'php'], + ['php' => ['ext-demo']], + ); + + $this->assertSame(['libxml2', 'demo-lib', 'ext-demo', 'php'], $closure); + } + // ────────────────────────────────────────────── // Edge cases & defensive // ────────────────────────────────────────────── diff --git a/tests/StaticPHP/Util/SPCConfigUtilTest.php b/tests/StaticPHP/Util/SPCConfigUtilTest.php new file mode 100644 index 00000000..98710499 --- /dev/null +++ b/tests/StaticPHP/Util/SPCConfigUtilTest.php @@ -0,0 +1,207 @@ + */ + private array $savedEnv = []; + + protected function setUp(): void + { + parent::setUp(); + ApplicationContext::reset(); + $this->resetPackageConfig(); + foreach (['CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'LIBS', 'SPC_DEFAULT_CFLAGS', 'SPC_DEFAULT_CXXFLAGS', 'SPC_DEFAULT_LDFLAGS', 'SPC_EXTRA_LIBS'] as $name) { + $this->savedEnv[$name] = getenv($name); + } + } + + protected function tearDown(): void + { + foreach ($this->savedEnv as $name => $value) { + $value === false ? putenv($name) : putenv("{$name}={$value}"); + } + $this->resetPackageConfig(); + ApplicationContext::reset(); + parent::tearDown(); + } + + public function testStandaloneConfigStillControlsSuggestsDuringResolution(): void + { + $this->loadLinkFixture(); + $util = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]); + + $withoutSuggests = $util->config(['root']); + $withSuggests = $util->config(['root'], include_suggests: true); + + $this->assertStringContainsString('/fixtures/librequired.a', $withoutSuggests['libs']); + $this->assertStringNotContainsString('/fixtures/liboptional.a', $withoutSuggests['libs']); + $this->assertStringContainsString('/fixtures/liboptional.a', $withSuggests['libs']); + } + + public function testResolvedConfigIncludesOnlySuggestedPackagesThatWereResolved(): void + { + $this->loadLinkFixture(); + $util = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true]); + + $withoutOptional = $util->configForResolvedBuild(['root'], $this->createInstaller([ + 'required' => 'library', + 'root' => 'library', + ])); + $withOptional = $util->configForResolvedBuild(['root'], $this->createInstaller([ + 'required' => 'library', + 'optional' => 'library', + 'root' => 'library', + ])); + + $this->assertStringNotContainsString('/fixtures/liboptional.a', $withoutOptional['libs']); + $this->assertStringContainsString('/fixtures/liboptional.a', $withOptional['libs']); + } + + public function testResolvedConfigSupportsExplicitPhpLinkClosureOverrides(): void + { + $this->loadConfig([ + 'php' => ['type' => 'target', 'depends' => ['core']], + 'core' => ['type' => 'library', 'static-libs' => ['/fixtures/libcore.a']], + 'ext-demo' => ['type' => 'php-extension', 'depends' => ['ext-lib']], + 'ext-lib' => ['type' => 'library', 'static-libs' => ['/fixtures/libext.a']], + 'php-fpm' => ['type' => 'virtual-target', 'depends' => ['php'], 'suggests' => ['fpm-lib']], + 'fpm-lib' => ['type' => 'library', 'static-libs' => ['/fixtures/libfpm.a']], + ]); + $util = new SPCConfigUtil(['libs_only_deps' => true]); + + $config = $util->configForResolvedBuild(['php'], $this->createInstaller([ + 'core' => 'library', + 'ext-lib' => 'library', + 'ext-demo' => 'static-extension', + 'fpm-lib' => 'library', + 'php-fpm' => 'virtual-target', + 'php' => 'target', + ])); + + $this->assertStringContainsString('/fixtures/libcore.a', $config['libs']); + $this->assertStringContainsString('/fixtures/libext.a', $config['libs']); + $this->assertStringContainsString('/fixtures/libfpm.a', $config['libs']); + } + + public function testResolvedConfigRejectsRootOutsideResolvedSet(): void + { + $this->loadLinkFixture(); + + $this->expectException(WrongUsageException::class); + $this->expectExceptionMessage("Package 'root' is not part of the resolved package set"); + + new SPCConfigUtil(['no_php' => true])->configForResolvedBuild(['root'], $this->createInstaller([ + 'required' => 'library', + ])); + } + + public function testCAndCxxFlagsRemainIndependent(): void + { + putenv('SPC_DEFAULT_CFLAGS=-DDEFAULT_C'); + putenv('SPC_DEFAULT_CXXFLAGS=-DDEFAULT_CXX'); + putenv('SPC_DEFAULT_LDFLAGS=-Wl,default'); + putenv('CFLAGS=-DUSER_C'); + putenv('CXXFLAGS=-DUSER_CXX'); + putenv('LDFLAGS=-Wl,user'); + + $config = new SPCConfigUtil(['no_php' => true, 'libs_only_deps' => true])->configWithResolvedPackages([]); + + $this->assertStringContainsString('-DDEFAULT_C', $config['cflags']); + $this->assertStringContainsString('-DUSER_C', $config['cflags']); + $this->assertStringNotContainsString('-DDEFAULT_CXX', $config['cflags']); + $this->assertStringContainsString('-DDEFAULT_CXX', $config['cxxflags']); + $this->assertStringContainsString('-DUSER_CXX', $config['cxxflags']); + $this->assertStringContainsString('-Wl,default', $config['ldflags']); + $this->assertStringContainsString('-Wl,user', $config['ldflags']); + } + + private function loadLinkFixture(): void + { + $this->loadConfig([ + 'root' => [ + 'type' => 'library', + 'depends' => ['required'], + 'suggests' => ['optional'], + 'static-libs' => ['/fixtures/libroot.a'], + ], + 'required' => ['type' => 'library', 'static-libs' => ['/fixtures/librequired.a']], + 'optional' => ['type' => 'library', 'static-libs' => ['/fixtures/liboptional.a']], + ]); + } + + private function loadConfig(array $configs): void + { + $reflection = new \ReflectionClass(PackageConfig::class); + $property = $reflection->getProperty('package_configs'); + $property->setValue(null, $configs); + } + + private function resetPackageConfig(): void + { + $this->loadConfig([]); + } + + /** + * @param array $packages + */ + private function createInstaller(array $packages): PackageInstaller + { + $installer = new PackageInstaller(['no-tracker' => true], false); + $resolved = []; + foreach ($packages as $name => $type) { + $package = match ($type) { + 'static-extension' => $this->createStaticExtension($name), + 'target' => $this->createTarget($name, false), + 'virtual-target' => $this->createTarget($name, true), + default => $this->createNamedPackage(LibraryPackage::class, $name), + }; + $resolved[$name] = $package; + } + + $reflection = new \ReflectionClass(PackageInstaller::class); + $reflection->getProperty('packages')->setValue($installer, $resolved); + return $installer; + } + + private function createStaticExtension(string $name): PhpExtensionPackage + { + $extension = $this->createMock(PhpExtensionPackage::class); + $extension->method('getName')->willReturn($name); + $extension->method('isBuildStatic')->willReturn(true); + return $extension; + } + + private function createTarget(string $name, bool $virtual): TargetPackage + { + $target = $this->createMock(TargetPackage::class); + $target->method('getName')->willReturn($name); + $target->method('isVirtualTarget')->willReturn($virtual); + return $target; + } + + /** @param class-string $class */ + private function createNamedPackage(string $class, string $name): Package + { + $package = $this->createMock($class); + $package->method('getName')->willReturn($name); + return $package; + } +}