Handles exceptions on invalid version constraints sebastianbergmann#2386

dnaber-de · Apr 1, 2017 · f22deb6 · f22deb6
1 parent 5593284
commit f22deb6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/src/Util/Test.php b/src/Util/Test.php
@@ -16,6 +16,7 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\SelfDescribing;
 use PHPUnit\Framework\SkippedTestError;
+use PHPUnit\Framework\Warning;
 use PHPUnit\Runner\Version;
 use ReflectionClass;
 use ReflectionException;
@@ -216,7 +217,7 @@ public static function getRequirements($className, $methodName)
                         'constraint' => self::$versionConstraintParser->parse(trim($matches['constraint'][$i]))
                     ];
                 } catch (\PharIo\Version\Exception $e) {
-                    throw $e; //Todo how should we handle errors
+                    throw new Warning($e->getMessage(), $e->getCode(), $e);
                 }
             }
         }

diff --git a/tests/Util/TestTest.php b/tests/Util/TestTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\CodeCoverageException;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\Warning;
 
 class TestTest extends TestCase
 {
@@ -439,6 +440,24 @@ public function requirementsWithVersionConstraintsProvider()
             ]
         ];
     }
+
+    /**
+     * @dataProvider requirementsWithInvalidVersionConstraintsThrowsExceptionProvider
+     */
+    public function testGetRequirementsWithInvalidVersionConstraintsThrowsException($test)
+    {
+        $this->expectException(Warning::class);
+        Test::getRequirements(\RequirementsTest::class, $test);
+    }
+
+    public function requirementsWithInvalidVersionConstraintsThrowsExceptionProvider()
+    {
+        return [
+            ['testVersionConstraintInvalidPhpConstraint'],
+            ['testVersionConstraintInvalidPhpUnitConstraint']
+        ];
+    }
+
     public function testGetRequirementsMergesClassAndMethodDocBlocks()
     {
         $expectedAnnotations = [

diff --git a/tests/_files/RequirementsTest.php b/tests/_files/RequirementsTest.php
@@ -423,4 +423,17 @@ public function testVersionConstraintCaretOrTilde()
     public function testVersionConstraintRegexpIgnoresWhitespace()
     {
     }
+
+    /**
+     * @requires   PHP ~^12345
+     */
+    public function testVersionConstraintInvalidPhpConstraint()
+    {
+    }
+    /**
+     * @requires   PHPUnit ~^12345
+     */
+    public function testVersionConstraintInvalidPhpUnitConstraint()
+    {
+    }
 }