mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 08:17:47 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* 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
This commit is contained in:
Tristan Darricau
2014-09-18 14:04:22 +02:00
parent 374aa94be9 bad07b355c
commit 7548bc89ea
8 changed files with 5 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_framework/phpbb_database_test_case.php
View File

@@ -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();