From 3a3a250475b2a255ea4ff814f2cdc2200d113c4d Mon Sep 17 00:00:00 2001
From: Ewout Pieter den Ouden <ewoutdenouden@gmail.com>
Date: Thu, 15 Nov 2018 21:10:32 +0100
Subject: [PATCH 1/2] Fix bug where nested TestSuites were no longer seen by
 the sorter

---
 src/Runner/TestSuiteSorter.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Runner/TestSuiteSorter.php b/src/Runner/TestSuiteSorter.php
index d000985fcfa..c5d36de6d0e 100644
--- a/src/Runner/TestSuiteSorter.php
+++ b/src/Runner/TestSuiteSorter.php
@@ -275,6 +275,10 @@ function ($test) {
      */
     private function getNormalizedTestName($test): string
     {
+        if ($test instanceof TestSuite && !($test instanceof DataProviderTestSuite)) {
+            return $test->getName();
+        }
+
         if ($test instanceof PhptTestCase) {
             return $test->getName();
         }

From c0869f74e234d9ddac18b31579a3f7b3ebdbc4f6 Mon Sep 17 00:00:00 2001
From: Ewout Pieter den Ouden <ewoutdenouden@gmail.com>
Date: Thu, 15 Nov 2018 21:12:18 +0100
Subject: [PATCH 2/2] Restore correct regression test for sorting dataprovider
 tests

---
 .../GitHub/3396/issue-3396-test.phpt          | 64 +++++++++++--------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt b/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
index a28856966f5..4a08b4f8dd1 100644
--- a/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
+++ b/tests/end-to-end/regression/GitHub/3396/issue-3396-test.phpt
@@ -2,40 +2,54 @@
 https://github.com/sebastianbergmann/phpunit/issues/3396
 --FILE--
 <?php
+$tmpResultCache = tempnam(sys_get_temp_dir(), __FILE__);
+file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/../../../../_files/DataproviderExecutionOrderTest_result_cache.txt'));
+
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--order-by=defects';
-$_SERVER['argv'][3] = '--testdox';
-$_SERVER['argv'][4] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
+$_SERVER['argv'][3] = '--debug';
+$_SERVER['argv'][4] = '--cache-result';
+$_SERVER['argv'][5] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][6] = \dirname(\dirname(\dirname(__DIR__))) . '/../_files/DataproviderExecutionOrderTest.php';
 
 require __DIR__ . '/../../../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
+
+unlink($tmpResultCache);
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
 
-DataproviderExecutionOrder
- ✔ First test that always works
- ✔ Add numbers with a dataprovider with data set "1+2=3"
- ✔ Add numbers with a dataprovider with data set "2+1=3"
- ✘ Add numbers with a dataprovider with data set "1+1=3"
-   │
-   │ Failed asserting that 2 is identical to 3.
-   │%w
-   │ %s%etests%e_files%eDataproviderExecutionOrderTest.php:24
-   │%w
-
- ✔ Test in the middle that always works
- ✔ Add more numbers with a dataprovider with data set "1+2=3"
- ✔ Add more numbers with a dataprovider with data set "2+1=3"
- ✘ Add more numbers with a dataprovider with data set "1+1=3"
-   │
-   │ Failed asserting that 2 is identical to 3.
-   │%w
-   │ %s%etests%e_files%eDataproviderExecutionOrderTest.php:37
-   │%w
-%A
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)' ended
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "1+2=3" (1, 2, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "1+2=3" (1, 2, 3)' ended
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "2+1=3" (2, 1, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "2+1=3" (2, 1, 3)' ended
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)' ended
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "1+2=3" (1, 2, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "1+2=3" (1, 2, 3)' ended
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "2+1=3" (2, 1, 3)' started
+Test 'DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "2+1=3" (2, 1, 3)' ended
+Test 'DataproviderExecutionOrderTest::testFirstTestThatAlwaysWorks' started
+Test 'DataproviderExecutionOrderTest::testFirstTestThatAlwaysWorks' ended
+Test 'DataproviderExecutionOrderTest::testTestInTheMiddleThatAlwaysWorks' started
+Test 'DataproviderExecutionOrderTest::testTestInTheMiddleThatAlwaysWorks' ended
+
+
 Time: %s, Memory: %s
 
-Summary of non-successful tests:
-%A
+There were 2 failures:
+
+1) DataproviderExecutionOrderTest::testAddNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)
+Failed asserting that 2 is identical to 3.
+
+%s%etests%e_files%eDataproviderExecutionOrderTest.php:%d
+
+2) DataproviderExecutionOrderTest::testAddMoreNumbersWithADataprovider with data set "1+1=3" (1, 1, 3)
+Failed asserting that 2 is identical to 3.
+
+%s%etests%e_files%eDataproviderExecutionOrderTest.php:%d
+
 FAILURES!
 Tests: 8, Assertions: 8, Failures: 2.