public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Debug info improvements

pull/9565/head
Jordi Boggiano 2020-12-15 14:55:44 +01:00
parent 378a5b72b9
commit eb9616a82b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Command/RequireCommand.php
View File

@ -190,7 +190,7 @@ EOT
); );
} catch (\Exception $e) { } catch (\Exception $e) {
if ($this->newlyCreated) { if ($this->newlyCreated) {
throw new \RuntimeException('No composer.json present in the current directory, this may be the cause of the following exception.', 0, $e); throw new \RuntimeException('No composer.json present in the current directory ('.$this->file.'), this may be the cause of the following exception.', 0, $e);
} }
throw $e; throw $e;

2
src/Composer/Factory.php
View File

@ -315,7 +315,7 @@ class Factory
$config = static::createConfig($io, $cwd); $config = static::createConfig($io, $cwd);
$config->merge($localConfig); $config->merge($localConfig);
if (isset($composerFile)) { if (isset($composerFile)) {
$io->writeError('Loading config file ' . $composerFile, true, IOInterface::DEBUG); $io->writeError('Loading config file ' . $composerFile .' ('.realpath($composerFile).')', true, IOInterface::DEBUG);
$config->setConfigSource(new JsonConfigSource(new JsonFile(realpath($composerFile), null, $io))); $config->setConfigSource(new JsonConfigSource(new JsonFile(realpath($composerFile), null, $io)));
$localAuthFile = new JsonFile(dirname(realpath($composerFile)) . '/auth.json', null, $io); $localAuthFile = new JsonFile(dirname(realpath($composerFile)) . '/auth.json', null, $io);

7
src/Composer/Json/JsonFile.php
View File

@ -90,7 +90,12 @@ class JsonFile
$json = $this->httpDownloader->get($this->path)->getBody(); $json = $this->httpDownloader->get($this->path)->getBody();
} else { } else {
if ($this->io && $this->io->isDebug()) { if ($this->io && $this->io->isDebug()) {
$this->io->writeError('Reading ' . $this->path); $realpathInfo = '';
$realpath = realpath($this->path);
if (false !== $realpath && $realpath !== $this->path) {
$realpathInfo = ' (' . $realpath . ')';
}
$this->io->writeError('Reading ' . $this->path . $realpathInfo);
} }
$json = file_get_contents($this->path); $json = file_get_contents($this->path);
} }