From 71896b07770730a88dbee5d3063042f05970cd16 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 31 Jan 2018 14:06:54 +0100 Subject: [PATCH 1/5] Fix self-update regression, fixes #7045 --- src/Composer/Command/SelfUpdateCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Command/SelfUpdateCommand.php b/src/Composer/Command/SelfUpdateCommand.php index 3ed72bdbc..52f7b87f0 100644 --- a/src/Composer/Command/SelfUpdateCommand.php +++ b/src/Composer/Command/SelfUpdateCommand.php @@ -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('You are running composer as "'.$composeUser.'", while "'.$home.'" is owned by "'.$homeOwner.'"'); + if (isset($composeUser['name']) && isset($homeOwner['name']) && $composeUser['name'] !== $homeOwner['name']) { + $io->writeError('You are running composer as "'.$composeUser['name'].'", while "'.$home.'" is owned by "'.$homeOwner['name'].'"'); } } From 9b3ab4896d8dec27cb7427d57c7f553539c3a0ff Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 31 Jan 2018 14:20:29 +0100 Subject: [PATCH 2/5] Update SPDX licenses to 1.3.0, fixes #7039 --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 1ab5c6c33..1a0d1b046 100644 --- a/composer.lock +++ b/composer.lock @@ -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", From a61a8d78b13e2bb2eee7178552ab55168406b213 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 31 Jan 2018 16:11:37 +0100 Subject: [PATCH 3/5] Fix warning for packages not existing while they exist but not at the required stability, fixes #7044 --- src/Composer/Command/InitCommand.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index 33df93a8b..a17efe6b9 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -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, From 056ac0258dbfebb8aedd63ef9e45e46281fd61ab Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 31 Jan 2018 16:22:54 +0100 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1abff21f..4a9a026a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From 1f3c52d3af82da40c63d592ded1bf4802b0d55e2 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 31 Jan 2018 16:23:01 +0100 Subject: [PATCH 5/5] Doc tweak --- doc/03-cli.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/03-cli.md b/doc/03-cli.md index 04ae1d0ae..31d0b6b50 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -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