Remove runner->setPath; Change test namespaces

MGatner · MGatner · commit 3f214b63190d · 2019-08-19T11:41:40.000-04:00
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
@@ -175,9 +175,9 @@ public function progress(string $group = null)
 		{
 			throw ConfigException::forDisabledMigrations();
 		}
-		
+
 		$this->ensureTable();
-		
+
 		// Set database group if not null
 		if (! is_null($group))
 		{
@@ -192,13 +192,13 @@ public function progress(string $group = null)
 		{
 			return true;
 		}
-		
+
 		// Remove any migrations already in the history
 		foreach ($this->getHistory($this->group) as $history)
 		{
 			unset($migrations[$this->getObjectUid($history)]);
 		}
-		
+
 		// Start a new batch
 		$batch = $this->getLastBatch() + 1;
 
@@ -212,9 +212,9 @@ public function progress(string $group = null)
 			// If a migration failed then try to back out what was done
 			else {
 				$this->regress(-1);
-				
+
 				$message = lang('Migrations.generalFault');
-		
+
 				if ($this->silent)
 				{
 					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
@@ -223,7 +223,7 @@ public function progress(string $group = null)
 				throw new \RuntimeException($message);
 			}
 		}
-		
+
 		return true;
 	}
 
@@ -246,15 +246,15 @@ public function regress(int $targetBatch, string $group = null)
 		{
 			throw ConfigException::forDisabledMigrations();
 		}
-		
+
 		// Set database group if not null
 		if (! is_null($group))
 		{
 			$this->setGroup($group);
 		}
 
 		$this->ensureTable();
-		
+
 		// Get all the batches
 		$batches = $this->getBatches();
 
@@ -263,7 +263,7 @@ public function regress(int $targetBatch, string $group = null)
 		{
 			$targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
 		}
-		
+
 		// If the goal was rollback then check if it is done
 		if (empty($batches) && $targetBatch === 0)
 		{
@@ -274,19 +274,19 @@ public function regress(int $targetBatch, string $group = null)
 		if ($targetBatch !== 0 && ! in_array($targetBatch, $batches))
 		{
 			$message = lang('Migrations.batchNotFound') . $targetBatch;
-			
+
 			if ($this->silent)
 			{
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
 			throw new \RuntimeException($message);
 		}
-		
+
 		// Get all migrations
 		$this->namespace = null;
 		$allMigrations = $this->findMigrations();
-		
+
 		// Gather migrations down through each batch until reaching the target
 		$migrations = [];
 		while ($batch = array_pop($batches))
@@ -302,20 +302,20 @@ public function regress(int $targetBatch, string $group = null)
 			{
 				// Create a UID from the history to match its migration
 				$uid = $this->getObjectUid($history);
-				
+
 				// Make sure the migration is still available
 				if (! isset($allMigrations[$uid]))
 				{
 					$message = lang('Migrations.gap') . ' ' . $history->version;
-			
+
 					if ($this->silent)
 					{
 						$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 						return false;
 					}
 					throw new \RuntimeException($message);
 				}
-				
+
 				// Add the history and put it on the list
 				$migration = $allMigrations[$uid];
 				$migration->history = $history;
@@ -333,7 +333,7 @@ public function regress(int $targetBatch, string $group = null)
 			// If a migration failed then quit so as not to ruin the whole batch
 			else {
 				$message = lang('Migrations.generalFault');
-		
+
 				if ($this->silent)
 				{
 					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
@@ -342,7 +342,7 @@ public function regress(int $targetBatch, string $group = null)
 				throw new \RuntimeException($message);
 			}
 		}
-		
+
 		return true;
 	}
 
@@ -364,9 +364,9 @@ public function force(string $path, string $namespace, string $group = null)
 		{
 			throw ConfigException::forDisabledMigrations();
 		}
-		
+
 		$this->ensureTable();
-		
+
 		// Set database group if not null
 		if (! is_null($group))
 		{
@@ -378,15 +378,15 @@ public function force(string $path, string $namespace, string $group = null)
 		if (empty($migration))
 		{
 			$message = lang('Migrations.notFound');
-	
+
 			if ($this->silent)
 			{
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
 			throw new \RuntimeException($message);
 		}
-		
+
 		// Check the history for a match
 		$method = 'up';
 		$this->setNamespace($migration->namespace);
@@ -399,7 +399,7 @@ public function force(string $path, string $namespace, string $group = null)
 				break;
 			}
 		}
-		
+
 		// up
 		if ($method == 'up')
 		{
@@ -412,14 +412,14 @@ public function force(string $path, string $namespace, string $group = null)
 				return true;
 			}
 		}
-		
-		// down		
+
+		// down
 		elseif ($this->migrate('down', $migration))
 		{
 			$this->removeHistory($migration->history);
 			return true;
 		}
-		
+
 		// If it came this far the migration failed
 		$message = lang('Migrations.generalFault');
 
@@ -452,10 +452,10 @@ public function findMigrations(): array
 				$migrations[$migration->uid] = $migration;
 			}
 		}
