diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-02 17:12:43 -0500 |
| commit | e08edd36b9f18b9206ea327bcfb45e4331630d1b (patch) | |
| tree | 4f3b5d9aca26191bb65695f1b800cf21be51075f /phpBB/config | |
| parent | 9fca8f88fa533c9f8cae80ec5d92f2961006e982 (diff) | |
| parent | 91be99822312d9a83ae4f6849eef864dfd47e4a1 (diff) | |
| download | forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.gz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.bz2 forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.tar.xz forums-e08edd36b9f18b9206ea327bcfb45e4331630d1b.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11386' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386:
[ticket/11386] Fix failing tests from constructor changes
[ticket/11386] Fix circular reference error & serialize error
[ticket/11386] Remove tests that check if finder cache is working
[ticket/11386] Forgot to get the migration classes
[ticket/11386] Update tests with new constructors for ext.manager/migrator
[ticket/11386] Use finder to find migration files
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/migrator.yml | 2 | ||||
| -rw-r--r-- | phpBB/config/services.yml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/config/migrator.yml b/phpBB/config/migrator.yml index 999a2d41a3..42445ef9bf 100644 --- a/phpBB/config/migrator.yml +++ b/phpBB/config/migrator.yml @@ -10,6 +10,8 @@ services: - %core.php_ext% - %core.table_prefix% - @migrator.tool_collection + calls: + - [set_extension_manager, [@ext.manager]] migrator.tool_collection: class: phpbb_di_service_collection diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 3e4ae8d129..250e4a782b 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -116,11 +116,12 @@ services: - @service_container - @dbal.conn - @config - - @migrator - %tables.ext% - %core.root_path% - .%core.php_ext% - @cache.driver + calls: + - [set_migrator, [@migrator]] ext.finder: class: phpbb_extension_finder |