Remove unnecessary changes

alexpott · alexpott · commit 511faf9270b2 · 2017-10-18T14:19:05.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -270,7 +270,6 @@ public function endTest($test, $time)
                 }
             }
             $this->runsInSeparateProcess = false;
-            putenv('SYMFONY_DEPRECATIONS_SERIALIZE=');
         }
 
         if ($this->expectedDeprecations) {
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/ProcessIsolationTest.php
@@ -10,12 +10,6 @@
  * @group legacy
  *
  * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- *
- * Note that for the deprecation handler to work in a separate process we need to disable the preservation of global
- * state. This is because composer's autoloader stores which files have been autoloaded in the global
- * '__composer_autoload_files'. If this is preserved then bootstrap.php will not run again meaning that deprecations
- * won't be collected.
  */
 class ProcessIsolationTest extends TestCase
 {
diff --git a/src/Symfony/Bridge/PhpUnit/bootstrap.php b/src/Symfony/Bridge/PhpUnit/bootstrap.php
@@ -13,8 +13,10 @@
 use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
 
 // Detect if we're loaded by an actual run of phpunit
-if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
-    DeprecationErrorHandler::collectDeprecations($ser);
+if (!defined('PHPUNIT_COMPOSER_INSTALL') && !class_exists('PHPUnit_TextUI_Command', false) && !class_exists('PHPUnit\TextUI\Command', false)) {
+    if ($ser = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
+        DeprecationErrorHandler::collectDeprecations($ser);
+    }
 
     return;
 }
diff --git a/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist b/src/Symfony/Bridge/PhpUnit/phpunit.xml.dist
@@ -19,11 +19,6 @@
         </testsuite>
     </testsuites>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
-        </listener>
-    </listeners>
-
     <filter>
         <whitelist>
             <directory>./</directory>

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,6 @@ public function endTest($test, $time)`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`	`$this->runsInSeparateProcess = false;`
`273`		`- putenv('SYMFONY_DEPRECATIONS_SERIALIZE=');`
`274`	`273`	`}`
`275`	`274`
`276`	`275`	`if ($this->expectedDeprecations) {`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,6 @@`
`10`	`10`	`* @group legacy`
`11`	`11`	`*`
`12`	`12`	`* @runTestsInSeparateProcesses`
`13`		`- * @preserveGlobalState disabled`
`14`		`- *`
`15`		`- * Note that for the deprecation handler to work in a separate process we need to disable the preservation of global`
`16`		`- * state. This is because composer's autoloader stores which files have been autoloaded in the global`
`17`		`- * '__composer_autoload_files'. If this is preserved then bootstrap.php will not run again meaning that deprecations`
`18`		`- * won't be collected.`
`19`	`13`	`*/`
`20`	`14`	`class ProcessIsolationTest extends TestCase`
`21`	`15`	`{`