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

Avoid skipping feature branch detection if no branch-alias is defined at all

pull/8702/head
Jordi Boggiano 2020-03-13 11:39:19 +01:00
parent 70f23e42f3
commit 0d2c2c044a
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Version/VersionGuesser.php
View File

@ -231,7 +231,7 @@ class VersionGuesser
// ignore feature branches if they have no branch-alias or self.version is used // ignore feature branches if they have no branch-alias or self.version is used
// and find the branch they came from to use as a version instead // and find the branch they came from to use as a version instead
if ((isset($packageConfig['extra']['branch-alias']) && !isset($packageConfig['extra']['branch-alias'][$version])) if (!isset($packageConfig['extra']['branch-alias'][$version])
|| strpos(json_encode($packageConfig), '"self.version"') || strpos(json_encode($packageConfig), '"self.version"')
) { ) {
$branch = preg_replace('{^dev-}', '', $version); $branch = preg_replace('{^dev-}', '', $version);