Closes #2190

sebastianbergmann · Aug 21, 2016 · 3320e0c · 3320e0c
1 parent feda2df
commit 3320e0c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/ChangeLog-6.0.md b/ChangeLog-6.0.md
@@ -7,10 +7,12 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 ### Added
 
 * Added the `--dont-report-useless-tests` commandline option
+* Added the `--globals-backup` commandline option
 
 ### Changed
 
 * PHPUnit is now strict about useless tests by default
+* Global and super-global variables are no longer backed up before and restored after each test by default
 * `PHPUnit\Framework\Assert::fail()` now increments the assertion counter
 * `setUpBeforeClass()` is now invoked after all methods annotated with `@beforeClass`
 * `setUp()` is now invoked after all methods annotated with `@before`
@@ -28,6 +30,7 @@ All notable changes of the PHPUnit 6.0 release series are documented in this fil
 * Removed the `checkForUnintentionallyCoveredCode` configuration setting (deprecated in PHPUnit 5.2)
 * Removed the `--self-update` and `--self-upgrade` commandline options
 * Removed the `--report-useless-tests` commandline option
+* Removed the `--no-globals-backup` commandline option
 * PHPUnit is no longer supported on PHP 5.6
 
 [6.0.0]: https://github.com/sebastianbergmann/phpunit/compare/5.7...6.0.0

diff --git a/phpunit.xml b/phpunit.xml
@@ -2,7 +2,6 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="phpunit.xsd"
          bootstrap="tests/bootstrap.php"
-         backupGlobals="false"
          verbose="true">
   <testsuites>
     <testsuite name="small">

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -36,6 +36,7 @@ class PHPUnit_TextUI_Command
      */
     protected $longOptions = [
         'atleast-version='           => null,
+        'backup-globals'             => null,
         'bootstrap='                 => null,
         'colors=='                   => null,
         'columns='                   => null,
@@ -66,7 +67,6 @@ class PHPUnit_TextUI_Command
         'log-teamcity='              => null,
         'no-configuration'           => null,
         'no-coverage'                => null,
-        'no-globals-backup'          => null,
         'printer='                   => null,
         'process-isolation'          => null,
         'repeat='                    => null,
@@ -547,8 +547,8 @@ protected function handleArguments(array $argv)
                     $this->arguments['noCoverage'] = true;
                     break;
 
-                case '--no-globals-backup':
-                    $this->arguments['backupGlobals'] = false;
+                case '--globals-backup':
+                    $this->arguments['backupGlobals'] = true;
                     break;
 
                 case '--static-backup':
@@ -967,7 +967,7 @@ protected function showHelp()
   --disallow-todo-tests       Disallow @todo-annotated tests.
 
   --process-isolation         Run each test in a separate PHP process.
-  --no-globals-backup         Do not backup and restore \$GLOBALS for each test.
+  --globals-backup            Backup and restore \$GLOBALS for each test.
   --static-backup             Backup and restore static attributes for each test.
 
   --colors=<flag>             Use colors in output ("never", "auto" or "always").

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -168,8 +168,8 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = [], $exi
             $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $arguments['bootstrap'];
         }
 
-        if ($arguments['backupGlobals'] === false) {
-            $suite->setBackupGlobals(false);
+        if ($arguments['backupGlobals'] === true) {
+            $suite->setBackupGlobals(true);
         }
 
         if ($arguments['backupStaticAttributes'] === true) {

diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -15,7 +15,7 @@
  * <code>
  * <?xml version="1.0" encoding="utf-8" ?>
  *
- * <phpunit backupGlobals="true"
+ * <phpunit backupGlobals="false"
  *          backupStaticAttributes="false"
  *          bootstrap="/path/to/bootstrap.php"
  *          cacheTokens="false"
@@ -592,7 +592,7 @@ public function getPHPUnitConfiguration()
         if ($root->hasAttribute('backupGlobals')) {
             $result['backupGlobals'] = $this->getBoolean(
                 (string) $root->getAttribute('backupGlobals'),
-                true
+                false
             );
         }
 

diff --git a/tests/TextUI/help.phpt b/tests/TextUI/help.phpt
@@ -57,7 +57,7 @@ Test Execution Options:
   --disallow-todo-tests       Disallow @todo-annotated tests.
 
   --process-isolation         Run each test in a separate PHP process.
-  --no-globals-backup         Do not backup and restore $GLOBALS for each test.
+  --globals-backup            Backup and restore $GLOBALS for each test.
   --static-backup             Backup and restore static attributes for each test.
 
   --colors=<flag>             Use colors in output ("never", "auto" or "always").

diff --git a/tests/TextUI/help2.phpt b/tests/TextUI/help2.phpt
@@ -58,7 +58,7 @@ Test Execution Options:
   --disallow-todo-tests       Disallow @todo-annotated tests.
 
   --process-isolation         Run each test in a separate PHP process.
-  --no-globals-backup         Do not backup and restore $GLOBALS for each test.
+  --globals-backup            Backup and restore $GLOBALS for each test.
   --static-backup             Backup and restore static attributes for each test.
 
   --colors=<flag>             Use colors in output ("never", "auto" or "always").