浏览代码

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

Jordi Boggiano 5 年之前
父节点
当前提交
be1ddcf293
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      src/Composer/Package/Version/VersionGuesser.php

+ 6 - 2
src/Composer/Package/Version/VersionGuesser.php

@@ -89,7 +89,7 @@ class VersionGuesser
         if (null !== $versionData && null !== $versionData['version']) {
             return $this->postprocess($versionData);
         }
-        
+
         return null;
     }
 
@@ -321,7 +321,11 @@ class VersionGuesser
                 }
 
                 $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);
             }