aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/install
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-23 22:02:24 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-11-23 22:02:24 +0100
commitf283f5bd03776230df220ff0086d5d3fd3023bb8 (patch)
tree753626d39433344a5ca80323181058d8bf9c07d8 /phpBB/phpbb/install
parent30e01a9e4b91865a32a9afc4e5d4deb9bb9a933b (diff)
parent8d178f15f06e0f6b5e64447dc07157a796645572 (diff)
downloadforums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.gz
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.bz2
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.tar.xz
forums-f283f5bd03776230df220ff0086d5d3fd3023bb8.zip
Merge pull request #4016 from CHItA/ticket/14270
[ticket/14270] Purge cache when the installer is finished * CHItA/ticket/14270: [ticket/14270] Purge cache when the installer is finished
Diffstat (limited to 'phpBB/phpbb/install')
-rw-r--r--phpBB/phpbb/install/installer.php15
1 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/installer.php b/phpBB/phpbb/install/installer.php
index 77e0a896bc..a41b4cd6a6 100644
--- a/phpBB/phpbb/install/installer.php
+++ b/phpBB/phpbb/install/installer.php
@@ -13,6 +13,7 @@
namespace phpbb\install;
+use phpbb\cache\driver\driver_interface;
use phpbb\di\ordered_service_collection;
use phpbb\install\exception\installer_config_not_writable_exception;
use phpbb\install\exception\jump_to_restart_point_exception;
@@ -26,6 +27,11 @@ use phpbb\path_helper;
class installer
{
/**
+ * @var driver_interface
+ */
+ protected $cache;
+
+ /**
* @var config
*/
protected $install_config;
@@ -55,11 +61,13 @@ class installer
/**
* Constructor
*
- * @param config $config Installer config handler
- * @param path_helper $path_helper Path helper
+ * @param driver_interface $cache Cache service
+ * @param config $config Installer config handler
+ * @param path_helper $path_helper Path helper
*/
- public function __construct(config $config, path_helper $path_helper)
+ public function __construct(driver_interface $cache, config $config, path_helper $path_helper)
{
+ $this->cache = $cache;
$this->install_config = $config;
$this->installer_modules = null;
$this->web_root = $path_helper->get_web_root_path();
@@ -235,6 +243,7 @@ class installer
if ($install_finished || $fail_cleanup)
{
$this->install_config->clean_up_config_file();
+ $this->cache->purge();
}
else
{