Migrations will now be found in all defined namespace folders.

Author: lonnieezell

system/Database/MigrationRunner.php

@@ -38,6 +38,7 @@
 
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\ConfigException;
+use Config\Autoload;
 
 /**
  * Class MigrationRunner
@@ -115,7 +116,7 @@ public function __construct(BaseConfig $config, ConnectionInterface $db = null)
 		$this->type           = $config->type           ?? 'timestamp';
 		$this->table          = $config->table          ?? 'migrations';
 		$this->currentVersion = $config->currentVersion ?? 0;
-		$this->path           = $config->path           ?? APPPATH.'Database/Migrations/';
+		$this->path           = $config->path           ?? 'Database/Migrations/';
 
 		$this->path = rtrim($this->path, '/').'/';
 
@@ -166,15 +167,6 @@ public function version(string $targetVersion, $group='default')
 		// Note: We use strings, so that timestamp versions work on 32-bit systems
 		$currentVersion = $this->getVersion($group);
 
-		if ($this->type === 'sequential')
-		{
-			$targetVersion = sprintf('%03d', $targetVersion);
-		}
-		else
-		{
-			$targetVersion = (string)$targetVersion;
-		}
-
 		$migrations = $this->findMigrations();
 
 		if ($targetVersion > 0 && ! isset($migrations[$targetVersion]))
@@ -263,11 +255,11 @@ public function latest()
 			throw new \RuntimeException(lang('Migrations.migNotFound'));
 		}
 
-		$lastMigration = basename(end($migrations));
+		$lastMigration = basename(end($migrations), '.php');
 
 		// Calculate the last migration step from existing migration
 		// filenames and proceed to the standard version migration
-		return $this->version($this->getMigrationNumber($lastMigration));
+		return $this->version($lastMigration);
 	}
 
 	//--------------------------------------------------------------------
@@ -293,25 +285,31 @@ public function findMigrations()
 	{
 		$migrations = [];
 
-		// Load all *_*.php files in the migrations path
-		foreach (glob($this->path.'*_*.php') as $file)
-		{
-			$name = basename($file, '.php');
-
-			// Filter out non-migration files
-			if (preg_match($this->regex, $name))
-			{
-				$number = $this->getMigrationNumber($name);
-
-				// There cannot be duplicate migration numbers
-				if (isset($migrations[$number]))
-				{
-					throw new \RuntimeException(lang('Migrations.migMultiple').$number);
-				}
-
-				$migrations[$number] = $file;
-			}
-		}
+        $config = new Autoload();
+
+        // Loop through all of our namespaced folders
+        // searching for migration directories.
+        foreach ($config->psr4 as $namespace => $dir)
+        {
+            $dir = rtrim($dir, '/').'/'.$this->path;
+
+            if (! is_dir($dir))
+            {
+                continue;
+            }
+
+            // Load all *_*.php files in the migrations path
+            foreach (glob($dir.'*_*.php') as $file)
+            {
+                $name = basename($file, '.php');
+
+                // Filter out non-migration files
+                if (preg_match($this->regex, $name))
+                {
+                    $migrations[$name] = $file;
+                }
+            }
+        }
 
 		ksort($migrations);
 

user_guide_src/source/database/migration.rst

@@ -124,6 +124,25 @@ match the name of the database group exactly::
     public function down() { . . . }
   }
 
+Namespaces
+==========
+
+The migration library will automatically scan all namespaces you have defined within 
+**application/Config/Autoload.php** and its ``$psr4`` property for matching directory 
+names. It will include all migrations it finds. 
+
+For example, assume that we have the the following namespaces defined in our Autoload
+configuration file::
+
+	$psr4 = [
+		'App' => APPPATH,
+		'MyCompany' => ROOTPATH.'MyCompany'
+	];
+
+This will look for any migrations located at both **APPPATH/Database/Migrations** and
+**ROOTPATH/Database/Migrations**. This makes it simple to include migrations in your
+re-usable, modular code suites.
+
 *************
 Usage Example
 *************
@@ -225,7 +244,7 @@ The following is a table of all the config options for migrations, available in
 Preference                 Default                Options                    Description
 ========================== ====================== ========================== =============================================================
 **enabled**                FALSE                  TRUE / FALSE               Enable or disable migrations.
-**path**                   APPPATH.'migrations/'  None                       The path to your migrations folder.
+**path**                   'Database/Migrations/' None                       The path to your migrations folder.
 **currentVersion**         0                      None                       The current version your database should use.
 **table**                  migrations             None                       The table name for storing the schema version number.
 **type**                   'timestamp'            'timestamp' / 'sequential' The type of numeric identifier used to name migration files.