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/extension | |
| 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/extension')
4 files changed, 3 insertions, 63 deletions
diff --git a/tests/extension/ext/vendor2/bar/migration/migration.php b/tests/extension/ext/vendor2/bar/migration/migration.php deleted file mode 100644 index fc27656d10..0000000000 --- a/tests/extension/ext/vendor2/bar/migration/migration.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace vendor2\bar\migration; - -class migration extends \phpbb\db\migration\migration -{ -} diff --git a/tests/extension/ext/vendor2/foo/migrations/migration.php b/tests/extension/ext/vendor2/foo/migrations/migration.php deleted file mode 100644 index 63085497e3..0000000000 --- a/tests/extension/ext/vendor2/foo/migrations/migration.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace vendor2\foo\migrations; - -class migration extends \phpbb\db\migration\migration -{ -} diff --git a/tests/extension/ext/vendor3/bar/migration/migration.php b/tests/extension/ext/vendor3/bar/migration/migration.php deleted file mode 100644 index e7280a7d5e..0000000000 --- a/tests/extension/ext/vendor3/bar/migration/migration.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/** -* -* This file is part of the phpBB Forum Software package. -* -* @copyright (c) phpBB Limited <https://www.phpbb.com> -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace vendor3\bar\migration; - -class migration extends \phpbb\db\migration\migration -{ -} diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php index 5535c91fc5..eee38186db 100644 --- a/tests/extension/extension_base_test.php +++ b/tests/extension/extension_base_test.php @@ -16,6 +16,9 @@ class phpbb_extension_extension_base_test extends phpbb_test_case { protected static $reflection_method_get_migration_file_list; + /** @var phpbb_mock_extension_manager */ + protected $extension_manager; + public static function setUpBeforeClass() { parent::setUpBeforeClass(); @@ -57,17 +60,8 @@ class phpbb_extension_extension_base_test extends phpbb_test_case { return array( array( - 'vendor3/bar', - array('\vendor3\bar\migration\migration'), - ), - array( - 'vendor2/foo', - array('\vendor2\foo\migrations\migration'), - ), - array( 'vendor2/bar', array( - '\vendor2\bar\migration\migration', '\vendor2\bar\migrations\migration', ), ), |