-		
+
 		// Sort migrations ascending by their UID (version)
 		ksort($migrations);
-		
+
 		return $migrations;
 	}
 
@@ -492,7 +492,7 @@ public function findNamespaceMigrations(string $namespace): array
 		{
 			// Clean up the file path
 			$file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);
-			
+
 			// Create the migration object from the file and save it
 			if ($migration = $this->migrationFromFile($file, $namespace))
 			{
@@ -530,7 +530,7 @@ protected function migrationFromFile(string $path, string $namespace)
 		}
 
 		$locator = Services::locator(true);
-		
+
 		// Create migration object using stdClass
 		$migration = new \stdClass();
 
@@ -562,22 +562,6 @@ public function setNamespace(?string $namespace)
 		return $this;
 	}
 
-	/**
-	 * Sets the path to the base directory that will be used
-	 * when locating migrations. If left null, the value will
-	 * be chosen from $this->namespace's directory.
-	 *
-	 * @param string|null $path
-	 *
-	 * @return $this
-	 */
-	public function setPath(string $path = null)
-	{
-		$this->path = $path;
-
-		return $this;
-	}
-
 	//--------------------------------------------------------------------
 
 	/**
@@ -698,7 +682,7 @@ public function getCliMessages(): array
 	public function clearCliMessages()
 	{
 		$this->cliMessages = [];
-		
+
 		return $this;
 	}
 
@@ -717,7 +701,7 @@ public function clearHistory()
 					 ->truncate();
 		}
 	}
-	
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -758,16 +742,16 @@ protected function addHistory($migration, int $batch)
 	 */
 	protected function removeHistory($history)
 	{
-		
+
 		$this->db->table($this->table)->where('id', $history->id)->delete();
-		
+
 		if (is_cli())
 		{
 			$this->cliMessages[] = "\t" . CLI::color(lang('Migrations.removed'),
 					'yellow') . "($history->namespace) " . $history->version . '_' . $this->getMigrationName($history->class);
 		}
 	}
-	
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -780,15 +764,15 @@ protected function removeHistory($history)
 	public function getHistory(string $group = 'default'): array
 	{
 		$this->ensureTable();
-		
+
 		$criteria = ['group' => $group];
-		
+
 		// If a namespace was specified then use it
 		if ($this->namespace)
 		{
 			$criteria['namespace'] = $this->namespace;
 		}
-		
+
 		$query = $this->db->table($this->table)
 						  ->where($criteria)
 						  ->orderBy('id', 'ASC')
@@ -809,7 +793,7 @@ public function getHistory(string $group = 'default'): array
 	public function getBatchHistory(int $batch): array
 	{
 		$this->ensureTable();
-		
+
 		$query = $this->db->table($this->table)
 			              ->where('batch', $batch)
 			              ->orderBy('id', 'asc')
@@ -880,7 +864,7 @@ public function getBatchStart(int $batch): string
 			$batches = $this->getBatches();
 			$batch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
 		}
-		
+
 		$migration = $this->db->table($this->table)
 			->where('batch', $batch)
 			->orderBy('id', 'asc')
@@ -909,7 +893,7 @@ public function getBatchEnd(int $batch): string
 			$batches = $this->getBatches();
 			$batch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
 		}
-		
+
 		$migration = $this->db->table($this->table)
 			  ->where('batch', $batch)
 			  ->orderBy('id', 'desc')
