From 06e96a78e2cc7c4ba354b0e9c3be7f334c07f82c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 8 Dec 2014 17:04:59 +0000 Subject: [PATCH] Update ranges for 0.N versions, refs #3518 --- src/Composer/Package/Version/VersionSelector.php | 6 +++--- tests/Composer/Test/Package/Version/VersionSelectorTest.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Composer/Package/Version/VersionSelector.php b/src/Composer/Package/Version/VersionSelector.php index ce416ca12..b26f8915f 100644 --- a/src/Composer/Package/Version/VersionSelector.php +++ b/src/Composer/Package/Version/VersionSelector.php @@ -109,11 +109,11 @@ class VersionSelector if (count($semanticVersionParts) == 4 && preg_match('{^0\D?}', $semanticVersionParts[3])) { // remove the last parts (i.e. the patch version number and any extra) if ($semanticVersionParts[0] === '0') { - if ($semanticVersionParts[2] === '0') { + if ($semanticVersionParts[1] === '0') { + $semanticVersionParts[3] = '*'; + } else { $semanticVersionParts[2] = '*'; unset($semanticVersionParts[3]); - } else { - $semanticVersionParts[3] = '*'; } $op = ''; } else { diff --git a/tests/Composer/Test/Package/Version/VersionSelectorTest.php b/tests/Composer/Test/Package/Version/VersionSelectorTest.php index 884337396..90f820e8f 100644 --- a/tests/Composer/Test/Package/Version/VersionSelectorTest.php +++ b/tests/Composer/Test/Package/Version/VersionSelectorTest.php @@ -99,7 +99,7 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase array('3.1.2-pl2', false, 'stable', '~3.1'), array('3.1.2-patch', false, 'stable', '~3.1'), array('0.1.0', false, 'stable', '0.1.*'), - array('0.1.3', false, 'stable', '0.1.3.*'), + array('0.1.3', false, 'stable', '0.1.*'), array('0.0.3', false, 'stable', '0.0.3.*'), array('0.0.3-alpha', false, 'alpha', '0.0.3.*@alpha'), array('2.0-beta.1', false, 'beta', '~2.0@beta'),