mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-14 04:34:07 +02:00
Code Issues Releases Wiki Activity

[ticket/11150] Better pre/post action handling, restore ext.json in case of err

Browse Source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau
2015-09-14 16:20:33 +02:00
committed by Tristan Darricau
parent 51916def9c
commit d6618397bf
5 changed files with 243 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/phpbb/composer/installer.php
View File

@@ -60,10 +60,15 @@ class installer
protected $root_path;
/**
* @var string Store the original working directory in case it has been changed through move_to_root()
* @var string Stores the original working directory in case it has been changed through move_to_root()
*/
private $original_cwd;
/**
* @var array Stores the content of the ext json file before generate_ext_json_file() overrides it
*/
private $ext_json_file_backup;
/**
* @param \phpbb\config\config $config Config object
* @param string $root_path phpBB root path
@@ -157,12 +162,14 @@ class installer
}
catch (\Exception $e)
{
$this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e);
}
if ($result !== 0)
{
$this->restore_ext_json_file();
$this->restore_cwd();
throw new runtime_exception($io->get_composer_error(), []);
}
@@ -444,8 +451,31 @@ class installer
],
];
$this->ext_json_file_backup = null;
$json_file = new JsonFile($this->get_composer_ext_json_filename());
$ext_json_file_backup = $json_file->read();
$json_file->write($ext_json_data);
$this->ext_json_file_backup = $ext_json_file_backup;
}
/**
* Restore the json file overridden by generate_ext_json_file()
*/
protected function restore_ext_json_file()
{
if ($this->ext_json_file_backup)
{
try
{
$json_file = new JsonFile($this->get_composer_ext_json_filename());
$json_file->write($this->ext_json_file_backup);
}
catch (\Exception $e)
{
}
$this->ext_json_file_backup = null;
}
}
/**