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

Fix PHPStan errors

Browse Source
This commit is contained in:
crazywhalecc
2025-12-05 12:05:13 +08:00
committed by Jerry Ma
parent c925914925
commit 52553fb5ed
2 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/StaticPHP/Util/FileSystem.php
View File

@@ -370,17 +370,6 @@ class FileSystem
self::createDir($dir_name); self::createDir($dir_name);
} }
/**
* Add source extraction hook
*
* @param string $name Source name
* @param callable $callback Callback function
*/
public static function addSourceExtractHook(string $name, callable $callback): void
{
self::$_extract_hook[$name][] = $callback;
}
/** /**
* Check if path is relative * Check if path is relative
* *

29
src/StaticPHP/Util/SPCConfigUtil.php
View File

@@ -6,6 +6,8 @@ namespace StaticPHP\Util;
use StaticPHP\Config\PackageConfig; use StaticPHP\Config\PackageConfig;
use StaticPHP\Exception\WrongUsageException; use StaticPHP\Exception\WrongUsageException;
use StaticPHP\Package\LibraryPackage;
use StaticPHP\Package\PhpExtensionPackage;
use StaticPHP\Runtime\SystemTarget; use StaticPHP\Runtime\SystemTarget;
class SPCConfigUtil class SPCConfigUtil
@@ -99,26 +101,21 @@ class SPCConfigUtil
* [Helper function] * [Helper function]
* Get configuration for a specific extension(s) dependencies. * Get configuration for a specific extension(s) dependencies.
* *
* @param Extension|Extension[] $extension Extension instance or list * @param array|PhpExtensionPackage $extension_packages Extension instance or list
* @param bool $include_suggest_ext Whether to include suggested extensions
* @param bool $include_suggest_lib Whether to include suggested libraries
* @return array{ * @return array{
* cflags: string, * cflags: string,
* ldflags: string, * ldflags: string,
* libs: string * libs: string
* } * }
*/ */
public function getExtensionConfig(array|Extension $extension, bool $include_suggest_ext = false, bool $include_suggest_lib = false): array public function getExtensionConfig(array|PhpExtensionPackage $extension_packages, bool $include_suggests = false): array
{ {
if (!is_array($extension)) { if (!is_array($extension_packages)) {
$extension = [$extension]; $extension_packages = [$extension_packages];
} }
$libs = array_map(fn ($y) => $y->getName(), array_merge(...array_map(fn ($x) => $x->getLibraryDependencies(true), $extension)));
return $this->config( return $this->config(
extensions: array_map(fn ($x) => $x->getName(), $extension), packages: array_map(fn ($y) => $y->getName(), $extension_packages),
libraries: $libs, include_suggests: $include_suggests,
include_suggest_ext: $include_suggest_ext ?: $this->builder?->getOption('with-suggested-exts') ?? false,
include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false,
); );
} }
@@ -126,15 +123,15 @@ class SPCConfigUtil
* [Helper function] * [Helper function]
* Get configuration for a specific library(s) dependencies. * Get configuration for a specific library(s) dependencies.
* *
* @param LibraryBase|LibraryBase[] $lib Library instance or list * @param array|LibraryPackage $lib Library instance or list
* @param bool $include_suggest_lib Whether to include suggested libraries * @param bool $include_suggests Whether to include suggested libraries
* @return array{ * @return array{
* cflags: string, * cflags: string,
* ldflags: string, * ldflags: string,
* libs: string * libs: string
* } * }
*/ */
public function getLibraryConfig(array|LibraryBase $lib, bool $include_suggest_lib = false): array public function getLibraryConfig(array|LibraryPackage $lib, bool $include_suggests = false): array
{ {
if (!is_array($lib)) { if (!is_array($lib)) {
$lib = [$lib]; $lib = [$lib];
@@ -144,8 +141,8 @@ class SPCConfigUtil
$save_libs_only_deps = $this->libs_only_deps; $save_libs_only_deps = $this->libs_only_deps;
$this->libs_only_deps = true; $this->libs_only_deps = true;
$ret = $this->config( $ret = $this->config(
libraries: array_map(fn ($x) => $x->getName(), $lib), packages: array_map(fn ($y) => $y->getName(), $lib),
include_suggest_lib: $include_suggest_lib ?: $this->builder?->getOption('with-suggested-libs') ?? false, include_suggests: $include_suggests,
); );
$this->no_php = $save_no_php; $this->no_php = $save_no_php;
$this->libs_only_deps = $save_libs_only_deps; $this->libs_only_deps = $save_libs_only_deps;