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

Minor tweaks

pull/7904/head
Jordi Boggiano 2018-12-04 09:34:32 +01:00
parent 0961e16795
commit e753bf08b1
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "d356b92e869790db1e9d2c0f4b10935e", "content-hash": "3243ce6f26231df34d1bceab1a148803",
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",

1
src/Composer/DependencyResolver/Solver.php
View File

@ -217,6 +217,7 @@ class Solver
$this->setupInstalledMap(); $this->setupInstalledMap();
$this->io->writeError('Generating rules', true, IOInterface::DEBUG);
$this->ruleSetGenerator = new RuleSetGenerator($this->policy, $this->pool); $this->ruleSetGenerator = new RuleSetGenerator($this->policy, $this->pool);
$this->rules = $this->ruleSetGenerator->getRulesFor($this->jobs, $this->installedMap, $ignorePlatformReqs); $this->rules = $this->ruleSetGenerator->getRulesFor($this->jobs, $this->installedMap, $ignorePlatformReqs);
$this->checkForRootRequireProblems($ignorePlatformReqs); $this->checkForRootRequireProblems($ignorePlatformReqs);

2
src/Composer/Repository/ComposerRepository.php
View File

@ -527,6 +527,8 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
// TODO what if not, then throw? // TODO what if not, then throw?
if ($this->lazyProvidersUrl) { if ($this->lazyProvidersUrl) {
foreach ($packageNames as $name => $constraint) { foreach ($packageNames as $name => $constraint) {
$name = strtolower($name);
// skip platform packages, root package and composer-plugin-api // skip platform packages, root package and composer-plugin-api
if (preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $name) || '__root__' === $name || 'composer-plugin-api' === $name) { if (preg_match(PlatformRepository::PLATFORM_PACKAGE_REGEX, $name) || '__root__' === $name || 'composer-plugin-api' === $name) {
continue; continue;