crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow package implementation using parent class functions

Browse Source
This commit is contained in:
crazywhalecc 2025-12-08 17:01:29 +08:00
parent 78234ef147
commit 7b16f683fc
No known key found for this signature in database
GPG Key ID: 1F4BDD59391F2680
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/StaticPHP/Package/PackageLoader.php
View File

@ -143,8 +143,6 @@ class PackageLoader
} }
self::$loaded_classes[$class_name] = true; self::$loaded_classes[$class_name] = true;
$instance_class = $refClass->newInstance();
$attributes = $refClass->getAttributes(); $attributes = $refClass->getAttributes();
foreach ($attributes as $attribute) { foreach ($attributes as $attribute) {
$pkg = null; $pkg = null;
@ -160,6 +158,19 @@ class PackageLoader
if ($package_type === null) { if ($package_type === null) {
throw new WrongUsageException("Package [{$attribute_instance->name}] not defined in config, please check your config files."); throw new WrongUsageException("Package [{$attribute_instance->name}] not defined in config, please check your config files.");
} }
// if class has parent class and matches the attribute instance, use custom class
if ($refClass->getParentClass() !== false) {
if (is_a($class_name, Package::class, true)) {
self::$packages[$attribute_instance->name] = new $class_name($attribute_instance->name, $package_type);
$instance_class = self::$packages[$attribute_instance->name];
}
}
if (!isset($instance_class)) {
$instance_class = $refClass->newInstance();
}
$pkg = self::$packages[$attribute_instance->name]; $pkg = self::$packages[$attribute_instance->name];
// validate package type matches // validate package type matches
@ -272,9 +283,6 @@ class PackageLoader
private static function addBuildFunction(Package $pkg, object $attr, callable $fn): void private static function addBuildFunction(Package $pkg, object $attr, callable $fn): void
{ {
if (!$pkg instanceof LibraryPackage) {
throw new ValidationException("Class [{$pkg->getName()}] must implement LibraryPackage for BuildFor attribute.");
}
$pkg->addBuildFunction($attr->os, $fn); $pkg->addBuildFunction($attr->os, $fn);
} }
} }