Merge branch '7.3'

ezpublishlegacy · Aug 4, 2018 · 995a578 · 995a578
2 parents 8d527f1 + 2192bf8
commit 995a578
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/ChangeLog-7.3.md b/ChangeLog-7.3.md
@@ -2,6 +2,12 @@
 
 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.1] - 2018-MM-DD
+
+### Fixed
+
+* Fixed [#3237](https://github.com/sebastianbergmann/phpunit/issues/3237): Result caching enabled by default
+
 ## [7.3.0] - 2018-08-03
 
 ### Added
@@ -26,5 +32,6 @@ All notable changes of the PHPUnit 7.3 release series are documented in this fil
 * Fixed [#3222](https://github.com/sebastianbergmann/phpunit/pull/3222): Priority of `@covers` and `@coversNothing` is wrong
 * Fixed [#3225](https://github.com/sebastianbergmann/phpunit/issues/3225): `coverage-php` missing from `phpunit.xsd`
 
+[7.3.1]: https://github.com/sebastianbergmann/phpunit/compare/7.3.0...7.3.1
 [7.3.0]: https://github.com/sebastianbergmann/phpunit/compare/7.2...7.3.0
 
diff --git a/phpunit.xsd b/phpunit.xsd
@@ -223,7 +223,7 @@
         <xs:attribute name="backupGlobals" type="xs:boolean" default="false"/>
         <xs:attribute name="backupStaticAttributes" type="xs:boolean" default="false"/>
         <xs:attribute name="bootstrap" type="xs:anyURI"/>
-        <xs:attribute name="cacheResult" type="xs:boolean"/>
+        <xs:attribute name="cacheResult" type="xs:boolean" default="false"/>
         <xs:attribute name="cacheResultFile" type="xs:anyURI"/>
         <xs:attribute name="cacheTokens" type="xs:boolean"/>
         <xs:attribute name="colors" type="xs:boolean" default="false"/>

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -1157,7 +1157,7 @@ protected function handleConfiguration(array &$arguments): void
         $arguments['backupStaticAttributes']                          = $arguments['backupStaticAttributes'] ?? null;
         $arguments['beStrictAboutChangesToGlobalState']               = $arguments['beStrictAboutChangesToGlobalState'] ?? null;
         $arguments['beStrictAboutResourceUsageDuringSmallTests']      = $arguments['beStrictAboutResourceUsageDuringSmallTests'] ?? false;
-        $arguments['cacheResult']                                     = $arguments['cacheResult'] ?? true;
+        $arguments['cacheResult']                                     = $arguments['cacheResult'] ?? false;
         $arguments['cacheTokens']                                     = $arguments['cacheTokens'] ?? false;
         $arguments['colors']                                          = $arguments['colors'] ?? ResultPrinter::COLOR_DEFAULT;
         $arguments['columns']                                         = $arguments['columns'] ?? 80;

diff --git a/tests/TextUI/defects-first-order-via-cli.phpt b/tests/TextUI/defects-first-order-via-cli.phpt
@@ -8,9 +8,10 @@ file_put_contents($tmpResultCache, file_get_contents(__DIR__ . '/../_files/Multi
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--debug';
 $_SERVER['argv'][3] = '--order-by=defects';
-$_SERVER['argv'][4] = '--cache-result-file=' . $tmpResultCache;
-$_SERVER['argv'][5] = 'MultiDependencyTest';
-$_SERVER['argv'][6] = __DIR__ . '/../_files/MultiDependencyTest.php';
+$_SERVER['argv'][4] = '--cache-result';
+$_SERVER['argv'][5] = '--cache-result-file=' . $tmpResultCache;
+$_SERVER['argv'][6] = 'MultiDependencyTest';
+$_SERVER['argv'][7] = __DIR__ . '/../_files/MultiDependencyTest.php';
 
 require __DIR__ . '/../bootstrap.php';
 PHPUnit\TextUI\Command::main();