Check if WORKING_DIR locations exists before merging

Author: yoramdelangen

src/SPC/builder/unix/UnixBuilderBase.php

@@ -98,10 +98,12 @@ public function proveLibs(array $sorted_libraries): void
             ROOT_DIR . '/src/SPC/builder/' . osfamily2dir() . '/library',
             'SPC\builder\\' . osfamily2dir() . '\library'
         );
-        $classes = array_merge($classes, FileSystem::getClassesPsr4(
-            WORKING_DIR . '/src/builder/' . osfamily2dir() . '/library',
-            'App\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

@@ -223,10 +223,12 @@ public function proveLibs(array $sorted_libraries): void
             ROOT_DIR . '\src\SPC\builder\\' . osfamily2dir() . '\library',
             'SPC\builder\\' . osfamily2dir() . '\library'
         );
-        $classes = array_merge($classes, FileSystem::getClassesPsr4(
-            WORKING_DIR . '\src\builder\\' . osfamily2dir() . '\library',
-            'App\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/util/CustomExt.php

@@ -24,7 +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');
-        $classes = array_merge($classes, FileSystem::getClassesPsr4(WORKING_DIR . '/src/builder/extension', 'App\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) {