From 9be13783a3515c0b1246d9e2fe8972d9f85b592f Mon Sep 17 00:00:00 2001 From: James Buncle Date: Fri, 17 Feb 2017 16:07:08 +0000 Subject: [PATCH] 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 --- src/Composer/Package/Version/VersionGuesser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php index ce030ff0e..011ac376d 100644 --- a/src/Composer/Package/Version/VersionGuesser.php +++ b/src/Composer/Package/Version/VersionGuesser.php @@ -65,17 +65,17 @@ class VersionGuesser { if (function_exists('proc_open')) { $versionData = $this->guessGitVersion($packageConfig, $path); - if (null !== $versionData) { + if (null !== $versionData && null !== $versionData['version']) { return $versionData; } $versionData = $this->guessHgVersion($packageConfig, $path); - if (null !== $versionData) { + if (null !== $versionData && null !== $versionData['version']) { return $versionData; } $versionData = $this->guessFossilVersion($packageConfig, $path); - if (null !== $versionData) { + if (null !== $versionData && null !== $versionData['version']) { return $versionData; }