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

Merge branch '1.6'

pull/7126/merge
Jordi Boggiano 2018-04-12 20:03:08 +02:00
parent 35ebb8b93f fa539766b8
commit a8cf4a07fc
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/04-schema.md
View File

@ -308,7 +308,9 @@ releases for the `doctrine/data-fixtures` package :
`require` and `require-dev` additionally support explicit references (i.e. `require` and `require-dev` additionally support explicit references (i.e.
commit) for dev versions to make sure they are locked to a given state, even commit) for dev versions to make sure they are locked to a given state, even
when you run update. These only work if you explicitly require a dev version when you run update. These only work if you explicitly require a dev version
and append the reference with `#<ref>`. and append the reference with `#<ref>`. This is also a
[root-only](04-schema.md#root-package) feature and will be ignored in
dependencies.
Example: Example:

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

@ -467,7 +467,7 @@ EOT
} }
$io->write(''); $io->write('');
if (isset($package['warning'])) { if (isset($package['warning'])) {
$io->write('<warning>' . $package['warning'] . '</warning>'); $io->writeError('<warning>' . $package['warning'] . '</warning>');
} }
} }

7
src/Composer/EventDispatcher/EventDispatcher.php
View File

@ -186,7 +186,12 @@ class EventDispatcher
$this->io->writeError(sprintf('<warning>You made a reference to a non-existent script %s</warning>', $callable), true, IOInterface::QUIET); $this->io->writeError(sprintf('<warning>You made a reference to a non-existent script %s</warning>', $callable), true, IOInterface::QUIET);
} }
$return = $this->dispatch($scriptName, new Script\Event($scriptName, $event->getComposer(), $event->getIO(), $event->isDevMode(), $args, $flags)); try {
$return = $this->dispatch($scriptName, new Script\Event($scriptName, $event->getComposer(), $event->getIO(), $event->isDevMode(), $args, $flags));
} catch (ScriptExecutionException $e) {
$this->io->writeError(sprintf('<error>Script %s was called via %s</error>', $callable, $event->getName()), true, IOInterface::QUIET);
throw $e;
}
} }
} elseif ($this->isPhpScript($callable)) { } elseif ($this->isPhpScript($callable)) {
$className = substr($callable, 0, strpos($callable, '::')); $className = substr($callable, 0, strpos($callable, '::'));