Fixed exclude/include groups for phpunit 6. (#818)

phingofficial · Dec 28, 2017 · 18681b2 · 18681b2
1 parent 262b1a2
commit 18681b2
Show file tree

Hide file tree

Showing 6 changed files with 348 additions and 158 deletions.
diff --git a/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner6.php b/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner6.php
@@ -441,14 +441,14 @@ private function injectFilters(PHPUnit\Framework\TestSuite $suite)
 
         if (!empty($this->excludeGroups)) {
             $filterFactory->addFilter(
-                new ReflectionClass('PHPUnit\Runner\Filter\Group\Exclude'),
+                new ReflectionClass(\PHPUnit\Runner\Filter\ExcludeGroupFilterIterator::class),
                 $this->excludeGroups
             );
         }
 
         if (!empty($this->groups)) {
             $filterFactory->addFilter(
-                new ReflectionClass('PHPUnit\Runner\Filter\Group\Include'),
+                new ReflectionClass(\PHPUnit\Runner\Filter\IncludeGroupFilterIterator::class),
                 $this->groups
             );
         }

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "phpdocumentor/phpdocumentor": "2.x",
         "phploc/phploc": "^4.0",
         "phpmd/phpmd": "~2.2",
-        "phpunit/phpunit": ">=5.4",
+        "phpunit/phpunit": "^6.5",
         "siad007/versioncontrol_hg": "^1.0",
         "sebastian/phpcpd": "^2.0",
         "sebastian/git": "^2.1",