diff --git a/composer.lock b/composer.lock index 2d88a0219..18f53e407 100644 --- a/composer.lock +++ b/composer.lock @@ -695,23 +695,24 @@ }, { "name": "seld/jsonlint", - "version": "1.8.3", + "version": "1.8.9", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57" + "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57", - "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d9a308b84277a7dd651ba89bf5ed37b88497b171", + "reference": "d9a308b84277a7dd651ba89bf5ed37b88497b171", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "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/jsonlint" @@ -742,7 +743,7 @@ ], "support": { "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": [ { @@ -754,7 +755,7 @@ "type": "tidelift" } ], - "time": "2020-11-11T09:19:24+00:00" + "time": "2022-03-31T11:30:35+00:00" }, { "name": "seld/phar-utils", diff --git a/src/Composer/Repository/PathRepository.php b/src/Composer/Repository/PathRepository.php index 7458ff519..ce1babd3c 100644 --- a/src/Composer/Repository/PathRepository.php +++ b/src/Composer/Repository/PathRepository.php @@ -211,7 +211,6 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn $package['dist']['reference'] = trim($output); } - $needsAlias = false; if (!isset($package['version'])) { $versionData = $this->versionGuesser->guessVersion($package, $path); if (is_array($versionData) && $versionData['pretty_version']) { @@ -224,16 +223,10 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn $package['version'] = $versionData['pretty_version']; } else { $package['version'] = 'dev-main'; - $needsAlias = true; } } - $package = $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); + $this->addPackage($this->loader->load($package)); } }