diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-18 10:42:21 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-18 10:45:08 +0200 |
| commit | c220fa89a1bf5652df6512ad78eb9ba550fe465e (patch) | |
| tree | 78f38853c04b3cb15d074a06886d448968615b39 /phpBB | |
| parent | 53e028ff1485bac571982a56200412fadb72dc83 (diff) | |
| download | forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.gz forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.bz2 forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.tar.xz forums-c220fa89a1bf5652df6512ad78eb9ba550fe465e.zip | |
[ticket/12963] Revert back to "migrations" folder name for extensions
The issues that can be created with the name change are just too much
PHPBB3-12963
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; } |