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

Fix handling of svn trunk in version guesser, fixes #8765

pull/8780/head
Jordi Boggiano 2020-04-13 12:48:43 +02:00
parent 876136022b
commit be1ddcf293
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ class VersionGuesser
if (null !== $versionData && null !== $versionData['version']) { if (null !== $versionData && null !== $versionData['version']) {
return $this->postprocess($versionData); return $this->postprocess($versionData);
} }
return null; return null;
} }
@ -321,7 +321,11 @@ class VersionGuesser
} }
$prettyVersion = trim($matches[1]); $prettyVersion = trim($matches[1]);
$version = $this->versionParser->normalize($prettyVersion); if ($prettyVersion === 'trunk') {
$version = 'dev-trunk';
} else {
$version = $this->versionParser->normalize($prettyVersion);
}
return array('version' => $version, 'commit' => '', 'pretty_version' => $prettyVersion); return array('version' => $version, 'commit' => '', 'pretty_version' => $prettyVersion);
} }