diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-08-28 21:18:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-08-28 21:18:41 +0200 |
| commit | 80a1314ebb1f3b180760beb3b780f87e1a43ea90 (patch) | |
| tree | 452fbcb464bb71b5f8ff98b2c7924f34cda171fa | |
| parent | 704838762098456a256c69e77501a8cb336ef91b (diff) | |
| parent | cbbef46c6cd3d453019779db0d6ef700cf11762b (diff) | |
| download | forums-80a1314ebb1f3b180760beb3b780f87e1a43ea90.tar forums-80a1314ebb1f3b180760beb3b780f87e1a43ea90.tar.gz forums-80a1314ebb1f3b180760beb3b780f87e1a43ea90.tar.bz2 forums-80a1314ebb1f3b180760beb3b780f87e1a43ea90.tar.xz forums-80a1314ebb1f3b180760beb3b780f87e1a43ea90.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/phpbb/db/migrator.php | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php index 8bc63e564a..44bea3c5d2 100644 --- a/phpBB/phpbb/db/migrator.php +++ b/phpBB/phpbb/db/migrator.php @@ -715,60 +715,6 @@ class migrator } /** - * Load migration data files from a directory - * - * @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. - * If FALSE, we will not check. You SHOULD check at least once - * to prevent errors (if including multiple directories, check - * with the last call to prevent throwing errors unnecessarily). - * @return array Array of migration names - * @throws \phpbb\db\migration\exception - */ - public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true) - { - if (!is_dir($path)) - { - throw new \phpbb\db\migration\exception('DIRECTORY INVALID', $path); - } - - $migrations = array(); - - $files = $finder - ->extension_directory("/") - ->find_from_paths(array('/' => $path)); - foreach ($files as $file) - { - $migrations[$file['path'] . $file['filename']] = ''; - } - $migrations = $finder->get_classes_from_files($migrations); - - foreach ($migrations as $migration) - { - if (!in_array($migration, $this->migrations)) - { - $this->migrations[] = $migration; - } - } - - if ($check_fulfillable) - { - foreach ($this->migrations as $name) - { - $unfulfillable = $this->unfulfillable($name); - if ($unfulfillable !== false) - { - throw new \phpbb\db\migration\exception('MIGRATION_NOT_FULFILLABLE', $name, $unfulfillable); - } - } - } - - return $this->migrations; - } - - /** * Creates the migrations table if it does not exist. * @return null */ |