1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
This commit is contained in:
Tristan Darricau 2014-09-18 01:32:55 +02:00
commit 92d69255e4

View File

@ -72,9 +72,16 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
$classes = $finder->core_path('phpbb/')
->core_directory('/db/migration/data')
->set_extensions($setup_extensions)
->extension_directory('migrations')
->extension_directory('migration')
->get_classes();
// @deprecated 3.1.0-RC4 (To be removed: 3.2.0)
$classes_deprecated = $finder
->extension_directory('/migrations')
->get_classes();
$classes = array_merge($classes, $classes_deprecated);
$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();