fix configutil

This commit is contained in:
henderkes 2025-09-30 00:34:30 +02:00
parent 5b6c923eef
commit f7744188f4

View File

@ -7,7 +7,6 @@ namespace SPC\util;
use SPC\builder\BuilderBase; use SPC\builder\BuilderBase;
use SPC\builder\BuilderProvider; use SPC\builder\BuilderProvider;
use SPC\builder\Extension; use SPC\builder\Extension;
use SPC\builder\LibraryBase;
use SPC\exception\WrongUsageException; use SPC\exception\WrongUsageException;
use SPC\store\Config; use SPC\store\Config;
use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\ArgvInput;
@ -129,8 +128,7 @@ class SPCConfigUtil
{ {
// judge cpp-extension // judge cpp-extension
$builderExtNames = array_keys($this->builder->getExts(false)); $builderExtNames = array_keys($this->builder->getExts(false));
$extNames = array_map(fn (Extension $x) => $x->getName(), $extensions); $exts = array_unique([...$builderExtNames, ...$extensions]);
$exts = array_unique([...$builderExtNames, ...$extNames]);
foreach ($exts as $ext) { foreach ($exts as $ext) {
if (Config::getExt($ext, 'cpp-extension', false) === true) { if (Config::getExt($ext, 'cpp-extension', false) === true) {
@ -138,8 +136,7 @@ class SPCConfigUtil
} }
} }
$builderLibNames = array_keys($this->builder->getLibs()); $builderLibNames = array_keys($this->builder->getLibs());
$libNames = array_map(fn (LibraryBase $x) => $x->getName(), $libraries); $libs = array_unique([...$builderLibNames, ...$libraries]);
$libs = array_unique([...$builderLibNames, ...$libNames]);
foreach ($libs as $lib) { foreach ($libs as $lib) {
if (Config::getLib($lib, 'cpp-library', false) === true) { if (Config::getLib($lib, 'cpp-library', false) === true) {
return true; return true;