Merge branch '7.3'

sebastianbergmann · Sep 8, 2018 · 2009960 · 2009960
2 parents 8fbbd7f + 7b331ef
commit 2009960
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ChangeLog-6.5.md b/ChangeLog-6.5.md
@@ -2,7 +2,7 @@
 
 All notable changes of the PHPUnit 6.5 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [6.5.13] - 2018-MM-DD
+## [6.5.13] - 2018-09-08
 
 * Fixed [#3181](https://github.com/sebastianbergmann/phpunit/issues/3181): `--filter` should be case-insensitive
 * Fixed [#3234](https://github.com/sebastianbergmann/phpunit/issues/3234): `assertArraySubset()` with `$strict=true` does not display differences properly

diff --git a/ChangeLog-7.3.md b/ChangeLog-7.3.md
@@ -2,7 +2,7 @@
 
 All notable changes of the PHPUnit 7.3 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
-## [7.3.5] - 2018-MM-DD
+## [7.3.5] - 2018-09-08
 
 ### Fixed
 

diff --git a/tests/unit/Runner/TestSuiteSorterTest.php b/tests/unit/Runner/TestSuiteSorterTest.php
@@ -287,8 +287,8 @@ public function commonSorterOptionsProvider(): array
             // Activating dependency resolution should have no effect under normal circumstances
             'resolve default' => [
                 TestSuiteSorter::ORDER_DEFAULT,
-                self::IGNORE_DEPENDENCIES,
-                ['testOne', 'testTwo', 'testThree', 'testFour', 'testFive'], ],
+                self::RESOLVE_DEPENDENCIES,
+                ['testOne', 'testTwo', 'testThree', 'testFour', 'testFive']],
 
             // Reversing without checks should give a simple reverse order
             'reverse' => [