Explorar o código

Updated VersionGuesser to check if we actually have a version in the returned array (fixes bug originating from f6899e5 when array was first introduced) - as SVN Versions not being guessed as it would previously stop at Git check.

Fixes #6178
James Buncle %!s(int64=8) %!d(string=hai) anos
pai
achega
9be13783a3
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      src/Composer/Package/Version/VersionGuesser.php

+ 3 - 3
src/Composer/Package/Version/VersionGuesser.php

@@ -65,17 +65,17 @@ class VersionGuesser
     {
     {
         if (function_exists('proc_open')) {
         if (function_exists('proc_open')) {
             $versionData = $this->guessGitVersion($packageConfig, $path);
             $versionData = $this->guessGitVersion($packageConfig, $path);
-            if (null !== $versionData) {
+            if (null !== $versionData && null !== $versionData['version']) {
                 return $versionData;
                 return $versionData;
             }
             }
 
 
             $versionData = $this->guessHgVersion($packageConfig, $path);
             $versionData = $this->guessHgVersion($packageConfig, $path);
-            if (null !== $versionData) {
+            if (null !== $versionData && null !== $versionData['version']) {
                 return $versionData;
                 return $versionData;
             }
             }
 
 
             $versionData = $this->guessFossilVersion($packageConfig, $path);
             $versionData = $this->guessFossilVersion($packageConfig, $path);
-            if (null !== $versionData) {
+            if (null !== $versionData && null !== $versionData['version']) {
                 return $versionData;
                 return $versionData;
             }
             }