Vendor mode in a custom project, with custom extensions

src/SPC/ConsoleApplication.php

@@ -30,7 +30,7 @@
 /**
  * static-php-cli console app entry
  */
-final class ConsoleApplication extends Application
+class ConsoleApplication extends Application
 {
     public const VERSION = '2.5.1';
 

src/SPC/builder/BuilderProvider.php

@@ -20,6 +20,16 @@ class BuilderProvider
 {
     private static ?BuilderBase $builder = null;
 
+    private static ?\Closure $customizeBuilder = null;
+
+    /**
+     * @param \Closure(BuilderBase): void $callback
+     */
+    public static function customize(\Closure $callback): void
+    {
+        self::$customizeBuilder = $callback;
+    }
+
     /**
      * @throws FileSystemException
      * @throws RuntimeException
@@ -36,6 +46,10 @@ public static function makeBuilderByInput(InputInterface $input): BuilderBase
             'BSD' => new BSDBuilder($input->getOptions()),
             default => throw new WrongUsageException('Current OS "' . PHP_OS_FAMILY . '" is not supported yet'),
         };
+        // allow to add/customize builder instance early
+        if (self::$customizeBuilder) {
+            call_user_func_array(self::$customizeBuilder, [&self::$builder]);
+        }
         return self::$builder;
     }
 

src/SPC/builder/unix/UnixBuilderBase.php

@@ -98,6 +98,12 @@ public function proveLibs(array $sorted_libraries): void
             ROOT_DIR . '/src/SPC/builder/' . osfamily2dir() . '/library',
             'SPC\builder\\' . osfamily2dir() . '\library'
         );
+        if (file_exists(WORKING_DIR . '/src/builder/' . osfamily2dir() . '/library')) {
+            $classes = array_merge($classes, FileSystem::getClassesPsr4(
+                WORKING_DIR . '/src/builder/' . osfamily2dir() . '/library',
+                'App\builder\\' . osfamily2dir() . '\library'
+            ));
+        }
         foreach ($classes as $class) {
             if (defined($class . '::NAME') && $class::NAME !== 'unknown' && Config::getLib($class::NAME) !== null) {
                 $support_lib_list[$class::NAME] = $class;

src/SPC/builder/windows/WindowsBuilder.php

@@ -110,18 +110,18 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
         cmd()->cd(SOURCE_PATH . '\php-src')
             ->exec(
                 "{$this->sdk_prefix} configure.bat --task-args \"" .
-                '--disable-all ' .
-                '--disable-cgi ' .
-                '--with-php-build=' . BUILD_ROOT_PATH . ' ' .
-                '--with-extra-includes=' . BUILD_INCLUDE_PATH . ' ' .
-                '--with-extra-libs=' . BUILD_LIB_PATH . ' ' .
-                ($enableCli ? '--enable-cli=yes ' : '--enable-cli=no ') .
-                ($enableMicro ? ('--enable-micro=yes ' . $micro_logo . $micro_w32) : '--enable-micro=no ') .
-                ($enableEmbed ? '--enable-embed=yes ' : '--enable-embed=no ') .
-                $config_file_scan_dir .
-                "{$this->makeExtensionArgs()} " .
-                $zts .
-                '"'
+                    '--disable-all ' .
+                    '--disable-cgi ' .
+                    '--with-php-build=' . BUILD_ROOT_PATH . ' ' .
+                    '--with-extra-includes=' . BUILD_INCLUDE_PATH . ' ' .
+                    '--with-extra-libs=' . BUILD_LIB_PATH . ' ' .
+                    ($enableCli ? '--enable-cli=yes ' : '--enable-cli=no ') .
+                    ($enableMicro ? ('--enable-micro=yes ' . $micro_logo . $micro_w32) : '--enable-micro=no ') .
+                    ($enableEmbed ? '--enable-embed=yes ' : '--enable-embed=no ') .
+                    $config_file_scan_dir .
+                    "{$this->makeExtensionArgs()} " .
+                    $zts .
+                    '"'
             );
 
         SourcePatcher::patchBeforeMake($this);
@@ -223,6 +223,12 @@ public function proveLibs(array $sorted_libraries): void
             ROOT_DIR . '\src\SPC\builder\\' . osfamily2dir() . '\library',
             'SPC\builder\\' . osfamily2dir() . '\library'
         );
+        if (file_exists(WORKING_DIR . '\src\builder\\' . osfamily2dir() . '\library')) {
+            $classes = array_merge($classes, FileSystem::getClassesPsr4(
+                WORKING_DIR . '\src\builder\\' . osfamily2dir() . '\library',
+                'App\builder\\' . osfamily2dir() . '\library'
+            ));
+        }
         foreach ($classes as $class) {
             if (defined($class . '::NAME') && $class::NAME !== 'unknown' && Config::getLib($class::NAME) !== null) {
                 $support_lib_list[$class::NAME] = $class;

src/SPC/store/FileSystem.php

@@ -24,16 +24,25 @@ public static function loadConfigArray(string $config, ?string $config_dir = nul
             WORKING_DIR . '/config/' . $config . '.json',
             ROOT_DIR . '/config/' . $config . '.json',
         ];
+
+        $all = [];
         foreach ($tries as $try) {
             if (file_exists($try)) {
                 $json = json_decode(self::readFile($try), true);
                 if (!is_array($json)) {
                     throw new FileSystemException('Reading ' . $try . ' failed');
                 }
-                return $json;
+                $all = array_merge($json, $all);
             }
         }
-        throw new FileSystemException('Reading ' . $config . '.json failed');
+
+        ksort($all);
+
+        if (count($all) === 0) {
+            throw new FileSystemException('Reading ' . $config . '.json failed');
+        }
+
+        return $all;
     }
 
     /**

src/SPC/util/CustomExt.php

@@ -24,6 +24,9 @@ public function __construct(protected string $ext_name) {}
     public static function loadCustomExt(): void
     {
         $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/builder/extension', 'SPC\builder\extension');
+        if (file_exists(WORKING_DIR . '/src/builder/extension')) {
+            $classes = array_merge($classes, FileSystem::getClassesPsr4(WORKING_DIR . '/src/builder/extension', 'App\builder\extension'));
+        }
         foreach ($classes as $class) {
             $reflection = new \ReflectionClass($class);
             foreach ($reflection->getAttributes(CustomExt::class) as $attribute) {