diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:18 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-10 18:40:18 +0200 |
| commit | 618b73a3d30874eb82bec2398a1b9d6f2ff3856b (patch) | |
| tree | 4f889071d2802d0b26991ad775b06eebcbec22b4 /phpBB/phpbb/db | |
| parent | 3c68da275bb68265a3f377e85d4e150b688d77f0 (diff) | |
| parent | 9842137028f70a2b48ea4eaaddd710cbcf7dc8d5 (diff) | |
| download | forums-618b73a3d30874eb82bec2398a1b9d6f2ff3856b.tar forums-618b73a3d30874eb82bec2398a1b9d6f2ff3856b.tar.gz forums-618b73a3d30874eb82bec2398a1b9d6f2ff3856b.tar.bz2 forums-618b73a3d30874eb82bec2398a1b9d6f2ff3856b.tar.xz forums-618b73a3d30874eb82bec2398a1b9d6f2ff3856b.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12508] Ignore extensions in migration_tips dev tool
[ticket/12508] Fix doc block
[ticket/12508] Add new line to separate the if and foreach better
[ticket/12508] Add a unit test for set_extensions()
[ticket/12508] Only take a list of names for set_extensions()
[ticket/12508] Fix class doc block
[ticket/12508] Move \phpbb\extension\finder to \phpbb\finder
[ticket/12508] Fix usages of the finder
[ticket/12508] Remove extension manager from finder
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 9b9532a7ad..5255c73c1c 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -714,7 +714,7 @@ class migrator /** * Load migration data files from a directory * - * @param \phpbb\extension\finder $finder + * @param \phpbb\finder $finder * @param string $path Path to migration data files * @param bool $check_fulfillable If TRUE (default), we will check * if all of the migrations are fulfillable after loading them. @@ -723,7 +723,7 @@ class migrator * with the last call to prevent throwing errors unnecessarily). * @return array Array of migration names */ - public function load_migrations(\phpbb\extension\finder $finder, $path, $check_fulfillable = true) + public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true) { if (!is_dir($path)) { |