Merge pull request #1860 from MGatner/migrationrunner-use-autoloader

Migrationrunner use autoloader

Author: lonnieezell

system/Autoloader/FileLocator.php

@@ -376,6 +376,48 @@ public function listFiles(string $path): array
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Scans the provided namespace, returning a list of all files
+	 * that are contained within the subpath specified by $path.
+	 *
+	 * @param string $prefix
+	 * @param string $path
+	 *
+	 * @return array
+	 */
+	public function listNamespaceFiles(string $prefix, string $path): array
+	{
+		if (empty($path) || empty($prefix))
+		{
+			return [];
+		}
+
+		$files = [];
+		helper('filesystem');
+		
+		// autoloader->getNamespace($prefix) returns an array of paths for that namespace
+		foreach ($this->autoloader->getNamespace($prefix) as $namespacePath)
+		{
+			$fullPath = realpath($namespacePath . $path);
+
+			if (! is_dir($fullPath))
+			{
+				continue;
+			}
+
+			$tempFiles = get_filenames($fullPath, true);
+
+			if (! empty($tempFiles))
+			{
+				$files = array_merge($files, $tempFiles);
+			}
+		}
+
+		return $files;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Checks the application folder to see if the file can be found.
 	 * Only for use with filenames that DO NOT include namespacing.

system/Database/MigrationRunner.php

@@ -36,6 +36,7 @@
  * @filesource
  */
 
+use Config\Services;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Exceptions\ConfigException;
@@ -346,11 +347,10 @@ public function latestAll(string $group = null)
 			$this->setGroup($group);
 		}
 
-		// Get all namespaces form  PSR4 paths.
-		$config     = config('Autoload');
-		$namespaces = $config->psr4;
+		// Get all namespaces from the autoloader
+		$namespaces = Services::autoloader()->getNamespace();
 
-		foreach ($namespaces as $namespace => $path)
+		foreach ($namespaces as $namespace => $paths)
 		{
 			$this->setNamespace($namespace);
 			$migrations = $this->findMigrations();
@@ -400,36 +400,30 @@ public function current(string $group = null)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Retrieves list of available migration scripts
+	 * Retrieves list of available migration scripts for one namespace
 	 *
 	 * @return array    list of migrations as $version for one namespace
 	 */
 	public function findMigrations()
 	{
 		$migrations = [];
-		helper('filesystem');
 
 		// If $this->path contains a valid directory use it.
 		if (! empty($this->path))
 		{
+			helper('filesystem');
 			$dir = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
+			$files = get_filenames($dir, true);
 		}
-		// Otherwise, get namespace location form  PSR4 paths
-		// and add Database/Migrations for a standard location.
+		// Otherwise use FileLocator to search files in the subdirectory of the namespace
 		else
 		{
-			$config = config('Autoload');
-
-			$location = $config->psr4[$this->namespace];
-
-			// Setting migration directories.
-			$dir = rtrim($location, DIRECTORY_SEPARATOR) . '/Database/Migrations/';
+			$locator = Services::locator(true);
+			$files = $locator->listNamespaceFiles($this->namespace, '/Database/Migrations/');
 		}
 
 		// Load all *_*.php files in the migrations path
 		// We can't use glob if we want it to be testable....
-		$files = get_filenames($dir, true);
-
 		foreach ($files as $file)
 		{
 			if (substr($file, -4) !== '.php')
@@ -447,9 +441,9 @@ public function findMigrations()
 				$migration = new \stdClass();
 
 				// Get migration version number
-				$migration->version = $this->getMigrationNumber($name);
-				$migration->name    = $this->getMigrationName($name);
-				$migration->path    = ! empty($this->path) && strpos($file, $this->path) !== 0
+				$migration->version   = $this->getMigrationNumber($name);
+				$migration->name      = $this->getMigrationName($name);
+				$migration->path      = ! empty($this->path) && strpos($file, $this->path) !== 0
 					? $this->path . $file
 					: $file;
 

user_guide_src/source/dbmgmt/migration.rst

@@ -130,8 +130,9 @@ Namespaces
 ==========
 
 The migration library can automatically scan all namespaces you have defined within
-**app/Config/Autoload.php** and its ``$psr4`` property for matching directory
-names. It will include all migrations it finds in Database/Migrations.
+**app/Config/Autoload.php** or loaded from an external source like Composer, using
+the ``$psr4`` property for matching directory names. It will include all migrations
+it finds in Database/Migrations.
 
 Each namespace has it's own version sequence, this will help you upgrade and downgrade each module (namespace) without affecting other namespaces.