diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:36:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:36:38 +0200 |
| commit | 4a06511d853024193435fd9b2e347ff292589420 (patch) | |
| tree | aa3e98bfad040be23c232b235140e64ef8ce0d7f /phpBB/phpbb/extension | |
| parent | 2e1aebbc12bded1cb311394fe5acb5d8b13124c6 (diff) | |
| parent | 8b16d3141396a11db3ab4ade49af91f2477f5fb6 (diff) | |
| download | forums-4a06511d853024193435fd9b2e347ff292589420.tar forums-4a06511d853024193435fd9b2e347ff292589420.tar.gz forums-4a06511d853024193435fd9b2e347ff292589420.tar.bz2 forums-4a06511d853024193435fd9b2e347ff292589420.tar.xz forums-4a06511d853024193435fd9b2e347ff292589420.zip | |
Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
Diffstat (limited to 'phpBB/phpbb/extension')
| -rw-r--r-- | phpBB/phpbb/extension/base.php | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/phpBB/phpbb/extension/base.php b/phpBB/phpbb/extension/base.php index 288fb7d19c..b74026e6ab 100644 --- a/phpBB/phpbb/extension/base.php +++ b/phpBB/phpbb/extension/base.php @@ -35,6 +35,9 @@ class base implements \phpbb\extension\extension_interface /** @var string */ protected $extension_path; + /** @var string[] */ + private $migrations = false; + /** * Constructor * @@ -122,19 +125,27 @@ class base implements \phpbb\extension\extension_interface */ protected function get_migration_file_list() { - static $migrations = false; - - if ($migrations !== false) + if ($this->migrations !== false) { - return $migrations; + return $this->migrations; } // Only have the finder search in this extension path directory $migrations = $this->extension_finder - ->extension_directory('/migrations') + ->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); + return $migrations; } } |