Do not chdir unless necessary
parent
7b549010d5
commit
979db8539d
|
@ -105,12 +105,16 @@ class Application extends BaseApplication
|
||||||
$this->io->enableDebugging($startTime);
|
$this->io->enableDebugging($startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
$oldWorkingDir = getcwd();
|
if ($newWorkDir = $this->getNewWorkingDir($input)) {
|
||||||
$this->switchWorkingDir($input);
|
$oldWorkingDir = getcwd();
|
||||||
|
chdir($newWorkDir);
|
||||||
|
}
|
||||||
|
|
||||||
$result = parent::doRun($input, $output);
|
$result = parent::doRun($input, $output);
|
||||||
|
|
||||||
chdir($oldWorkingDir);
|
if (isset($oldWorkingDir)) {
|
||||||
|
chdir($oldWorkingDir);
|
||||||
|
}
|
||||||
|
|
||||||
if (isset($startTime)) {
|
if (isset($startTime)) {
|
||||||
$output->writeln('<info>Memory usage: '.round(memory_get_usage() / 1024 / 1024, 2).'MB (peak: '.round(memory_get_peak_usage() / 1024 / 1024, 2).'MB), time: '.round(microtime(true) - $startTime, 2).'s');
|
$output->writeln('<info>Memory usage: '.round(memory_get_usage() / 1024 / 1024, 2).'MB (peak: '.round(memory_get_peak_usage() / 1024 / 1024, 2).'MB), time: '.round(microtime(true) - $startTime, 2).'s');
|
||||||
|
@ -123,13 +127,14 @@ class Application extends BaseApplication
|
||||||
* @param InputInterface $input
|
* @param InputInterface $input
|
||||||
* @throws \RuntimeException
|
* @throws \RuntimeException
|
||||||
*/
|
*/
|
||||||
private function switchWorkingDir(InputInterface $input)
|
private function getNewWorkingDir(InputInterface $input)
|
||||||
{
|
{
|
||||||
$workingDir = $input->getParameterOption(array('--working-dir', '-d'), getcwd());
|
$workingDir = $input->getParameterOption(array('--working-dir', '-d'));
|
||||||
if (!is_dir($workingDir)) {
|
if (false !== $workingDir && !is_dir($workingDir)) {
|
||||||
throw new \RuntimeException('Invalid working directory specified.');
|
throw new \RuntimeException('Invalid working directory specified.');
|
||||||
}
|
}
|
||||||
chdir($workingDir);
|
|
||||||
|
return $workingDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue