aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config/installer/container
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2015-07-20 19:26:07 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-07-20 19:26:07 +0200
commit0488c49116f77de55da3ddf36aa2b08f6a5fd085 (patch)
treeb719b8fdff2b4eb00e498d5dc555be67024ff4bd /phpBB/config/installer/container
parent6216007caaa884bdbca8bbb5e098ff231b5a36a6 (diff)
downloadforums-0488c49116f77de55da3ddf36aa2b08f6a5fd085.tar
forums-0488c49116f77de55da3ddf36aa2b08f6a5fd085.tar.gz
forums-0488c49116f77de55da3ddf36aa2b08f6a5fd085.tar.bz2
forums-0488c49116f77de55da3ddf36aa2b08f6a5fd085.tar.xz
forums-0488c49116f77de55da3ddf36aa2b08f6a5fd085.zip
[ticket/13740] Exit from installation if phpBB is already installed
PHPBB3-13740
Diffstat (limited to 'phpBB/config/installer/container')
-rw-r--r--phpBB/config/installer/container/services_install_console.yml1
-rw-r--r--phpBB/config/installer/container/services_install_controller.yml1
-rw-r--r--phpBB/config/installer/container/services_installer.yml6
3 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/config/installer/container/services_install_console.yml b/phpBB/config/installer/container/services_install_console.yml
index 9a4808b6aa..5a1e898754 100644
--- a/phpBB/config/installer/container/services_install_console.yml
+++ b/phpBB/config/installer/container/services_install_console.yml
@@ -21,6 +21,7 @@ services:
- @language
- @installer.helper.iohandler_factory
- @installer.installer.install
+ - @installer.helper.install_helper
tags:
- { name: console.installer.command }
diff --git a/phpBB/config/installer/container/services_install_controller.yml b/phpBB/config/installer/container/services_install_controller.yml
index c8d140aa5f..7acc7025a6 100644
--- a/phpBB/config/installer/container/services_install_controller.yml
+++ b/phpBB/config/installer/container/services_install_controller.yml
@@ -30,3 +30,4 @@ services:
- @template
- @request
- @installer.installer.install
+ - @installer.helper.install_helper
diff --git a/phpBB/config/installer/container/services_installer.yml b/phpBB/config/installer/container/services_installer.yml
index 8e19be5c0c..62137aa9d8 100644
--- a/phpBB/config/installer/container/services_installer.yml
+++ b/phpBB/config/installer/container/services_installer.yml
@@ -56,6 +56,12 @@ services:
- %core.root_path%
- %core.php_ext%
+ installer.helper.install_helper:
+ class: phpbb\install\helper\install_helper
+ arguments:
+ - %core.root_path%
+ - %core.php_ext%
+
# -------- Installer --------------------------------
installer.module_base:
abstract: true