Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '3.7'

  • Loading branch information...
commit 4628cc96466af649efb3793863d9bc48cc148d9c 2 parents 740973e + 50a5460
@sebastianbergmann authored
View
2  PHPUnit/TextUI/TestRunner.php
@@ -754,7 +754,7 @@ protected function handleConfiguration(array &$arguments)
$arguments['processUncoveredFilesFromWhitelist'] = isset($arguments['processUncoveredFilesFromWhitelist']) ? $arguments['processUncoveredFilesFromWhitelist'] : FALSE;
$arguments['backupGlobals'] = isset($arguments['backupGlobals']) ? $arguments['backupGlobals'] : NULL;
$arguments['backupStaticAttributes'] = isset($arguments['backupStaticAttributes']) ? $arguments['backupStaticAttributes'] : NULL;
- $arguments['cacheTokens'] = isset($arguments['cacheTokens']) ? $arguments['cacheTokens'] : TRUE;
+ $arguments['cacheTokens'] = isset($arguments['cacheTokens']) ? $arguments['cacheTokens'] : FALSE;
$arguments['colors'] = isset($arguments['colors']) ? $arguments['colors'] : FALSE;
$arguments['convertErrorsToExceptions'] = isset($arguments['convertErrorsToExceptions']) ? $arguments['convertErrorsToExceptions'] : TRUE;
$arguments['convertNoticesToExceptions'] = isset($arguments['convertNoticesToExceptions']) ? $arguments['convertNoticesToExceptions'] : TRUE;
View
4 PHPUnit/Util/Configuration.php
@@ -53,7 +53,7 @@
* <phpunit backupGlobals="true"
* backupStaticAttributes="false"
* bootstrap="/path/to/bootstrap.php"
- * cacheTokens="true"
+ * cacheTokens="false"
* colors="false"
* convertErrorsToExceptions="true"
* convertNoticesToExceptions="true"
@@ -551,7 +551,7 @@ public function getPHPUnitConfiguration()
if ($root->hasAttribute('cacheTokens')) {
$result['cacheTokens'] = $this->getBoolean(
- (string)$root->getAttribute('cacheTokens'), TRUE
+ (string)$root->getAttribute('cacheTokens'), FALSE
);
}
View
2  Tests/Util/ConfigurationTest.php
@@ -295,7 +295,7 @@ public function testPHPUnitConfigurationIsReadCorrectly()
'backupGlobals' => TRUE,
'backupStaticAttributes' => FALSE,
'bootstrap' => '/path/to/bootstrap.php',
- 'cacheTokens' => TRUE,
+ 'cacheTokens' => FALSE,
'colors' => FALSE,
'convertErrorsToExceptions' => TRUE,
'convertNoticesToExceptions' => TRUE,
View
2  Tests/_files/configuration.xml
@@ -3,7 +3,7 @@
<phpunit backupGlobals="true"
backupStaticAttributes="false"
bootstrap="/path/to/bootstrap.php"
- cacheTokens="true"
+ cacheTokens="false"
colors="false"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
Please sign in to comment.
Something went wrong with that request. Please try again.