package fix

Author: yusufalper

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,7 @@
 # Organize your migrations into subfolders.
 
+IF YOU DO NOT WANT TO USE PACKAGE FOR THIS FEATURE, YOU CAN USE SIMPLE PROVIDER GIST FROM [HERE](https://gist.github.com/yusufalper/25c0c7e5a347abc09349bbc16817c268)
+
 This package allows you to split database/migrations into subfolders. Especially in large projects, migrations folder may cause headaches. 
 
 Now you can turn this:

.github/dependabot.yml

@@ -16,21 +16,12 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.1|^9|^10",
         "spatie/laravel-package-tools": "^1.9.2",
-        "illuminate/contracts": "^9.0"
+        "illuminate/contracts": "^9.0|^10"
     },
     "require-dev": {
-        "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^6.0",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
-        "pestphp/pest": "^1.21",
-        "pestphp/pest-plugin-laravel": "^1.1",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "nunomaduro/collision": "^6.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,18 +34,8 @@
             "Yusufalper\\LaravelSubfolderMigrations\\Tests\\": "tests"
         }
     },
-    "scripts": {
-        "analyse": "vendor/bin/phpstan analyse",
-        "test": "vendor/bin/pest",
-        "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/pint"
-    },
     "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "pestphp/pest-plugin": true,
-            "phpstan/extension-installer": true
-        }
+        "sort-packages": true
     },
     "extra": {
         "laravel": {

.github/workflows/dependabot-auto-merge.yml

@@ -5,40 +5,58 @@
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
+/*The provided service provider is a useful addition for the Laravel framework,
+specifically for handling migrations. By default, Laravel expects all migration
+files to be placed directly in the migrations directory without any subdirectories.
+However, this service provider allows you to create subdirectories within the
+migrations directory, providing a more organized structure for your migration files.
+With this service provider, you can organize your migration files into subdirectories
+based on your application's needs. The code recursively searches for subdirectories
+within the migrations directory and retrieves all migration files, regardless
+of their depth in the directory structure.
+The migration files within the subdirectories are ordered based on their timestamp,
+just like the migration files in the main migrations directory.
+This ensures that the migrations are executed in the correct order
+when running the migration command.
+Once the service provider is registered in your Laravel application, it automatically
+loads the migration files from the main migrations directory as well as any subdirectories.
+This enables you to take advantage of a more organized structure while still
+maintaining the proper execution order of your migrations.
+In summary, this service provider enhances the Laravel framework's migration functionality
+by allowing the creation of subdirectories within the migrations directory.
+It ensures that all migration files, regardless of their location within the subdirectories,
+are ordered based on their timestamp and properly executed when running the migration command.
+*/
 class LaravelSubfolderMigrationsServiceProvider extends PackageServiceProvider
 {
     public function configurePackage(Package $package): void
     {
         $package->name('laravel-subfolder-migrations');
 
-        $mainMigrationPath = database_path('migrations');
-        $directories = glob($mainMigrationPath . '/*' , GLOB_ONLYDIR);
-        $allSubDirs = self::recursiveSearch($directories);
-
-        $allMigrationPaths = array_merge([$mainMigrationPath], $allSubDirs);
-
-        $this->loadMigrationsFrom($allMigrationPaths);
+        $this->loadMigrationsFrom(
+            $this->retrieveSubdirectories([database_path('migrations')])
+        );
     }
 
-    protected static function recursiveSearch(array $directories): array
+    /**
+     * Recursively returns subdirectories within the given directory path(s),
+     * including child subdirectories.
+     */
+    private function retrieveSubdirectories(array|string $paths): array
     {
-        $subs = [];
-        $deepSubs = [];
-        if (count($directories) > 0){
-            $subs = self::getSubDirectories($directories);
-        }
-        if (count($subs) > 0){
-            $deepSubs = self::recursiveSearch($subs);
+        $paths = is_string($paths) ? [$paths] : $paths;
+
+        $subdirs = [];
+
+        foreach ($paths as $path) {
+            $subdirs += glob($path . '/*', GLOB_ONLYDIR) ?? [];
         }
-        return array_merge($directories, $subs, $deepSubs);
-    }
 
-    protected static function getSubDirectories(array $directories): array
-    {
-        $subDirectories = [];
-        foreach ($directories as $directory){
-            $subDirectories[] = glob($directory . '/*' , GLOB_ONLYDIR);
+        if (!empty($subdirs)) {
+            $subdirs = $this->retrieveSubdirectories($subdirs);
+            return array_merge($paths, $subdirs);
         }
-        return array_merge(...$subDirectories);
+
+        return $paths;
     }
 }