@@ -999,7 +983,7 @@ protected function migrate($direction, $migration): bool
 		if (! class_exists($class, false))
 		{
 			$message = sprintf(lang('Migrations.classNotFound'), $class);
-	
+
 			if ($this->silent)
 			{
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
@@ -1014,7 +998,7 @@ protected function migrate($direction, $migration): bool
 		if (! is_callable([$instance, $direction]))
 		{
 			$message = sprintf(lang('Migrations.missingMethod'), $direction);
-	
+
 			if ($this->silent)
 			{
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
@@ -76,11 +76,11 @@ class CIDatabaseTestCase extends CIUnitTestCase
 	protected $basePath = TESTPATH . '_support/Database';
 
 	/**
-	 * The namespace to help us fird the migration classes.
+	 * The namespace to help us find the migration classes.
 	 *
 	 * @var string
 	 */
-	protected $namespace = 'Tests\Support';
+	protected $namespace = 'Tests\Support\DatabaseTestMigrations';
 
 	/**
 	 * The name of the database group to connect to.
diff --git a/tests/_support/DatabaseTestMigrations/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/DatabaseTestMigrations/Database/Migrations/20160428212500_Create_test_tables.php
@@ -1,4 +1,4 @@
-<?php namespace Tests\Support\Database\Migrations;
+<?php namespace Tests\Support\DatabaseTestMigrations\Database\Migrations;
 
 class Migration_Create_test_tables extends \CodeIgniter\Database\Migration
 {
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102300_Another_migration.py b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102300_Another_migration.py
@@ -1,4 +1,4 @@
-<?php namespace App\Database\Migrations;
+<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
 class Migration_another_migration extends \CodeIgniter\Database\Migration
 {
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
@@ -1,4 +1,4 @@
-<?php namespace App\Database\Migrations;
+<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
 class Migration_some_migration extends \CodeIgniter\Database\Migration
 {
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
@@ -1,4 +1,4 @@
-<?php namespace App\Database\Migrations;
+<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
 class Migration_another_migration extends \CodeIgniter\Database\Migration
 {
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php

Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ public function progress(string $group = null)`
`175`	`175`	`{`
`176`	`176`	`throw ConfigException::forDisabledMigrations();`
`177`	`177`	`}`
`178`		`-`
	`178`	`+`
`179`	`179`	`$this->ensureTable();`
`180`		`-`
	`180`	`+`
`181`	`181`	`// Set database group if not null`
`182`	`182`	`if (! is_null($group))`
`183`	`183`	`{`
`@@ -192,13 +192,13 @@ public function progress(string $group = null)`
`192`	`192`	`{`
`193`	`193`	`return true;`
`194`	`194`	`}`
`195`		`-`
	`195`	`+`
`196`	`196`	`// Remove any migrations already in the history`
`197`	`197`	`foreach ($this->getHistory($this->group) as $history)`
`198`	`198`	`{`
`199`	`199`	`unset($migrations[$this->getObjectUid($history)]);`
`200`	`200`	`}`
`201`		`-`
	`201`	`+`
`202`	`202`	`// Start a new batch`
`203`	`203`	`$batch = $this->getLastBatch() + 1;`
`204`	`204`
`@@ -212,9 +212,9 @@ public function progress(string $group = null)`
`212`	`212`	`// If a migration failed then try to back out what was done`
`213`	`213`	`else {`
`214`	`214`	`$this->regress(-1);`
`215`		`-`
	`215`	`+`
`216`	`216`	`$message = lang('Migrations.generalFault');`
`217`		`-`
	`217`	`+`
`218`	`218`	`if ($this->silent)`
`219`	`219`	`{`
`220`	`220`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`@@ -223,7 +223,7 @@ public function progress(string $group = null)`
`223`	`223`	`throw new \RuntimeException($message);`
`224`	`224`	`}`
`225`	`225`	`}`
`226`		`-`
	`226`	`+`
`227`	`227`	`return true;`
`228`	`228`	`}`
`229`	`229`
`@@ -246,15 +246,15 @@ public function regress(int $targetBatch, string $group = null)`
`246`	`246`	`{`
`247`	`247`	`throw ConfigException::forDisabledMigrations();`
`248`	`248`	`}`
`249`		`-`
	`249`	`+`
`250`	`250`	`// Set database group if not null`
`251`	`251`	`if (! is_null($group))`
`252`	`252`	`{`
`253`	`253`	`$this->setGroup($group);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`$this->ensureTable();`
`257`		`-`
	`257`	`+`
`258`	`258`	`// Get all the batches`
`259`	`259`	`$batches = $this->getBatches();`
`260`	`260`
`@@ -263,7 +263,7 @@ public function regress(int $targetBatch, string $group = null)`
`263`	`263`	`{`
`264`	`264`	`$targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;`
`265`	`265`	`}`
`266`		`-`
	`266`	`+`
`267`	`267`	`// If the goal was rollback then check if it is done`
`268`	`268`	`if (empty($batches) && $targetBatch === 0)`
`269`	`269`	`{`
`@@ -274,19 +274,19 @@ public function regress(int $targetBatch, string $group = null)`
`274`	`274`	`if ($targetBatch !== 0 && ! in_array($targetBatch, $batches))`
`275`	`275`	`{`
`276`	`276`	`$message = lang('Migrations.batchNotFound') . $targetBatch;`
`277`		`-`
	`277`	`+`
`278`	`278`	`if ($this->silent)`
`279`	`279`	`{`
`280`	`280`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`281`	`281`	`return false;`
`282`	`282`	`}`
`283`	`283`	`throw new \RuntimeException($message);`
`284`	`284`	`}`
`285`		`-`
	`285`	`+`
`286`	`286`	`// Get all migrations`
`287`	`287`	`$this->namespace = null;`
`288`	`288`	`$allMigrations = $this->findMigrations();`
`289`		`-`
	`289`	`+`
`290`	`290`	`// Gather migrations down through each batch until reaching the target`
`291`	`291`	`$migrations = [];`
`292`	`292`	`while ($batch = array_pop($batches))`
`@@ -302,20 +302,20 @@ public function regress(int $targetBatch, string $group = null)`
`302`	`302`	`{`
`303`	`303`	`// Create a UID from the history to match its migration`
`304`	`304`	`$uid = $this->getObjectUid($history);`
`305`		`-`
	`305`	`+`
`306`	`306`	`// Make sure the migration is still available`
`307`	`307`	`if (! isset($allMigrations[$uid]))`
`308`	`308`	`{`
`309`	`309`	`$message = lang('Migrations.gap') . ' ' . $history->version;`
`310`		`-`
	`310`	`+`
`311`	`311`	`if ($this->silent)`
`312`	`312`	`{`
`313`	`313`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`314`	`314`	`return false;`
`315`	`315`	`}`
`316`	`316`	`throw new \RuntimeException($message);`
`317`	`317`	`}`
`318`		`-`
	`318`	`+`
`319`	`319`	`// Add the history and put it on the list`
`320`	`320`	`$migration = $allMigrations[$uid];`
`321`	`321`	`$migration->history = $history;`
`@@ -333,7 +333,7 @@ public function regress(int $targetBatch, string $group = null)`
`333`	`333`	`// If a migration failed then quit so as not to ruin the whole batch`
`334`	`334`	`else {`
`335`	`335`	`$message = lang('Migrations.generalFault');`
`336`		`-`
	`336`	`+`
`337`	`337`	`if ($this->silent)`
`338`	`338`	`{`
`339`	`339`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`@@ -342,7 +342,7 @@ public function regress(int $targetBatch, string $group = null)`
`342`	`342`	`throw new \RuntimeException($message);`
`343`	`343`	`}`
`344`	`344`	`}`
`345`		`-`
	`345`	`+`
`346`	`346`	`return true;`
`347`	`347`	`}`
`348`	`348`
`@@ -364,9 +364,9 @@ public function force(string $path, string $namespace, string $group = null)`
`364`	`364`	`{`
`365`	`365`	`throw ConfigException::forDisabledMigrations();`
`366`	`366`	`}`
`367`		`-`
	`367`	`+`
`368`	`368`	`$this->ensureTable();`
`369`		`-`
	`369`	`+`
`370`	`370`	`// Set database group if not null`
`371`	`371`	`if (! is_null($group))`
`372`	`372`	`{`
`@@ -378,15 +378,15 @@ public function force(string $path, string $namespace, string $group = null)`
`378`	`378`	`if (empty($migration))`
`379`	`379`	`{`
`380`	`380`	`$message = lang('Migrations.notFound');`
`381`		`-`
	`381`	`+`
`382`	`382`	`if ($this->silent)`
`383`	`383`	`{`
`384`	`384`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`385`	`385`	`return false;`
`386`	`386`	`}`
`387`	`387`	`throw new \RuntimeException($message);`
`388`	`388`	`}`
`389`		`-`
	`389`	`+`
`390`	`390`	`// Check the history for a match`
`391`	`391`	`$method = 'up';`
`392`	`392`	`$this->setNamespace($migration->namespace);`
`@@ -399,7 +399,7 @@ public function force(string $path, string $namespace, string $group = null)`
`399`	`399`	`break;`
`400`	`400`	`}`
`401`	`401`	`}`
`402`		`-`
	`402`	`+`
`403`	`403`	`// up`
`404`	`404`	`if ($method == 'up')`
`405`	`405`	`{`
`@@ -412,14 +412,14 @@ public function force(string $path, string $namespace, string $group = null)`
`412`	`412`	`return true;`
`413`	`413`	`}`
`414`	`414`	`}`
`415`		`-`
`416`		`- // down`
	`415`	`+`
	`416`	`+ // down`
`417`	`417`	`elseif ($this->migrate('down', $migration))`
`418`	`418`	`{`
`419`	`419`	`$this->removeHistory($migration->history);`
`420`	`420`	`return true;`
`421`	`421`	`}`
`422`		`-`
	`422`	`+`
`423`	`423`	`// If it came this far the migration failed`
`424`	`424`	`$message = lang('Migrations.generalFault');`
`425`	`425`
`@@ -452,10 +452,10 @@ public function findMigrations(): array`
`452`	`452`	`$migrations[$migration->uid] = $migration;`
`453`	`453`	`}`
`454`	`454`	`}`
`455`		`-`
	`455`	`+`
`456`	`456`	`// Sort migrations ascending by their UID (version)`
`457`	`457`	`ksort($migrations);`
`458`		`-`
	`458`	`+`
`459`	`459`	`return $migrations;`
`460`	`460`	`}`
`461`	`461`
`@@ -492,7 +492,7 @@ public function findNamespaceMigrations(string $namespace): array`
`492`	`492`	`{`
`493`	`493`	`// Clean up the file path`
`494`	`494`	`$file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);`
`495`		`-`
	`495`	`+`
`496`	`496`	`// Create the migration object from the file and save it`
`497`	`497`	`if ($migration = $this->migrationFromFile($file, $namespace))`
`498`	`498`	`{`
`@@ -530,7 +530,7 @@ protected function migrationFromFile(string $path, string $namespace)`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`$locator = Services::locator(true);`
`533`		`-`
	`533`	`+`
`534`	`534`	`// Create migration object using stdClass`
`535`	`535`	`$migration = new \stdClass();`
`536`	`536`
`@@ -562,22 +562,6 @@ public function setNamespace(?string $namespace)`
`562`	`562`	`return $this;`
`563`	`563`	`}`
`564`	`564`
`565`		`- /**`
`566`		`- * Sets the path to the base directory that will be used`
`567`		`- * when locating migrations. If left null, the value will`
`568`		`- * be chosen from $this->namespace's directory.`
`569`		`- *`
`570`		`- * @param string\|null $path`
`571`		`- *`
`572`		`- * @return $this`
`573`		`- */`
`574`		`- public function setPath(string $path = null)`
`575`		`- {`
`576`		`- $this->path = $path;`
`577`		`-`
`578`		`- return $this;`
`579`		`- }`
`580`		`-`
`581`	`565`	`//--------------------------------------------------------------------`
`582`	`566`
`583`	`567`	`/**`
`@@ -698,7 +682,7 @@ public function getCliMessages(): array`
`698`	`682`	`public function clearCliMessages()`
`699`	`683`	`{`
`700`	`684`	`$this->cliMessages = [];`
`701`		`-`
	`685`	`+`
`702`	`686`	`return $this;`
`703`	`687`	`}`
`704`	`688`
`@@ -717,7 +701,7 @@ public function clearHistory()`
`717`	`701`	`->truncate();`
`718`	`702`	`}`
`719`	`703`	`}`
`720`		`-`
	`704`	`+`
`721`	`705`	`//--------------------------------------------------------------------`
`722`	`706`
`723`	`707`	`/**`
`@@ -758,16 +742,16 @@ protected function addHistory($migration, int $batch)`
`758`	`742`	`*/`
`759`	`743`	`protected function removeHistory($history)`
`760`	`744`	`{`
`761`		`-`
	`745`	`+`
`762`	`746`	`$this->db->table($this->table)->where('id', $history->id)->delete();`
`763`		`-`
	`747`	`+`
`764`	`748`	`if (is_cli())`
`765`	`749`	`{`
`766`	`750`	`$this->cliMessages[] = "\t" . CLI::color(lang('Migrations.removed'),`
`767`	`751`	`'yellow') . "($history->namespace) " . $history->version . '_' . $this->getMigrationName($history->class);`
`768`	`752`	`}`
`769`	`753`	`}`
`770`		`-`
	`754`	`+`
`771`	`755`	`//--------------------------------------------------------------------`
`772`	`756`
`773`	`757`	`/**`
`@@ -780,15 +764,15 @@ protected function removeHistory($history)`
`780`	`764`	`public function getHistory(string $group = 'default'): array`
`781`	`765`	`{`
`782`	`766`	`$this->ensureTable();`
`783`		`-`
	`767`	`+`
`784`	`768`	`$criteria = ['group' => $group];`
`785`		`-`
	`769`	`+`
`786`	`770`	`// If a namespace was specified then use it`
`787`	`771`	`if ($this->namespace)`
`788`	`772`	`{`
`789`	`773`	`$criteria['namespace'] = $this->namespace;`
`790`	`774`	`}`
`791`		`-`
	`775`	`+`
`792`	`776`	`$query = $this->db->table($this->table)`
`793`	`777`	`->where($criteria)`
`794`	`778`	`->orderBy('id', 'ASC')`
`@@ -809,7 +793,7 @@ public function getHistory(string $group = 'default'): array`
`809`	`793`	`public function getBatchHistory(int $batch): array`
`810`	`794`	`{`
`811`	`795`	`$this->ensureTable();`
`812`		`-`
	`796`	`+`
`813`	`797`	`$query = $this->db->table($this->table)`
`814`	`798`	`->where('batch', $batch)`
`815`	`799`	`->orderBy('id', 'asc')`
`@@ -880,7 +864,7 @@ public function getBatchStart(int $batch): string`
`880`	`864`	`$batches = $this->getBatches();`
`881`	`865`	`$batch = $batches[count($batches) - 1 + $targetBatch] ?? 0;`
`882`	`866`	`}`
`883`		`-`
	`867`	`+`
`884`	`868`	`$migration = $this->db->table($this->table)`
`885`	`869`	`->where('batch', $batch)`
`886`	`870`	`->orderBy('id', 'asc')`
`@@ -909,7 +893,7 @@ public function getBatchEnd(int $batch): string`
`909`	`893`	`$batches = $this->getBatches();`
`910`	`894`	`$batch = $batches[count($batches) - 1 + $targetBatch] ?? 0;`
`911`	`895`	`}`
`912`		`-`
	`896`	`+`
`913`	`897`	`$migration = $this->db->table($this->table)`
`914`	`898`	`->where('batch', $batch)`
`915`	`899`	`->orderBy('id', 'desc')`
`@@ -999,7 +983,7 @@ protected function migrate($direction, $migration): bool`
`999`	`983`	`if (! class_exists($class, false))`
`1000`	`984`	`{`
`1001`	`985`	`$message = sprintf(lang('Migrations.classNotFound'), $class);`
`1002`		`-`
	`986`	`+`
`1003`	`987`	`if ($this->silent)`
`1004`	`988`	`{`
`1005`	`989`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
`@@ -1014,7 +998,7 @@ protected function migrate($direction, $migration): bool`
`1014`	`998`	`if (! is_callable([$instance, $direction]))`
`1015`	`999`	`{`
`1016`	`1000`	`$message = sprintf(lang('Migrations.missingMethod'), $direction);`
`1017`		`-`
	`1001`	`+`
`1018`	`1002`	`if ($this->silent)`
`1019`	`1003`	`{`
`1020`	`1004`	`$this->cliMessages[] = "\t" . CLI::color($message, 'red');`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace Tests\Support\Database\Migrations;`
	`1`	`+<?php namespace Tests\Support\DatabaseTestMigrations\Database\Migrations;`
`2`	`2`
`3`	`3`	`class Migration_Create_test_tables extends \CodeIgniter\Database\Migration`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<?php namespace App\Database\Migrations;`
	`1`	`+<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;`
`2`	`2`
`3`	`3`	`class Migration_another_migration extends \CodeIgniter\Database\Migration`
`4`	`4`	`{`