diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:22 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:22 +0200 |
| commit | 7548bc89eaefcc1e4774cf7aa1a827600ede5487 (patch) | |
| tree | 8cdfe3576f2dda55459911359d01b902e717d373 /tests/test_framework | |
| parent | 374aa94be9cae13b06577dbd70d8c0c08f22f641 (diff) | |
| parent | bad07b355ca9f0d4cba4da5957a5cf3351523511 (diff) | |
| download | forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.gz forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.bz2 forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.tar.xz forums-7548bc89eaefcc1e4774cf7aa1a827600ede5487.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12963] Always use core_path and core_directory()
[ticket/12963] Remove old migration/ folder from tests
[ticket/12963] Revert back to "migrations" folder name for extensions
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 6b19689b2f..9dbb7150f1 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -69,21 +69,11 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test global $phpbb_root_path, $phpEx, $table_prefix; $finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx); - $classes = $finder->core_path('phpbb/') - ->core_directory('db/migration/data/') - ->set_extensions($setup_extensions) - ->extension_directory('/migration') - ->get_classes(); - - // @deprecated 3.1.0-RC4 (To be removed: 3.2.0) - $finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx); - $classes_deprecated = $finder + $classes = $finder->core_path('phpbb/db/migration/data/') ->set_extensions($setup_extensions) ->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(); |