1
0
Fork 0

Merge branch '2.3' into main

pull/10893/head
Jordi Boggiano 2022-06-22 13:49:30 +02:00
commit b627816781
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 13 additions and 2 deletions

View File

@ -253,7 +253,14 @@ class EventDispatcher
}
} else {
$args = implode(' ', array_map(array('Composer\Util\ProcessExecutor', 'escape'), $event->getArguments()));
// @putenv does not receive arguments
if (strpos($callable, '@putenv ') === 0) {
$exec = $callable;
} else {
$exec = $callable . ($args === '' ? '' : ' '.$args);
}
if ($this->io->isVerbose()) {
$this->io->writeError(sprintf('> %s: %s', $event->getName(), $exec));
} elseif ($event->getName() !== '__exec_command') {

View File

@ -226,7 +226,11 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
}
}
try {
$this->addPackage($this->loader->load($package));
} catch (\Exception $e) {
throw new \RuntimeException('Failed loading the package in '.$composerFilePath, 0, $e);
}
}
}