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

Merge branch '1.6'

pull/7070/head
Jordi Boggiano 2018-01-31 16:23:09 +01:00
parent f31e2552be 1f3c52d3af
commit 9f34ee9892
5 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,3 +1,12 @@
### [1.6.3] 2018-01-31
* Fixed GitLab downloads failing in some edge cases
* Fixed ctrl-C handling during create-project
* Fixed GitHub VCS repositories not prompting for a token in some conditions
* Fixed SPDX license identifiers being case sensitive
* Fixed and clarified a few dependency resolution error reporting strings
* Fixed SVN commit log fetching in verbose mode when using private repositories
### [1.6.2] 2018-01-05
* Fixed more autoloader regressions
@ -619,6 +628,7 @@
* Initial release
[1.6.3]: https://github.com/composer/composer/compare/1.6.2...1.6.3
[1.6.2]: https://github.com/composer/composer/compare/1.6.1...1.6.2
[1.6.1]: https://github.com/composer/composer/compare/1.6.0...1.6.1
[1.6.0]: https://github.com/composer/composer/compare/1.6.0-RC...1.6.0

10
composer.lock generated
View File

@ -126,16 +126,16 @@
},
{
"name": "composer/spdx-licenses",
"version": "1.2.0",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/composer/spdx-licenses.git",
"reference": "2d899e9b33023c631854f36c39ef9f8317a7ab33"
"reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/2d899e9b33023c631854f36c39ef9f8317a7ab33",
"reference": "2d899e9b33023c631854f36c39ef9f8317a7ab33",
"url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30",
"reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30",
"shasum": ""
},
"require": {
@ -183,7 +183,7 @@
"spdx",
"validator"
],
"time": "2018-01-03T16:37:06+00:00"
"time": "2018-01-31T13:17:27+00:00"
},
{
"name": "justinrainbow/json-schema",

1
doc/03-cli.md
View File

@ -668,6 +668,7 @@ By default the command checks for the packages on packagist.org.
* **--keep-vcs:** Skip the deletion of the VCS metadata for the created
project. This is mostly useful if you run the command in non-interactive
mode.
* **--remove-vcs:** Force-remove the VCS metadata without prompting.
* **--no-install:** Disables installation of the vendors.
* **--ignore-platform-reqs:** ignore `php`, `hhvm`, `lib-*` and `ext-*`
requirements and force the installation even if the local machine does not

10
src/Composer/Command/InitCommand.php
View File

@ -705,8 +705,18 @@ EOT
));
}
// Check for similar names/typos
$similar = $this->findSimilar($name);
if ($similar) {
// Check whether the minimum stability was the problem but the package exists
if ($requiredVersion === null && in_array($name, $similar, true)) {
throw new \InvalidArgumentException(sprintf(
'Could not find a version of package %s matching your minimum-stability (%s). Require it with an explicit version constraint allowing its desired stability.',
$name,
$this->getMinimumStability($input)
));
}
throw new \InvalidArgumentException(sprintf(
"Could not find package %s.\n\nDid you mean " . (count($similar) > 1 ? 'one of these' : 'this') . "?\n %s",
$name,

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

@ -111,8 +111,8 @@ EOT
if (function_exists('posix_getpwuid') && function_exists('posix_geteuid')) {
$composeUser = posix_getpwuid(posix_geteuid());
$homeOwner = posix_getpwuid(fileowner($home));
if ($composeUser !== $homeOwner) {
$io->writeError('<warning>You are running composer as "'.$composeUser.'", while "'.$home.'" is owned by "'.$homeOwner.'"</warning>');
if (isset($composeUser['name']) && isset($homeOwner['name']) && $composeUser['name'] !== $homeOwner['name']) {
$io->writeError('<warning>You are running composer as "'.$composeUser['name'].'", while "'.$home.'" is owned by "'.$homeOwner['name'].'"</warning>');
}
}