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

Merge branch '2.2' into main

pull/10684/head
Jordi Boggiano 2022-03-31 16:53:12 +02:00
parent 147c6a2f7e 2b99d069b2
commit df0f9ad3fc
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
composer.lock generated
View File

@ -695,23 +695,24 @@
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",
"version": "1.8.3", "version": "1.8.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/jsonlint.git", "url": "https://github.com/Seldaek/jsonlint.git",
"reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57" "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57", "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d9a308b84277a7dd651ba89bf5ed37b88497b171",
"reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57", "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3 || ^7.0 || ^8.0" "php": "^5.3 || ^7.0 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" "phpstan/phpstan": "^0.12.59",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
}, },
"bin": [ "bin": [
"bin/jsonlint" "bin/jsonlint"
@ -742,7 +743,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Seldaek/jsonlint/issues", "issues": "https://github.com/Seldaek/jsonlint/issues",
"source": "https://github.com/Seldaek/jsonlint/tree/1.8.3" "source": "https://github.com/Seldaek/jsonlint/tree/1.8.9"
}, },
"funding": [ "funding": [
{ {
@ -754,7 +755,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-11-11T09:19:24+00:00" "time": "2022-03-31T11:30:35+00:00"
}, },
{ {
"name": "seld/phar-utils", "name": "seld/phar-utils",

9
src/Composer/Repository/PathRepository.php
View File

@ -211,7 +211,6 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
$package['dist']['reference'] = trim($output); $package['dist']['reference'] = trim($output);
} }
$needsAlias = false;
if (!isset($package['version'])) { if (!isset($package['version'])) {
$versionData = $this->versionGuesser->guessVersion($package, $path); $versionData = $this->versionGuesser->guessVersion($package, $path);
if (is_array($versionData) && $versionData['pretty_version']) { if (is_array($versionData) && $versionData['pretty_version']) {
@ -224,16 +223,10 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
$package['version'] = $versionData['pretty_version']; $package['version'] = $versionData['pretty_version'];
} else { } else {
$package['version'] = 'dev-main'; $package['version'] = 'dev-main';
$needsAlias = true;
} }
} }
$package = $this->loader->load($package); $this->addPackage($this->loader->load($package));
if ($needsAlias && $package instanceof CompletePackage) {
// keep a dev-master alias to dev-main for BC
$package = new CompleteAliasPackage($package, 'dev-master', 'dev-master');
}
$this->addPackage($package);
} }
} }