From 4ae2aecc546e2b9089feeac077ec638a4acc1401 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 2 Jan 2017 12:12:37 +0100 Subject: [PATCH 1/6] Add missing definition of a property --- src/Composer/Repository/ArtifactRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Composer/Repository/ArtifactRepository.php b/src/Composer/Repository/ArtifactRepository.php index 50a08241f..a8002123a 100644 --- a/src/Composer/Repository/ArtifactRepository.php +++ b/src/Composer/Repository/ArtifactRepository.php @@ -27,6 +27,7 @@ class ArtifactRepository extends ArrayRepository implements ConfigurableReposito protected $lookup; protected $repoConfig; + private $io; public function __construct(array $repoConfig, IOInterface $io) { From d48d11d18738c076a5caf9c2eeb01844d8366c6d Mon Sep 17 00:00:00 2001 From: johnstevenson Date: Tue, 3 Jan 2017 19:55:19 +0000 Subject: [PATCH 2/6] Fix scanned ini files logic --- src/Composer/XdebugHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/XdebugHandler.php b/src/Composer/XdebugHandler.php index a55d37368..fb0570925 100644 --- a/src/Composer/XdebugHandler.php +++ b/src/Composer/XdebugHandler.php @@ -136,6 +136,7 @@ class XdebugHandler { $this->tmpIni = ''; $iniPaths = IniHelper::getAll(); + $additional = count($iniPaths) > 1; if (empty($iniPaths[0])) { // There is no loaded ini @@ -143,7 +144,7 @@ class XdebugHandler } if ($this->writeTmpIni($iniPaths)) { - return $this->setEnvironment($iniPaths); + return $this->setEnvironment($additional, $iniPaths); } return false; @@ -193,15 +194,14 @@ class XdebugHandler /** * Returns true if the restart environment variables were set * + * @param bool $additional Whether there were additional inis * @param array $iniPaths Locations used by the current prcoess * * @return bool */ - private function setEnvironment(array $iniPaths) + private function setEnvironment($additional, array $iniPaths) { // Set scan dir to an empty value if additional ini files were used - $additional = count($iniPaths) > 1; - if ($additional && !putenv('PHP_INI_SCAN_DIR=')) { return false; } From 5f64cae860530ea2da63269ea9916c9256ae77d5 Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Thu, 5 Jan 2017 10:56:16 -0800 Subject: [PATCH 3/6] Make PluginManager::addPlugin() public --- src/Composer/Plugin/PluginManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Composer/Plugin/PluginManager.php b/src/Composer/Plugin/PluginManager.php index 80b5b91ea..2f09d789f 100644 --- a/src/Composer/Plugin/PluginManager.php +++ b/src/Composer/Plugin/PluginManager.php @@ -225,7 +225,7 @@ class PluginManager * * @param PluginInterface $plugin plugin instance */ - private function addPlugin(PluginInterface $plugin) + public function addPlugin(PluginInterface $plugin) { $this->io->writeError('Loading plugin '.get_class($plugin), true, IOInterface::DEBUG); $this->plugins[] = $plugin; From 677e75d1682fa3855011448b757dd3a0edb2841a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 7 Jan 2017 17:36:47 +0100 Subject: [PATCH 4/6] Add phpdoc comment --- src/Composer/Plugin/PluginManager.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Composer/Plugin/PluginManager.php b/src/Composer/Plugin/PluginManager.php index 2f09d789f..bb67e03a6 100644 --- a/src/Composer/Plugin/PluginManager.php +++ b/src/Composer/Plugin/PluginManager.php @@ -223,6 +223,10 @@ class PluginManager /** * Adds a plugin, activates it and registers it with the event dispatcher * + * Ideally plugin packages should be registered via registerPackage, but if you use Composer + * programmatically and want to register a plugin class directly this is a valid way + * to do it. + * * @param PluginInterface $plugin plugin instance */ public function addPlugin(PluginInterface $plugin) From 95e9ad57d429567a1b34a6ab3c7bcbff9de335ee Mon Sep 17 00:00:00 2001 From: Pete Akins Date: Wed, 4 Jan 2017 21:29:38 -0500 Subject: [PATCH 5/6] =?UTF-8?q?Don=E2=80=99t=20add=20github=20specials=20i?= =?UTF-8?q?f=20there=20is=20no=20composer=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can happen if an identifier doesn’t have a composer.json file (but other identifiers do) --- src/Composer/Repository/Vcs/GitHubDriver.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Composer/Repository/Vcs/GitHubDriver.php b/src/Composer/Repository/Vcs/GitHubDriver.php index b33b99916..ed4155c01 100644 --- a/src/Composer/Repository/Vcs/GitHubDriver.php +++ b/src/Composer/Repository/Vcs/GitHubDriver.php @@ -152,14 +152,16 @@ class GitHubDriver extends VcsDriver } $composer = $this->getBaseComposerInformation($identifier); + if ($composer) { - // specials for github - if (!isset($composer['support']['source'])) { - $label = array_search($identifier, $this->getTags()) ?: array_search($identifier, $this->getBranches()) ?: $identifier; - $composer['support']['source'] = sprintf('https://%s/%s/%s/tree/%s', $this->originUrl, $this->owner, $this->repository, $label); - } - if (!isset($composer['support']['issues']) && $this->hasIssues) { - $composer['support']['issues'] = sprintf('https://%s/%s/%s/issues', $this->originUrl, $this->owner, $this->repository); + // specials for github + if (!isset($composer['support']['source'])) { + $label = array_search($identifier, $this->getTags()) ?: array_search($identifier, $this->getBranches()) ?: $identifier; + $composer['support']['source'] = sprintf('https://%s/%s/%s/tree/%s', $this->originUrl, $this->owner, $this->repository, $label); + } + if (!isset($composer['support']['issues']) && $this->hasIssues) { + $composer['support']['issues'] = sprintf('https://%s/%s/%s/issues', $this->originUrl, $this->owner, $this->repository); + } } if ($this->shouldCache($identifier)) { From 6a0d5a03d264539370ccec1222d88fab7920e960 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Sat, 7 Jan 2017 18:08:37 +0100 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf447af40..8126cf5b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### [1.3.1] - 2017-01-07 + + * Fixed dist downloads from Bitbucket + * Fixed some regressions related to xdebug disabling + * Fixed `--minor-only` flag in `outdated` command + * Fixed handling of config.platform.php which did not replace other php-* package's versions + ### [1.3.0] - 2016-12-24 * Fixed handling of annotated git tags vs lightweight tags leading to useless updates sometimes @@ -477,6 +484,7 @@ * Initial release +[1.3.1]: https://github.com/composer/composer/compare/1.3.0...1.3.1 [1.3.0]: https://github.com/composer/composer/compare/1.3.0-RC...1.3.0 [1.3.0-RC]: https://github.com/composer/composer/compare/1.2.4...1.3.0-RC [1.2.4]: https://github.com/composer/composer/compare/1.2.3...1.2.4