makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Restore the cwd before using the autoloader in case of error

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-13 21:04:03 +02:00 • committed by Tristan Darricau
parent 50b2989cf0
commit a32d429f1e
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
phpBB/phpbb/composer/installer.php
View file

@ -20,7 +20,6 @@ use Composer\IO\NullIO;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Package\CompletePackage; use Composer\Package\CompletePackage;
use Composer\Package\LinkConstraint\LinkConstraintInterface; use Composer\Package\LinkConstraint\LinkConstraintInterface;
use Composer\Package\LinkConstraint\VersionConstraint;
use Composer\Package\PackageInterface; use Composer\Package\PackageInterface;
use Composer\Repository\ComposerRepository; use Composer\Repository\ComposerRepository;
use Composer\Repository\RepositoryInterface; use Composer\Repository\RepositoryInterface;
@ -60,6 +59,11 @@ class installer
*/ */
protected $root_path; protected $root_path;
/**
* @var string Store the original working directory in case it has been changed through move_to_root()
*/
private $original_cwd;
/** /**
* @param \phpbb\config\config $config Config object * @param \phpbb\config\config $config Config object
* @param string $root_path phpBB root path * @param string $root_path phpBB root path
@ -93,17 +97,16 @@ class installer
public function install(array $packages, $whitelist, IOInterface $io = null) public function install(array $packages, $whitelist, IOInterface $io = null)
{ {
// The composer installers works with a path relative to the current directory // The composer installers works with a path relative to the current directory
$original_working_dir = getcwd(); $this->move_to_root();
chdir($this->root_path);
try try
{ {
$this->do_install($packages, $whitelist, $io); $this->do_install($packages, $whitelist, $io);
chdir($original_working_dir); $this->restore_cwd();
} }
catch (\Exception $e) catch (\Exception $e)
{ {
chdir($original_working_dir); $this->restore_cwd();
throw $e; throw $e;
} }
} }
@ -154,11 +157,13 @@ class installer
} }
catch (\Exception $e) catch (\Exception $e)
{ {
$this->restore_cwd();
throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e); throw new runtime_exception('COMPOSER_CANNOT_INSTALL', [], $e);
} }
if ($result !== 0) if ($result !== 0)
{ {
$this->restore_cwd();
throw new runtime_exception($io->get_composer_error(), []); throw new runtime_exception($io->get_composer_error(), []);
} }
} }
@ -173,17 +178,16 @@ class installer
public function get_installed_packages($types) public function get_installed_packages($types)
{ {
// The composer installers works with a path relative to the current directory // The composer installers works with a path relative to the current directory
$original_working_dir = getcwd(); $this->move_to_root();
chdir($this->root_path);
try try
{ {
$result = $this->do_get_installed_packages($types); $result = $this->do_get_installed_packages($types);
chdir($original_working_dir); $this->restore_cwd();
} }
catch (\Exception $e) catch (\Exception $e)
{ {
chdir($original_working_dir); $this->restore_cwd();
throw $e; throw $e;
} }
@ -240,17 +244,16 @@ class installer
public function get_available_packages($type) public function get_available_packages($type)
{ {
// The composer installers works with a path relative to the current directory // The composer installers works with a path relative to the current directory
$original_working_dir = getcwd(); $this->move_to_root();
chdir($this->root_path);
try try
{ {
$result = $this->do_get_available_packages($type); $result = $this->do_get_available_packages($type);
chdir($original_working_dir); $this->restore_cwd();
} }
catch (\Exception $e) catch (\Exception $e)
{ {
chdir($original_working_dir); $this->restore_cwd();
throw $e; throw $e;
} }
@ -592,4 +595,28 @@ class installer
{ {
$this->root_path = $root_path; $this->root_path = $root_path;
} }
/**
* Change the current directory to phpBB root
*/
protected function move_to_root()
{
if ($this->original_cwd === null)
{
$this->original_cwd = getcwd();
chdir($this->root_path);
}
}
/**
* Restore the current working directory if move_to_root() have been called
*/
protected function restore_cwd()
{
if ($this->original_cwd)
{
chdir($this->original_cwd);
$this->original_cwd = null;
}
}
} }