CompatibilityComparator no longer treats versions with zero-major-ver…

…sion as compatible unless exactly equal.
icecave · Mar 9, 2015 · e1800f5 · e1800f5
1 parent e20fc7e
commit e1800f5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 13 deletions.
diff --git a/src/CompatibilityComparator.php b/src/CompatibilityComparator.php
@@ -18,7 +18,11 @@ public function compare(Version $left, Version $right)
     {
         $result = parent::compare($left, $right);
 
-        if ($result <= 0 && $left->major() === $right->major()) {
+        if (
+            $result <= 0
+            && $left->major() !== 0
+            && $left->major() === $right->major()
+        ) {
             return 0;
         }
 

diff --git a/test/suite/CompatibilityComparatorTest.php b/test/suite/CompatibilityComparatorTest.php
@@ -7,33 +7,46 @@ class CompatibilityComparatorTest extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $this->_comparator = new CompatibilityComparator();
+        $this->comparator = new CompatibilityComparator();
     }
 
     /**
      * @dataProvider comparisonTestVectors
      */
     public function testCompareEquality($left, $right)
     {
-        $left = Version::parse($left);
+        $left  = Version::parse($left);
         $right = Version::parse($right);
 
-        $this->assertSame(0, $this->_comparator->compare($left, $left));
-        $this->assertSame(0, $this->_comparator->compare($right, $right));
+        $this->assertSame(
+            0,
+            $this->comparator->compare($left, $left)
+        );
+
+        $this->assertSame(
+            0,
+            $this->comparator->compare($right, $right)
+        );
     }
 
     /**
      * @dataProvider comparisonTestVectors
      */
     public function testCompare($left, $right, $isCompatible)
     {
-        $left = Version::parse($left);
+        $left  = Version::parse($left);
         $right = Version::parse($right);
 
         if ($isCompatible) {
-            $this->assertSame(0, $this->_comparator->compare($left, $right));
+            $this->assertSame(
+                0,
+                $this->comparator->compare($left, $right)
+            );
         } else {
-            $this->assertLessThan(0, $this->_comparator->compare($left, $right));
+            $this->assertLessThan(
+                0,
+                $this->comparator->compare($left, $right)
+            );
         }
     }
 
@@ -42,9 +55,13 @@ public function testCompare($left, $right, $isCompatible)
      */
     public function testCompareInverse($left, $right, $isCompatible)
     {
-        $left = Version::parse($left);
+        $left  = Version::parse($left);
         $right = Version::parse($right);
-        $this->assertGreaterThan(0, $this->_comparator->compare($right, $left));
+
+        $this->assertGreaterThan(
+            0,
+            $this->comparator->compare($right, $left)
+        );
     }
 
     /**
@@ -55,10 +72,12 @@ public function testCompareInverse($left, $right, $isCompatible)
     public function comparisonTestVectors()
     {
         return array(
-            'major version comparison'              => array('1.0.0', '2.0.0', false),
+            'major version comparison'              => array('1.0.0', '2.0.0',     false),
             'major version comparison, pre-release' => array('1.0.0', '2.0.0-foo', false),
-            'minor version comparison'              => array('1.1.0', '1.2.0', true),
-            'patch version comparison'              => array('1.1.1', '1.1.2', true),
+            'minor version comparison'              => array('1.1.0', '1.2.0',     true),
+            'patch version comparison'              => array('1.1.1', '1.1.2',     true),
+            'zero major version comparison'         => array('0.1.0', '0.2.0',     false), // never compatible unless equal
         );
+
     }
 }