Refactor package stage handling and update class structures for improved flexibility

Author: crazywhalecc

composer.json

@@ -13,6 +13,7 @@
         "ext-mbstring": "*",
         "ext-zlib": "*",
         "laravel/prompts": "~0.1",
+        "nette/php-generator": "^4.2",
         "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",

composer.lock

@@ -9,7 +9,7 @@
 use StaticPHP\Artifact\DownloaderOptions;
 use StaticPHP\Command\BaseCommand;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Package\PackageLoader;
+use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;

src/Package/Command/SwitchPhpVersionCommand.php

@@ -4,6 +4,7 @@
 
 namespace Package\Extension;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\AfterStage;
 use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\Extension;
@@ -15,7 +16,7 @@
 #[Extension('readline')]
 class readline
 {
-    #[BeforeStage('php', 'unix-make-cli', 'ext-readline')]
+    #[BeforeStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
     #[PatchDescription('Fix readline static build with musl')]
     public function beforeMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
     {
@@ -25,7 +26,7 @@ public function beforeMakeLinuxCli(PackageInstaller $installer, ToolchainInterfa
         }
     }
 
-    #[AfterStage('php', 'unix-make-cli', 'ext-readline')]
+    #[AfterStage('php', [php::class, 'makeCliForUnix'], 'ext-readline')]
     public function afterMakeLinuxCli(PackageInstaller $installer, ToolchainInterface $toolchain): void
     {
         if ($toolchain->isStatic()) {

src/Package/Extension/readline.php

@@ -4,6 +4,7 @@
 
 namespace Package\Library;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\AfterStage;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Attribute\PatchDescription;
@@ -13,7 +14,7 @@
 #[Library('imap')]
 class imap
 {
-    #[AfterStage('php', 'patch-embed-scripts', 'imap')]
+    #[AfterStage('php', [php::class, 'patchEmbedScripts'], 'imap')]
     #[PatchDescription('Fix missing -lcrypt in php-config libs on glibc systems')]
     public function afterPatchScripts(): void
     {

src/Package/Library/imap.php

@@ -14,7 +14,7 @@
 #[Library('libedit')]
 class libedit extends LibraryPackage
 {
-    #[BeforeStage('libedit', 'build')]
+    #[BeforeStage(stage: 'build')]
     public function patchBeforeBuild(): void
     {
         FileSystem::replaceFileRegex(

src/Package/Library/libedit.php

@@ -4,6 +4,7 @@
 
 namespace Package\Library;
 
+use Package\Target\php;
 use StaticPHP\Attribute\Package\BeforeStage;
 use StaticPHP\Attribute\Package\Library;
 use StaticPHP\Attribute\PatchDescription;
@@ -12,7 +13,7 @@
 #[Library('postgresql')]
 class postgresql
 {
-    #[BeforeStage('php', 'unix-configure', 'postgresql')]
+    #[BeforeStage('php', [php::class, 'configureForUnix'], 'postgresql')]
     #[PatchDescription('Patch to avoid explicit_bzero detection issues on some systems')]
     public function patchBeforePHPConfigure(TargetPackage $package): void
     {

src/Package/Library/postgresql.php

@@ -13,7 +13,7 @@
 #[Target('php-micro')]
 class micro
 {
-    #[BeforeStage('php', 'unix-make-embed', 'php-micro')]
+    #[BeforeStage('php', [php::class, 'makeEmbedForUnix'], 'php-micro')]
     #[PatchDescription('Patch Makefile to build only libphp.la for embedding')]
     public function patchBeforeEmbed(TargetPackage $package): void
     {