mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 20:32:11 +02:00
Code Issues Releases Wiki Activity

[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."

Browse Source 
This reverts commit 46a9fe93d797bf7d56fd9b1e204f3c0459270122.

PHPBB3-13064
This commit is contained in:
Joas Schilling 2014-09-17 21:24:33 +02:00
parent 910cd5edbe
commit 7729ae4ad0
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/phpbb/db/migrator.php
View File

@ -129,28 +129,11 @@ class migrator
* Sets the list of available migration class names to the given array.
*
* @param array $class_names An array of migration class names
* @param bool $check_fulfillable If TRUE (default), we will check
* if all of the migrations are fulfillable after loading them.
* If FALSE, we will not check. You SHOULD check at least once
* to prevent errors.
* @return null
* @throws \phpbb\db\migration\exception
*/
public function set_migrations($class_names, $check_fulfillable = true)
public function set_migrations($class_names)
{
$this->migrations = $class_names;
if ($check_fulfillable)
{
foreach ($this->migrations as $name)
{
$unfulfillable = $this->unfulfillable($name);
if ($unfulfillable !== false)
{
throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable);
}
}
}
}
/**

10
tests/dbal/migrator_test.php
View File

@ -118,17 +118,9 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->db_tools->sql_column_remove('phpbb_config', 'extra_column');
}
/**
* @expectedException \phpbb\db\migration\exception
*/
public function test_unfulfillable_exception()
{
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'));
}
public function test_unfulfillable()
{
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'), false);
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'));
while (!$this->migrator->finished())
{