diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:06 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-18 14:04:06 +0200 |
| commit | bad07b355ca9f0d4cba4da5957a5cf3351523511 (patch) | |
| tree | c749a111952cc81ff523050b0a5f330af2ec1429 /phpBB | |
| parent | b82a3cddd817b785185a2c73377040645bb4951e (diff) | |
| parent | 1da5c41ab354d610d1eb3d4ba5c35c557d61ede3 (diff) | |
| download | forums-bad07b355ca9f0d4cba4da5957a5cf3351523511.tar forums-bad07b355ca9f0d4cba4da5957a5cf3351523511.tar.gz forums-bad07b355ca9f0d4cba4da5957a5cf3351523511.tar.bz2 forums-bad07b355ca9f0d4cba4da5957a5cf3351523511.tar.xz forums-bad07b355ca9f0d4cba4da5957a5cf3351523511.zip | |
Merge pull request #2967 from nickvergessen/ticket/12963
[ticket/12963] Revert back to "migrations" folder name for extensions
* nickvergessen/ticket/12963:
[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 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/console/command/db/migrate.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 11 |
3 files changed, 1 insertions, 26 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5cf01fec79..8016ff349b 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -181,17 +181,9 @@ $phpbb_extension_manager = $phpbb_container->get('ext.manager'); $migrations = $phpbb_extension_manager ->get_finder() ->core_path('phpbb/db/migration/data/') - ->extension_directory('/migration') - ->get_classes(); - -// @deprecated 3.1.0-RC4 (To be removed: 3.2.0) -$migrations_deprecated = $phpbb_extension_manager - ->get_finder() ->extension_directory('/migrations') ->get_classes(); -$migrations = array_merge($migrations, $migrations_deprecated); - $migrator->set_migrations($migrations); // What is a safe limit of execution time? Half the max execution time should be safe. diff --git a/phpBB/phpbb/console/command/db/migrate.php b/phpBB/phpbb/console/command/db/migrate.php index 68638a9515..86545c237d 100644 --- a/phpBB/phpbb/console/command/db/migrate.php +++ b/phpBB/phpbb/console/command/db/migrate.php @@ -117,17 +117,9 @@ class migrate extends \phpbb\console\command\command $migrations = $this->extension_manager ->get_finder() ->core_path('phpbb/db/migration/data/') - ->extension_directory('/migration') - ->get_classes(); - - // @deprecated 3.1.0-RC4 (To be removed: 3.2.0) - $migrations_deprecated = $this->extension_manager - ->get_finder() ->extension_directory('/migrations') ->get_classes(); - $migrations = array_merge($migrations, $migrations_deprecated); - $this->migrator->set_migrations($migrations); } diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index b74026e6ab..5bb530bad4 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -132,19 +132,10 @@ class base implements \phpbb\extension\extension_interface // Only have the finder search in this extension path directory $migrations = $this->extension_finder - ->extension_directory('/migration') - ->find_from_extension($this->extension_name, $this->extension_path); - - $migrations = $this->extension_finder->get_classes_from_files($migrations); - - // @deprecated 3.1.0-RC4 (To be removed: 3.2.0) - $migrations_deprecated = $this->extension_finder ->extension_directory('/migrations') ->find_from_extension($this->extension_name, $this->extension_path); - $migrations_deprecated = $this->extension_finder->get_classes_from_files($migrations_deprecated); - - $migrations = array_merge($migrations, $migrations_deprecated); + $migrations = $this->extension_finder->get_classes_from_files($migrations); return $migrations; } |