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

Merge branch '1.10'

pull/9324/head
Jordi Boggiano 2020-10-23 10:38:03 +02:00
parent 4d2f41a415 dacc21e54f
commit 49a28f606c
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/04-schema.md
View File

@ -442,9 +442,15 @@ that exact version, and not any other version, which would be incorrect.
#### provide #### provide
List of other packages that are provided by this package. This is mostly List of other packages that are provided by this package. This is mostly
useful for common interfaces. A package could depend on some virtual useful for implementations of common interfaces. A package could depend on
`logger` package, any library that implements this logger interface would some virtual `logger-implementation` package, any library that implements
simply list it in `provide`. this logger interface would simply list it in `provide`.
Using `provide` with the name of an actual package rather than a virtual one
implies that the code of that package is also shipped, in which case `replace`
is generally a better choice. A common convention for packages providing an
interface and relying on other packages to provide an implementation (for
instance the PSR interfaces) is to use a `-implementation` suffix for the
name of the virtual package corresponding to the interface package.
#### suggest #### suggest

15
src/Composer/Command/SelfUpdateCommand.php
View File

@ -176,8 +176,19 @@ EOT
return 1; return 1;
} }
$channelString = $versionsUtil->getChannel();
if (is_numeric($channelString)) {
$channelString .= '.x';
}
if (Composer::VERSION === $updateVersion) { if (Composer::VERSION === $updateVersion) {
$io->writeError(sprintf('<info>You are already using composer version %s (%s channel).</info>', $updateVersion, $versionsUtil->getChannel())); $io->writeError(
sprintf(
'<info>You are already using composer version %s (%s channel).</info>',
$updateVersion,
$channelString
)
);
// remove all backups except for the most recent, if any // remove all backups except for the most recent, if any
if ($input->getOption('clean-backups')) { if ($input->getOption('clean-backups')) {
@ -198,7 +209,7 @@ EOT
$updatingToTag = !preg_match('{^[0-9a-f]{40}$}', $updateVersion); $updatingToTag = !preg_match('{^[0-9a-f]{40}$}', $updateVersion);
$io->write(sprintf("Upgrading to version <info>%s</info> (%s channel).", $updateVersion, $versionsUtil->getChannel())); $io->write(sprintf("Upgrading to version <info>%s</info> (%s channel).", $updateVersion, $channelString));
$remoteFilename = $baseUrl . ($updatingToTag ? "/download/{$updateVersion}/composer.phar" : '/composer.phar'); $remoteFilename = $baseUrl . ($updatingToTag ? "/download/{$updateVersion}/composer.phar" : '/composer.phar');
$signature = $httpDownloader->get($remoteFilename.'.sig')->getBody(); $signature = $httpDownloader->get($remoteFilename.'.sig')->getBody();
$io->writeError(' ', false); $io->writeError(' ', false);

4
src/Composer/Package/Archiver/ArchivableFilesFinder.php
View File

@ -43,7 +43,7 @@ class ArchivableFilesFinder extends \FilterIterator
{ {
$fs = new Filesystem(); $fs = new Filesystem();
$sources = $fs->normalizePath($sources); $sources = $fs->normalizePath(realpath($sources));
if ($ignoreFilters) { if ($ignoreFilters) {
$filters = array(); $filters = array();
@ -58,7 +58,7 @@ class ArchivableFilesFinder extends \FilterIterator
$this->finder = new Finder(); $this->finder = new Finder();
$filter = function (\SplFileInfo $file) use ($sources, $filters, $fs) { $filter = function (\SplFileInfo $file) use ($sources, $filters, $fs) {
if ($file->isLink() && strpos($file->getLinkTarget(), $sources) !== 0) { if ($file->isLink() && strpos($file->getRealPath(), $sources) !== 0) {
return false; return false;
} }